From 2addf6b27b1466bf5520881fc007a31cd645076b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 21 Jul 2017 05:27:58 -0400 Subject: [PATCH] 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... --- chrome/content/zotero/xpcom/zotero.js | 18 +++--------------- .../af-ZA/zotero/mozilla/intl.properties | 1 + .../locale/ar/zotero/mozilla/intl.properties | 1 + .../bg-BG/zotero/mozilla/intl.properties | 1 + .../ca-AD/zotero/mozilla/intl.properties | 1 + .../cs-CZ/zotero/mozilla/intl.properties | 1 + .../da-DK/zotero/mozilla/intl.properties | 1 + .../locale/de/zotero/mozilla/intl.properties | 1 + .../el-GR/zotero/mozilla/intl.properties | 1 + .../en-US/zotero/mozilla/intl.properties | 1 + .../es-ES/zotero/mozilla/intl.properties | 1 + .../et-EE/zotero/mozilla/intl.properties | 1 + .../eu-ES/zotero/mozilla/intl.properties | 1 + .../locale/fa/zotero/mozilla/intl.properties | 1 + .../fi-FI/zotero/mozilla/intl.properties | 1 + .../fr-FR/zotero/mozilla/intl.properties | 1 + .../gl-ES/zotero/mozilla/intl.properties | 1 + .../he-IL/zotero/mozilla/intl.properties | 1 + .../hr-HR/zotero/mozilla/intl.properties | 1 + .../hu-HU/zotero/mozilla/intl.properties | 1 + .../id-ID/zotero/mozilla/intl.properties | 1 + .../is-IS/zotero/mozilla/intl.properties | 1 + .../it-IT/zotero/mozilla/intl.properties | 1 + .../ja-JP/zotero/mozilla/intl.properties | 1 + .../locale/km/zotero/mozilla/intl.properties | 1 + .../ko-KR/zotero/mozilla/intl.properties | 1 + .../lt-LT/zotero/mozilla/intl.properties | 1 + .../mn-MN/zotero/mozilla/intl.properties | 1 + .../nb-NO/zotero/mozilla/intl.properties | 1 + .../nl-NL/zotero/mozilla/intl.properties | 1 + .../nn-NO/zotero/mozilla/intl.properties | 1 + .../pl-PL/zotero/mozilla/intl.properties | 1 + .../pt-BR/zotero/mozilla/intl.properties | 1 + .../pt-PT/zotero/mozilla/intl.properties | 1 + .../ro-RO/zotero/mozilla/intl.properties | 1 + .../ru-RU/zotero/mozilla/intl.properties | 1 + .../sk-SK/zotero/mozilla/intl.properties | 1 + .../sl-SI/zotero/mozilla/intl.properties | 1 + .../sr-RS/zotero/mozilla/intl.properties | 1 + .../sv-SE/zotero/mozilla/intl.properties | 1 + .../th-TH/zotero/mozilla/intl.properties | 1 + .../tr-TR/zotero/mozilla/intl.properties | 1 + .../uk-UA/zotero/mozilla/intl.properties | 1 + .../vi-VN/zotero/mozilla/intl.properties | 1 + .../zh-CN/zotero/mozilla/intl.properties | 1 + .../zh-TW/zotero/mozilla/intl.properties | 1 + 46 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 chrome/locale/af-ZA/zotero/mozilla/intl.properties create mode 100644 chrome/locale/ar/zotero/mozilla/intl.properties create mode 100644 chrome/locale/bg-BG/zotero/mozilla/intl.properties create mode 100644 chrome/locale/ca-AD/zotero/mozilla/intl.properties create mode 100644 chrome/locale/cs-CZ/zotero/mozilla/intl.properties create mode 100644 chrome/locale/da-DK/zotero/mozilla/intl.properties create mode 100644 chrome/locale/de/zotero/mozilla/intl.properties create mode 100644 chrome/locale/el-GR/zotero/mozilla/intl.properties create mode 100644 chrome/locale/en-US/zotero/mozilla/intl.properties create mode 100644 chrome/locale/es-ES/zotero/mozilla/intl.properties create mode 100644 chrome/locale/et-EE/zotero/mozilla/intl.properties create mode 100644 chrome/locale/eu-ES/zotero/mozilla/intl.properties create mode 100644 chrome/locale/fa/zotero/mozilla/intl.properties create mode 100644 chrome/locale/fi-FI/zotero/mozilla/intl.properties create mode 100644 chrome/locale/fr-FR/zotero/mozilla/intl.properties create mode 100644 chrome/locale/gl-ES/zotero/mozilla/intl.properties create mode 100644 chrome/locale/he-IL/zotero/mozilla/intl.properties create mode 100644 chrome/locale/hr-HR/zotero/mozilla/intl.properties create mode 100644 chrome/locale/hu-HU/zotero/mozilla/intl.properties create mode 100644 chrome/locale/id-ID/zotero/mozilla/intl.properties create mode 100644 chrome/locale/is-IS/zotero/mozilla/intl.properties create mode 100644 chrome/locale/it-IT/zotero/mozilla/intl.properties create mode 100644 chrome/locale/ja-JP/zotero/mozilla/intl.properties create mode 100644 chrome/locale/km/zotero/mozilla/intl.properties create mode 100644 chrome/locale/ko-KR/zotero/mozilla/intl.properties create mode 100644 chrome/locale/lt-LT/zotero/mozilla/intl.properties create mode 100644 chrome/locale/mn-MN/zotero/mozilla/intl.properties create mode 100644 chrome/locale/nb-NO/zotero/mozilla/intl.properties create mode 100644 chrome/locale/nl-NL/zotero/mozilla/intl.properties create mode 100644 chrome/locale/nn-NO/zotero/mozilla/intl.properties create mode 100644 chrome/locale/pl-PL/zotero/mozilla/intl.properties create mode 100644 chrome/locale/pt-BR/zotero/mozilla/intl.properties create mode 100644 chrome/locale/pt-PT/zotero/mozilla/intl.properties create mode 100644 chrome/locale/ro-RO/zotero/mozilla/intl.properties create mode 100644 chrome/locale/ru-RU/zotero/mozilla/intl.properties create mode 100644 chrome/locale/sk-SK/zotero/mozilla/intl.properties create mode 100644 chrome/locale/sl-SI/zotero/mozilla/intl.properties create mode 100644 chrome/locale/sr-RS/zotero/mozilla/intl.properties create mode 100644 chrome/locale/sv-SE/zotero/mozilla/intl.properties create mode 100644 chrome/locale/th-TH/zotero/mozilla/intl.properties create mode 100644 chrome/locale/tr-TR/zotero/mozilla/intl.properties create mode 100644 chrome/locale/uk-UA/zotero/mozilla/intl.properties create mode 100644 chrome/locale/vi-VN/zotero/mozilla/intl.properties create mode 100644 chrome/locale/zh-CN/zotero/mozilla/intl.properties create mode 100644 chrome/locale/zh-TW/zotero/mozilla/intl.properties diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 2ba8b8ab4b..7c16c22e0c 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -224,21 +224,9 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); // Browser Zotero.browser = "g"; - // Locale - var uaPrefs = Services.prefs.getBranch("general.useragent."); - try { - 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(); - } + // Get resolved locale + this.locale = Services.strings.createBundle("chrome://zotero/locale/mozilla/intl.properties") + .GetStringFromName("general.useragent.locale"); _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 diff --git a/chrome/locale/af-ZA/zotero/mozilla/intl.properties b/chrome/locale/af-ZA/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..1966121af2 --- /dev/null +++ b/chrome/locale/af-ZA/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=af-ZA diff --git a/chrome/locale/ar/zotero/mozilla/intl.properties b/chrome/locale/ar/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..d41b5792e9 --- /dev/null +++ b/chrome/locale/ar/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=ar diff --git a/chrome/locale/bg-BG/zotero/mozilla/intl.properties b/chrome/locale/bg-BG/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..a4a12ddcad --- /dev/null +++ b/chrome/locale/bg-BG/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=bg-BG diff --git a/chrome/locale/ca-AD/zotero/mozilla/intl.properties b/chrome/locale/ca-AD/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..2b948bc563 --- /dev/null +++ b/chrome/locale/ca-AD/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=ca-AD diff --git a/chrome/locale/cs-CZ/zotero/mozilla/intl.properties b/chrome/locale/cs-CZ/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..2fdb895944 --- /dev/null +++ b/chrome/locale/cs-CZ/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=cs-CZ diff --git a/chrome/locale/da-DK/zotero/mozilla/intl.properties b/chrome/locale/da-DK/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..db378db882 --- /dev/null +++ b/chrome/locale/da-DK/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=da-DK diff --git a/chrome/locale/de/zotero/mozilla/intl.properties b/chrome/locale/de/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..b4a6e5c100 --- /dev/null +++ b/chrome/locale/de/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=de diff --git a/chrome/locale/el-GR/zotero/mozilla/intl.properties b/chrome/locale/el-GR/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..c7aa7332af --- /dev/null +++ b/chrome/locale/el-GR/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=el-GR diff --git a/chrome/locale/en-US/zotero/mozilla/intl.properties b/chrome/locale/en-US/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..8a2461fa9f --- /dev/null +++ b/chrome/locale/en-US/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=en-US diff --git a/chrome/locale/es-ES/zotero/mozilla/intl.properties b/chrome/locale/es-ES/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..86f5244220 --- /dev/null +++ b/chrome/locale/es-ES/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=es-ES diff --git a/chrome/locale/et-EE/zotero/mozilla/intl.properties b/chrome/locale/et-EE/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..12647ff3d0 --- /dev/null +++ b/chrome/locale/et-EE/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=et-EE diff --git a/chrome/locale/eu-ES/zotero/mozilla/intl.properties b/chrome/locale/eu-ES/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..f60f82ddab --- /dev/null +++ b/chrome/locale/eu-ES/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=eu-ES diff --git a/chrome/locale/fa/zotero/mozilla/intl.properties b/chrome/locale/fa/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..3a6fb610b3 --- /dev/null +++ b/chrome/locale/fa/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=fa diff --git a/chrome/locale/fi-FI/zotero/mozilla/intl.properties b/chrome/locale/fi-FI/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..ae72ffdc51 --- /dev/null +++ b/chrome/locale/fi-FI/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=fi-FI diff --git a/chrome/locale/fr-FR/zotero/mozilla/intl.properties b/chrome/locale/fr-FR/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..94a37a4c8e --- /dev/null +++ b/chrome/locale/fr-FR/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=fr-FR diff --git a/chrome/locale/gl-ES/zotero/mozilla/intl.properties b/chrome/locale/gl-ES/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..f129787ad9 --- /dev/null +++ b/chrome/locale/gl-ES/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=gl-ES diff --git a/chrome/locale/he-IL/zotero/mozilla/intl.properties b/chrome/locale/he-IL/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..d76ef1d842 --- /dev/null +++ b/chrome/locale/he-IL/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=he-IL diff --git a/chrome/locale/hr-HR/zotero/mozilla/intl.properties b/chrome/locale/hr-HR/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..bcb693d63a --- /dev/null +++ b/chrome/locale/hr-HR/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=hr-HR diff --git a/chrome/locale/hu-HU/zotero/mozilla/intl.properties b/chrome/locale/hu-HU/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..0bd7249c93 --- /dev/null +++ b/chrome/locale/hu-HU/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=hu-HU diff --git a/chrome/locale/id-ID/zotero/mozilla/intl.properties b/chrome/locale/id-ID/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..5a67e7155e --- /dev/null +++ b/chrome/locale/id-ID/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=id-ID diff --git a/chrome/locale/is-IS/zotero/mozilla/intl.properties b/chrome/locale/is-IS/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..28a5d93a4f --- /dev/null +++ b/chrome/locale/is-IS/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=is-IS diff --git a/chrome/locale/it-IT/zotero/mozilla/intl.properties b/chrome/locale/it-IT/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..7be31b2b29 --- /dev/null +++ b/chrome/locale/it-IT/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=it-IT diff --git a/chrome/locale/ja-JP/zotero/mozilla/intl.properties b/chrome/locale/ja-JP/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..641b5291d0 --- /dev/null +++ b/chrome/locale/ja-JP/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=ja-JP diff --git a/chrome/locale/km/zotero/mozilla/intl.properties b/chrome/locale/km/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..a74dbce9d8 --- /dev/null +++ b/chrome/locale/km/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=km diff --git a/chrome/locale/ko-KR/zotero/mozilla/intl.properties b/chrome/locale/ko-KR/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..73ac368b08 --- /dev/null +++ b/chrome/locale/ko-KR/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=ko-KR diff --git a/chrome/locale/lt-LT/zotero/mozilla/intl.properties b/chrome/locale/lt-LT/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..550c13b2b6 --- /dev/null +++ b/chrome/locale/lt-LT/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=lt-LT diff --git a/chrome/locale/mn-MN/zotero/mozilla/intl.properties b/chrome/locale/mn-MN/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..3818922cdb --- /dev/null +++ b/chrome/locale/mn-MN/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=mn-MN diff --git a/chrome/locale/nb-NO/zotero/mozilla/intl.properties b/chrome/locale/nb-NO/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..e02a90d7eb --- /dev/null +++ b/chrome/locale/nb-NO/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=nb-NO diff --git a/chrome/locale/nl-NL/zotero/mozilla/intl.properties b/chrome/locale/nl-NL/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..21a4f2c382 --- /dev/null +++ b/chrome/locale/nl-NL/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=nl-NL diff --git a/chrome/locale/nn-NO/zotero/mozilla/intl.properties b/chrome/locale/nn-NO/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..3d32a5d912 --- /dev/null +++ b/chrome/locale/nn-NO/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=nn-NO diff --git a/chrome/locale/pl-PL/zotero/mozilla/intl.properties b/chrome/locale/pl-PL/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..ad527ebd82 --- /dev/null +++ b/chrome/locale/pl-PL/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=pl-PL diff --git a/chrome/locale/pt-BR/zotero/mozilla/intl.properties b/chrome/locale/pt-BR/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..4a9d349676 --- /dev/null +++ b/chrome/locale/pt-BR/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=pt-BR diff --git a/chrome/locale/pt-PT/zotero/mozilla/intl.properties b/chrome/locale/pt-PT/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..fb754e65cd --- /dev/null +++ b/chrome/locale/pt-PT/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=pt-PT diff --git a/chrome/locale/ro-RO/zotero/mozilla/intl.properties b/chrome/locale/ro-RO/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..f6f95698e3 --- /dev/null +++ b/chrome/locale/ro-RO/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=ro-RO diff --git a/chrome/locale/ru-RU/zotero/mozilla/intl.properties b/chrome/locale/ru-RU/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..8bba235474 --- /dev/null +++ b/chrome/locale/ru-RU/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=ru-RU diff --git a/chrome/locale/sk-SK/zotero/mozilla/intl.properties b/chrome/locale/sk-SK/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..4b3a46cd2a --- /dev/null +++ b/chrome/locale/sk-SK/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=sk-SK diff --git a/chrome/locale/sl-SI/zotero/mozilla/intl.properties b/chrome/locale/sl-SI/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..21d24fd0b5 --- /dev/null +++ b/chrome/locale/sl-SI/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=sl-SI diff --git a/chrome/locale/sr-RS/zotero/mozilla/intl.properties b/chrome/locale/sr-RS/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..872f9d77bf --- /dev/null +++ b/chrome/locale/sr-RS/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=sr-RS diff --git a/chrome/locale/sv-SE/zotero/mozilla/intl.properties b/chrome/locale/sv-SE/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..fbc9d877d7 --- /dev/null +++ b/chrome/locale/sv-SE/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=sv-SE diff --git a/chrome/locale/th-TH/zotero/mozilla/intl.properties b/chrome/locale/th-TH/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..489c5e0095 --- /dev/null +++ b/chrome/locale/th-TH/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=th-TH diff --git a/chrome/locale/tr-TR/zotero/mozilla/intl.properties b/chrome/locale/tr-TR/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..8f901a19ce --- /dev/null +++ b/chrome/locale/tr-TR/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=tr-TR diff --git a/chrome/locale/uk-UA/zotero/mozilla/intl.properties b/chrome/locale/uk-UA/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..64452d3592 --- /dev/null +++ b/chrome/locale/uk-UA/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=uk-UA diff --git a/chrome/locale/vi-VN/zotero/mozilla/intl.properties b/chrome/locale/vi-VN/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..82e8a0f4ce --- /dev/null +++ b/chrome/locale/vi-VN/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=vi-VN diff --git a/chrome/locale/zh-CN/zotero/mozilla/intl.properties b/chrome/locale/zh-CN/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..52f8d7c4f4 --- /dev/null +++ b/chrome/locale/zh-CN/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=zh-CN diff --git a/chrome/locale/zh-TW/zotero/mozilla/intl.properties b/chrome/locale/zh-TW/zotero/mozilla/intl.properties new file mode 100644 index 0000000000..4e35cda69b --- /dev/null +++ b/chrome/locale/zh-TW/zotero/mozilla/intl.properties @@ -0,0 +1 @@ +general.useragent.locale=zh-TW