From aa0592011758e05a4c0e306a0553ad6fa5a9a516 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 27 May 2017 05:37:47 -0400 Subject: [PATCH] Don't break getLocaleCollation() in Firefox <54 (after a73b2403b) --- chrome/content/zotero/xpcom/zotero.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 72e515a9c9..b767672989 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -1330,17 +1330,18 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); } if (Services.locale.getAppLocale) { - var appLocale = Services.locale.getAppLocale(); + var locale = Services.locale.getAppLocale(); } // Fx <=53 else { - var appLocale = Services.locale.getApplicationLocale(); + var locale = Services.locale.getApplicationLocale(); + locale = locale.getCategory('NSILOCALE_COLLATE'); } try { // Extract a valid language tag - appLocale = appLocale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0]; - var collator = new Intl.Collator(appLocale, { + locale = locale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0]; + var collator = new Intl.Collator(locale, { ignorePunctuation: true, numeric: true, sensitivity: 'base'