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

Remove Zotero.localeJoin

Browse source
This commit is contained in:
Sylvester Keil 2018-07-30 12:33:08 +02:00
parent 8e6896c27d
commit 3a8d04f467
No known key found for this signature in database
GPG key ID: 878933BCEAB25A10
3 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/upgrade.xul
View file

@ -108,9 +108,9 @@
function _setStartupError() {
Zotero.startupError = Zotero.localeJoin([
Zotero.startupError = [
Zotero.getString('upgrade.dbUpdateRequired'), Zotero.getString('general.restartFirefox')
]);
].join(' ');
}

4
chrome/content/zotero/xpcom/progressWindow.js
View file

@ -387,10 +387,10 @@ Zotero.ProgressWindow = function(options = {}) {
this.Translation = {};
this.Translation.operationInProgress = function() {
var desc = Zotero.localeJoin([
var desc = [
Zotero.getString('general.operationInProgress'),
Zotero.getString('general.operationInProgress.waitUntilFinishedAndTryAgain')
]);
].join(' ');
self.Translation._scrapeError(desc);
};

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

@ -43,7 +43,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
this.debug = debug;
this.log = log;
this.logError = logError;
this.localeJoin = localeJoin;
this.setFontSize = setFontSize;
this.flattenArguments = flattenArguments;
this.getAncestorByTagName = getAncestorByTagName;
@ -1412,22 +1411,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
}
/*
* This function should be removed
*
* |separator| defaults to a space (not a comma like Array.join()) if
* not specified
*
* TODO: Substitute localized characters (e.g. Arabic comma and semicolon)
*/
function localeJoin(arr, separator) {
if (typeof separator == 'undefined') {
separator = ' ';
}
return arr.join(separator);
}
this.getLocaleCollation = function () {
if (this.collation) {
return this.collation;