소스 검색

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,7 +113,6 @@
113 113
     },
114 114
     "deepLinking": {
115 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 116
         "descriptionWithoutWeb": "Nothing happened? We tried launching your meeting in the {{app}} desktop app.",
118 117
         "downloadApp": "Download the app",
119 118
         "launchWebButton": "Launch in web",

+ 0
- 10
react/features/base/i18n/i18next.js 파일 보기

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

+ 3
- 1
react/features/overlay/components/web/UserMediaPermissionsFilmstripOnlyOverlay.js 파일 보기

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

+ 1
- 1
react/features/overlay/components/web/UserMediaPermissionsOverlay.js 파일 보기

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

Loading…
취소
저장