www

commit 0ac37ab65a4f04f028f7c91a0493dd964463f9ee
parent 1b8704f1334002ff4d1fb27cfd88d26d082c347c
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 22 May 2017 06:04:51 -0400

Firefox 54 compatiblity for locale service

Services.locale.getApplicationLocale() -> getAppLocale()
(nsILocaleService -> mozILocaleService)

It's possible this will fix some of the locale resolution problems in
Standalone:

"This is actually a meaningful change because the old one was actually
using OS locale for platforms other than Windows. The new one is using
the app locale for all platforms." [1]

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1346674#c0

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -242,7 +242,13 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 		}
 		
 		// Load in the localization stringbundle for use by getString(name)
-		var appLocale = Services.locale.getApplicationLocale();
+		if (Services.locale.getAppLocale) {
+			var appLocale = Services.locale.getAppLocale();
+		}
+		// Fx <=53
+		else {
+			var appLocale = Services.locale.getApplicationLocale();
+		}
 		
 		_localizedStringBundle = Services.strings.createBundle(
 			"chrome://zotero/locale/zotero.properties", appLocale);