mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

set the default language to en-US to reflect what it is

pull/1638/head
antelle 2020-11-27 18:47:55 +01:00
parent 1ca4ead313
commit 647ce573b0
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scripts/comp/settings/settings-manager.js
View File

@ -10,11 +10,11 @@ const extraThemes = Features.isMac || Features.isiOS ? appleThemes : {};
const SettingsManager = {
neutralLocale: null,
activeLocale: 'en',
activeLocale: 'en-US',
activeTheme: null,
allLocales: {
'en': 'English',
'en-US': 'English',
'de-DE': 'Deutsch',
'fr-FR': 'Français'
},
@ -83,7 +83,7 @@ const SettingsManager = {
return;
}
let localeValues;
if (loc !== 'en') {
if (loc !== 'en-US') {
if (this.customLocales[loc]) {
localeValues = this.customLocales[loc];
} else {
@ -100,8 +100,8 @@ const SettingsManager = {
getBrowserLocale() {
const language = (navigator.languages && navigator.languages[0]) || navigator.language;
if (language && language.lastIndexOf('en', 0) === 0) {
return 'en';
if (language && language.startsWith('en')) {
return 'en-US';
}
return language;
}

2
app/scripts/plugins/plugin.js
View File

@ -434,7 +434,7 @@ class Plugin extends Model {
delete SettingsManager.allLocales[locale.name];
delete SettingsManager.customLocales[locale.name];
if (SettingsManager.activeLocale === locale.name) {
AppSettingsModel.locale = 'en';
AppSettingsModel.locale = 'en-US';
}
}

2
app/scripts/views/settings/settings-general-view.js
View File

@ -212,7 +212,7 @@ class SettingsGeneralView extends View {
changeLocale(e) {
const locale = e.target.value;
if (locale === '...') {
e.target.value = AppSettingsModel.locale || 'en';
e.target.value = AppSettingsModel.locale || 'en-US';
this.appModel.menu.select({
item: this.appModel.menu.pluginsSection.items[0]
});