forked from 0x2620/pandora
only use enabled languages
This commit is contained in:
parent
ea2a5620f6
commit
e4e7fb87b1
3 changed files with 3 additions and 3 deletions
|
@ -33,7 +33,7 @@ pandora.ui.appearanceDialog = function() {
|
|||
}),
|
||||
Ox.Select({
|
||||
id: 'locale',
|
||||
items: Object.keys(Ox.LOCALE_NAMES).map(function(locale) {
|
||||
items: pandora.site.languages.map(function(locale) {
|
||||
return {id: locale, title: Ox.LOCALE_NAMES[locale]}
|
||||
}),
|
||||
label: Ox._('Language'),
|
||||
|
|
|
@ -121,7 +121,7 @@ pandora.ui.preferencesDialog = function() {
|
|||
}),
|
||||
Ox.Select({
|
||||
id: 'locale',
|
||||
items: Object.keys(Ox.LOCALE_NAMES).map(function(locale) {
|
||||
items: pandora.site.languages.map(function(locale) {
|
||||
return {id: locale, title: Ox.LOCALE_NAMES[locale]}
|
||||
}),
|
||||
label: Ox._('Language'),
|
||||
|
|
|
@ -2204,7 +2204,7 @@ pandora.setLocale = function(locale, callback) {
|
|||
var url;
|
||||
// language from http header might not be supported,
|
||||
// fall back to site default
|
||||
if (Ox.isUndefined(Ox.LOCALE_NAMES[locale])) {
|
||||
if (pandora.site.languages.indexOf(locale) == -1) {
|
||||
locale = pandora.site.user.ui.locale;
|
||||
}
|
||||
if (locale != 'en') {
|
||||
|
|
Loading…
Reference in a new issue