mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Don't break getLocaleCollation() in Firefox <54 (after a73b2403b)

Browse source
This commit is contained in:
Dan Stillman 2017-05-27 05:37:47 -04:00
parent d6c36ae9a3
commit aa05920117
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/xpcom/zotero.js
View file

@ -1330,17 +1330,18 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
} }
if (Services.locale.getAppLocale) { if (Services.locale.getAppLocale) {
var appLocale = Services.locale.getAppLocale(); var locale = Services.locale.getAppLocale();
} }
// Fx <=53 // Fx <=53
else { else {
var appLocale = Services.locale.getApplicationLocale(); var locale = Services.locale.getApplicationLocale();
locale = locale.getCategory('NSILOCALE_COLLATE');
} }
try { try {
// Extract a valid language tag // Extract a valid language tag
appLocale = appLocale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0]; locale = locale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0];
var collator = new Intl.Collator(appLocale, { var collator = new Intl.Collator(locale, {
ignorePunctuation: true, ignorePunctuation: true,
numeric: true, numeric: true,
sensitivity: 'base' sensitivity: 'base'