haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1082 from 'BeatC/config-option-to-freeze-translation' 

Add detect translation freeze in interface config
This commit is contained in:
paweldomas 2016-10-28 11:14:22 -05:00
parent 2fe69d409b 209272f940
commit 01581196f0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
interface_config.js
View File

@ -16,6 +16,7 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars
SHOW_POWERED_BY: false, SHOW_POWERED_BY: false,
GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true, GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
APP_NAME: "Jitsi Meet", APP_NAME: "Jitsi Meet",
LANG_DETECTION: false, // Allow i18n to detect the system language
INVITATION_POWERED_BY: true, INVITATION_POWERED_BY: true,
/** /**
* If we should show authentication block in profile * If we should show authentication block in profile

6
modules/translation/translation.js
View File

@ -83,6 +83,12 @@ module.exports = {
let options = defaultOptions; let options = defaultOptions;
let lang = getLangFromQuery() || settingsLang || config.defaultLanguage; let lang = getLangFromQuery() || settingsLang || config.defaultLanguage;
let langDetection = interfaceConfig.LANG_DETECTION;
if (!langDetection && !lang) {
lang = DEFAULT_LANG;
}
if (lang) { if (lang) {
options.lng = lang; options.lng = lang;
} }