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

Additional locale service updates for Firefox 54 compatibility

Browse source 
Follow-up to 0ac37ab65a
This commit is contained in:
Dan Stillman 2017-05-26 01:37:54 -04:00
parent 7fc188b172
commit d5a8a3420d
5 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/icon.js
View file

@ -258,10 +258,16 @@ function getTooltipText(button) {
// Use defaults if necessary
if (!text) {
// Get the stringbundle manually
Components.utils.import("resource://gre/modules/Services.jsm");
let appLocale;
if (Services.locale.getAppLocale) {
appLocale = Services.locale.getAppLocale();
}
// Fx <=53
else {
appLocale = Services.locale.getApplicationLocale();
}
let src = 'chrome://zotero/locale/zotero.properties';
let localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
.getService(Components.interfaces.nsILocaleService);
let appLocale = localeService.getApplicationLocale();
let stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
let stringBundle = stringBundleService.createBundle(src, appLocale);

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

@ -1329,9 +1329,13 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
return this.collation;
}
var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
.getService(Components.interfaces.nsILocaleService);
var appLocale = localeService.getApplicationLocale();
if (Services.locale.getAppLocale) {
var appLocale = Services.locale.getAppLocale();
}
// Fx <=53
else {
var appLocale = Services.locale.getApplicationLocale();
}
try {
var locale = appLocale.getCategory('NSILOCALE_COLLATE');

12
chrome/content/zotero/zoteroPane.js
View file

@ -4710,12 +4710,16 @@ var ZoteroPane = new function()
}
// Get the stringbundle manually
var src = 'chrome://zotero/locale/zotero.properties';
var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1'].
getService(Components.interfaces.nsILocaleService);
var appLocale = localeService.getApplicationLocale();
if (Services.locale.getAppLocale) {
var appLocale = Services.locale.getAppLocale();
}
// Fx <=53
else {
var appLocale = Services.locale.getApplicationLocale();
}
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
var src = 'chrome://zotero/locale/zotero.properties';
var stringBundle = stringBundleService.createBundle(src, appLocale);
var title = stringBundle.GetStringFromName('general.error');

15
chrome/skin/default/zotero/timeline/timelineControls.js
View file

@ -6,13 +6,18 @@ var lastJumpToYearValue;
* Set up the localization string bundle from timeline.properties
*/
function initLocaleBundle() {
var src = 'chrome://zotero/locale/timeline.properties';
var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
.getService(Components.interfaces.nsILocaleService);
var appLocale = localeService.getApplicationLocale();
Components.utils.import("resource://gre/modules/Services.jsm");
if (Services.locale.getAppLocale) {
var appLocale = Services.locale.getAppLocale();
}
// Fx <=53
else {
var appLocale = Services.locale.getApplicationLocale();
}
var src = 'chrome://zotero/locale/timeline.properties';
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
.getService(Components.interfaces.nsIStringBundleService);
return stringBundleService.createBundle(src, appLocale);
}

11
components/zotero-service.js
View file

@ -390,10 +390,15 @@ function ZoteroService() {
let quitStr = "Quit";
let checkForUpdateStr = "Check for Update";
try {
let appLocale;
if (Services.locale.getAppLocale) {
appLocale = Services.locale.getAppLocale();
}
// Fx <=53
else {
appLocale = Services.locale.getApplicationLocale();
}
let src = 'chrome://zotero/locale/zotero.properties';
let localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
.getService(Components.interfaces.nsILocaleService);
let appLocale = localeService.getApplicationLocale();
let stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
let stringBundle = stringBundleService.createBundle(src, appLocale);