Get Zotero.locale from loaded locale, not from pref

It was previously set from general.useragent.locale, but that's not used
by default, meaning that date interpretation and some other things might
have been incorrect for everyone who didn't set a locale explicitly and
toggle matchOS...
This commit is contained in:
Dan Stillman 2017-07-21 05:27:58 -04:00
parent 2bd3aa9669
commit 2addf6b27b
46 changed files with 48 additions and 15 deletions
chrome
content/zotero/xpcom
locale
af-ZA/zotero/mozilla
ar/zotero/mozilla
bg-BG/zotero/mozilla
ca-AD/zotero/mozilla
cs-CZ/zotero/mozilla
da-DK/zotero/mozilla
de/zotero/mozilla
el-GR/zotero/mozilla
en-US/zotero/mozilla
es-ES/zotero/mozilla
et-EE/zotero/mozilla
eu-ES/zotero/mozilla
fa/zotero/mozilla
fi-FI/zotero/mozilla
fr-FR/zotero/mozilla
gl-ES/zotero/mozilla
he-IL/zotero/mozilla
hr-HR/zotero/mozilla
hu-HU/zotero/mozilla
id-ID/zotero/mozilla
is-IS/zotero/mozilla
it-IT/zotero/mozilla
ja-JP/zotero/mozilla
km/zotero/mozilla
ko-KR/zotero/mozilla
lt-LT/zotero/mozilla
mn-MN/zotero/mozilla
nb-NO/zotero/mozilla
nl-NL/zotero/mozilla
nn-NO/zotero/mozilla
pl-PL/zotero/mozilla
pt-BR/zotero/mozilla
pt-PT/zotero/mozilla
ro-RO/zotero/mozilla
ru-RU/zotero/mozilla
sk-SK/zotero/mozilla
sl-SI/zotero/mozilla
sr-RS/zotero/mozilla
sv-SE/zotero/mozilla
th-TH/zotero/mozilla
tr-TR/zotero/mozilla
uk-UA/zotero/mozilla
vi-VN/zotero/mozilla
zh-CN/zotero/mozilla
zh-TW/zotero/mozilla

View File

@ -224,21 +224,9 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
// Browser // Browser
Zotero.browser = "g"; Zotero.browser = "g";
// Locale // Get resolved locale
var uaPrefs = Services.prefs.getBranch("general.useragent."); this.locale = Services.strings.createBundle("chrome://zotero/locale/mozilla/intl.properties")
try { .GetStringFromName("general.useragent.locale");
this.locale = uaPrefs.getComplexValue("locale", Components.interfaces.nsIPrefLocalizedString);
} catch (e) {}
if(this.locale) {
this.locale = this.locale.toString();
} else {
this.locale = uaPrefs.getCharPref("locale");
}
if (this.locale.length == 2) {
this.locale = this.locale + '-' + this.locale.toUpperCase();
}
_localizedStringBundle = Services.strings.createBundle("chrome://zotero/locale/zotero.properties"); _localizedStringBundle = Services.strings.createBundle("chrome://zotero/locale/zotero.properties");
// Fix logged error in PluralForm.jsm when numForms() is called before get(), as it is in // Fix logged error in PluralForm.jsm when numForms() is called before get(), as it is in

View File

@ -0,0 +1 @@
general.useragent.locale=af-ZA

View File

@ -0,0 +1 @@
general.useragent.locale=ar

View File

@ -0,0 +1 @@
general.useragent.locale=bg-BG

View File

@ -0,0 +1 @@
general.useragent.locale=ca-AD

View File

@ -0,0 +1 @@
general.useragent.locale=cs-CZ

View File

@ -0,0 +1 @@
general.useragent.locale=da-DK

View File

@ -0,0 +1 @@
general.useragent.locale=de

View File

@ -0,0 +1 @@
general.useragent.locale=el-GR

View File

@ -0,0 +1 @@
general.useragent.locale=en-US

View File

@ -0,0 +1 @@
general.useragent.locale=es-ES

View File

@ -0,0 +1 @@
general.useragent.locale=et-EE

View File

@ -0,0 +1 @@
general.useragent.locale=eu-ES

View File

@ -0,0 +1 @@
general.useragent.locale=fa

View File

@ -0,0 +1 @@
general.useragent.locale=fi-FI

View File

@ -0,0 +1 @@
general.useragent.locale=fr-FR

View File

@ -0,0 +1 @@
general.useragent.locale=gl-ES

View File

@ -0,0 +1 @@
general.useragent.locale=he-IL

View File

@ -0,0 +1 @@
general.useragent.locale=hr-HR

View File

@ -0,0 +1 @@
general.useragent.locale=hu-HU

View File

@ -0,0 +1 @@
general.useragent.locale=id-ID

View File

@ -0,0 +1 @@
general.useragent.locale=is-IS

View File

@ -0,0 +1 @@
general.useragent.locale=it-IT

View File

@ -0,0 +1 @@
general.useragent.locale=ja-JP

View File

@ -0,0 +1 @@
general.useragent.locale=km

View File

@ -0,0 +1 @@
general.useragent.locale=ko-KR

View File

@ -0,0 +1 @@
general.useragent.locale=lt-LT

View File

@ -0,0 +1 @@
general.useragent.locale=mn-MN

View File

@ -0,0 +1 @@
general.useragent.locale=nb-NO

View File

@ -0,0 +1 @@
general.useragent.locale=nl-NL

View File

@ -0,0 +1 @@
general.useragent.locale=nn-NO

View File

@ -0,0 +1 @@
general.useragent.locale=pl-PL

View File

@ -0,0 +1 @@
general.useragent.locale=pt-BR

View File

@ -0,0 +1 @@
general.useragent.locale=pt-PT

View File

@ -0,0 +1 @@
general.useragent.locale=ro-RO

View File

@ -0,0 +1 @@
general.useragent.locale=ru-RU

View File

@ -0,0 +1 @@
general.useragent.locale=sk-SK

View File

@ -0,0 +1 @@
general.useragent.locale=sl-SI

View File

@ -0,0 +1 @@
general.useragent.locale=sr-RS

View File

@ -0,0 +1 @@
general.useragent.locale=sv-SE

View File

@ -0,0 +1 @@
general.useragent.locale=th-TH

View File

@ -0,0 +1 @@
general.useragent.locale=tr-TR

View File

@ -0,0 +1 @@
general.useragent.locale=uk-UA

View File

@ -0,0 +1 @@
general.useragent.locale=vi-VN

View File

@ -0,0 +1 @@
general.useragent.locale=zh-CN

View File

@ -0,0 +1 @@
general.useragent.locale=zh-TW