瀏覽代碼

Removes resolveAppName postprocess we do not need.

i18next.options are initialized before interfaceConfig overwrites are processed which leads to wrong translations.
master
damencho 5 年之前
父節點
當前提交
6ddd17c769

+ 0
- 1
lang/main.json 查看文件

113
     },
113
     },
114
     "deepLinking": {
114
     "deepLinking": {
115
         "appNotInstalled": "You need the {{app}} mobile app to join this meeting on your phone.",
115
         "appNotInstalled": "You need the {{app}} mobile app to join this meeting on your phone.",
116
-        "description": "Nothing happened? We tried launching your meeting in the {{app}} desktop app. Try again or launch it in the {{app}} web app.",
117
         "descriptionWithoutWeb": "Nothing happened? We tried launching your meeting in the {{app}} desktop app.",
116
         "descriptionWithoutWeb": "Nothing happened? We tried launching your meeting in the {{app}} desktop app.",
118
         "downloadApp": "Download the app",
117
         "downloadApp": "Download the app",
119
         "launchWebButton": "Launch in web",
118
         "launchWebButton": "Launch in web",

+ 0
- 10
react/features/base/i18n/i18next.js 查看文件

9
 
9
 
10
 import languageDetector from './languageDetector';
10
 import languageDetector from './languageDetector';
11
 
11
 
12
-declare var interfaceConfig: Object;
13
-
14
 /**
12
 /**
15
  * The available/supported languages.
13
  * The available/supported languages.
16
  *
14
  *
37
  * @type {Object}
35
  * @type {Object}
38
  */
36
  */
39
 const options = {
37
 const options = {
40
-    app:
41
-        (typeof interfaceConfig !== 'undefined' && interfaceConfig.APP_NAME)
42
-            || 'Jitsi Meet',
43
     backend: {
38
     backend: {
44
         loadPath: 'lang/{{ns}}-{{lng}}.json'
39
         loadPath: 'lang/{{ns}}-{{lng}}.json'
45
     },
40
     },
64
 i18next
59
 i18next
65
     .use(navigator.product === 'ReactNative' ? {} : I18nextXHRBackend)
60
     .use(navigator.product === 'ReactNative' ? {} : I18nextXHRBackend)
66
     .use(languageDetector)
61
     .use(languageDetector)
67
-    .use({
68
-        name: 'resolveAppName',
69
-        process: (res, key) => i18next.t(key, { app: options.app }),
70
-        type: 'postProcessor'
71
-    })
72
     .init(options);
62
     .init(options);
73
 
63
 
74
 // Add default language which is preloaded from the source code.
64
 // Add default language which is preloaded from the source code.

+ 3
- 1
react/features/overlay/components/web/UserMediaPermissionsFilmstripOnlyOverlay.js 查看文件

9
     from './AbstractUserMediaPermissionsOverlay';
9
     from './AbstractUserMediaPermissionsOverlay';
10
 import FilmstripOnlyOverlayFrame from './FilmstripOnlyOverlayFrame';
10
 import FilmstripOnlyOverlayFrame from './FilmstripOnlyOverlayFrame';
11
 
11
 
12
+declare var interfaceConfig: Object;
13
+
12
 /**
14
 /**
13
  * Implements a React Component for overlay with guidance how to proceed with
15
  * Implements a React Component for overlay with guidance how to proceed with
14
  * gUM prompt. This component will be displayed only for filmstrip only mode.
16
  * gUM prompt. This component will be displayed only for filmstrip only mode.
34
                     <div className = 'inlay-filmstrip-only__title'>
36
                     <div className = 'inlay-filmstrip-only__title'>
35
                         {
37
                         {
36
                             t('startupoverlay.title',
38
                             t('startupoverlay.title',
37
-                                { postProcess: 'resolveAppName' })
39
+                                { app: interfaceConfig.APP_NAME })
38
                         }
40
                         }
39
                     </div>
41
                     </div>
40
                     <div className = 'inlay-filmstrip-only__text'>
42
                     <div className = 'inlay-filmstrip-only__text'>

+ 1
- 1
react/features/overlay/components/web/UserMediaPermissionsOverlay.js 查看文件

33
                     <h3 className = 'inlay__title'>
33
                     <h3 className = 'inlay__title'>
34
                         {
34
                         {
35
                             t('startupoverlay.title',
35
                             t('startupoverlay.title',
36
-                                { postProcess: 'resolveAppName' })
36
+                                { app: interfaceConfig.APP_NAME })
37
                         }
37
                         }
38
                     </h3>
38
                     </h3>
39
                     <span className = 'inlay__text'>
39
                     <span className = 'inlay__text'>

Loading…
取消
儲存