suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #726, Localize remaining hard-coded strings

Browse Source 
Not localizing 'Error initializing Zotero database' or bundle.js alerts -- they shouldn't happen except during development, and if they do it doesn't really matter if the user understands them.
This commit is contained in:
Dan Stillman 2007-10-19 15:52:59 +00:00
parent e0e9f6ec2d
commit a65c5cd4e1
6 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrome/content/zotero/overlay.js
View File

@ -235,6 +235,19 @@ var ZoteroPane = new function()
var errFunc = Zotero.startupErrorHandler;
}
if (!errMsg) {
// 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();
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
var stringBundle = stringBundleService.createBundle(src, appLocale);
var errMsg = stringBundle.GetStringFromName('startupError');
}
if (errFunc) {
errFunc();
}
@ -242,7 +255,6 @@ var ZoteroPane = new function()
// TODO: Add a better error page/window here with reporting
// instructions
// window.loadURI('chrome://zotero/content/error.xul');
// TODO: localize if possible
alert(errMsg);
}

11
chrome/content/zotero/overlay.xul
View File

@ -385,7 +385,16 @@
// Use defaults if necessary
if (!errMsg) {
var errMsg = 'There was an error starting Zotero.';
// 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();
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
var stringBundle = stringBundleService.createBundle(src, appLocale);
var errMsg = stringBundle.GetStringFromName('startupError');
}
icon.setAttribute('tooltiptext', errMsg);

2
chrome/content/zotero/xpcom/schema.js
View File

@ -511,7 +511,7 @@ Zotero.Schema = new function(){
Zotero.debug(e, 1);
Components.utils.reportError(e);
Zotero.DB.rollbackTransaction();
alert('Error initializing Zotero database'); // TODO: localize
alert('Error initializing Zotero database');
throw(e);
}
}

6
chrome/locale/en-US/zotero/zotero.properties
View File

@ -1,3 +1,5 @@
extensions.zotero@chnm.gmu.edu.description = The Next-Generation Research Tool
general.error = Error
general.warning = Warning
general.dontShowWarningAgain = Don't show this warning again.
@ -44,6 +46,8 @@ dataDir.selectDir = Select a Zotero data directory
dataDir.selectedDirNonEmpty.title = Directory Not Empty
dataDir.selectedDirNonEmpty.text = The directory you selected is not empty and does not appear to be a Zotero data directory.\n\nCreate Zotero files in this directory anyway?
startupError = There was an error starting Zotero.
pane.collections.delete = Are you sure you want to delete the selected collection?
pane.collections.deleteSearch = Are you sure you want to delete the selected search?
pane.collections.newCollection = New Collection
@ -113,6 +117,8 @@ pane.item.changeType.text = Are you sure you want to change the item type?\n\nT
pane.item.defaultFirstName = first
pane.item.defaultLastName = last
pane.item.defaultFullName = full name
pane.item.switchFieldMode.one = Switch to single field
pane.item.switchFieldMode.two = Switch to two fields
pane.item.notes.untitled = Untitled Note
pane.item.notes.delete.confirm = Are you sure you want to delete this note?
pane.item.notes.count.zero = %S notes:

1
defaults/preferences/zotero.js
View File

@ -1,6 +1,7 @@
// These are DEFAULT prefs for the INSTALL. You will have to reinstall the extension to see differences!
pref("extensions.zotero.firstRun", true);
pref("extensions.zotero@chnm.gmu.edu.description", "chrome://zotero/locale/zotero.properties");
pref("extensions.zotero.useDataDir", false);
pref("extensions.zotero.dataDir", '');

1
install.rdf
View File

@ -7,7 +7,6 @@
<em:id>zotero@chnm.gmu.edu</em:id>
<em:name>Zotero</em:name>
<em:version>1.0.0rc4.SVN</em:version>
<em:description>The Next-Generation Research Tool</em:description>
<em:creator>Center for History and New Media<br/>George Mason University</em:creator>
<em:contributor>Dan Cohen</em:contributor>
<em:contributor>Sean Takats</em:contributor>