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

Use ASCII for translator filenames

Browse source 
Remove diacritics and then use translatorID for anything that still has
extended characters.

Fixes #459, Non-ascii translator names
This commit is contained in:
Dan Stillman 2012-09-19 02:37:18 -04:00
parent 53449d47a9
commit d821778d24
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/schema.js
View file

@ -692,7 +692,12 @@ Zotero.Schema = new function(){
} }
} }
var fileName = Zotero.File.getValidFileName(entry.label) + fileExt; var fileName = Zotero.Utilities.removeDiacritics(
Zotero.File.getValidFileName(entry.label)) + fileExt;
// Use translatorID if name still isn't ASCII (e.g., Cyrillic)
if (!fileName.match(/^[\x00-\x7f]+$/)) {
fileName = entry.translatorID + fileExt;
}
var destFile = destDir.clone(); var destFile = destDir.clone();
destFile.append(fileName); destFile.append(fileName);
@ -815,7 +820,12 @@ Zotero.Schema = new function(){
} }
if (mode == 'translator') { if (mode == 'translator') {
var fileName = Zotero.File.getValidFileName(newObj[titleField]) + fileExt var fileName = Zotero.Utilities.removeDiacritics(
Zotero.File.getValidFileName(newObj[titleField])) + fileExt;
// Use translatorID if name still isn't ASCII (e.g., Cyrillic)
if (!fileName.match(/^[\x00-\x7f]+$/)) {
fileName = newObj.translatorID + fileExt;
}
} }
else if (mode == 'style') { else if (mode == 'style') {
var fileName = file.leafName; var fileName = file.leafName;