commit 5da9b4bbb652f305dfe5bd77cae43422bc4a9f8c
parent 4afb29e59f30539866cc21c3b4d798a97ae30bce
Author: Dan Stillman <dstillman@zotero.org>
Date: Mon, 28 Apr 2014 22:49:51 -0400
Separate toolbar guidance strings for easier localization
Diffstat:
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
@@ -117,11 +117,16 @@ var ZoteroOverlay = new function()
try {
isUpgrade = Zotero.Prefs.get("firstRunGuidanceShown.saveIcon");
} catch(e) {}
-
- var property = "firstRunGuidance.toolbarButton."+(isUpgrade ? "upgrade" : "new");
- var shortcut = Zotero.getString(Zotero.isMac ? "general.keys.cmdShift" : "general.keys.ctrlShift")+
- Zotero.Prefs.get("keys.openZotero");
- document.getElementById("zotero-toolbar-button-guidance").show(null, Zotero.getString(property, shortcut));
+
+ var shortcut = Zotero.getString(
+ Zotero.isMac ? "general.keys.cmdShift" : "general.keys.ctrlShift"
+ ) + Zotero.Prefs.get("keys.openZotero");
+ var property = "firstRunGuidance.toolbarButton";
+ var msg = Zotero.getString(property, shortcut);
+ if (isUpgrade) {
+ msg = Zotero.getString(property + ".new") + " " + msg;
+ }
+ document.getElementById("zotero-toolbar-button-guidance").show(null, msg);
}, 0);
}
}
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
@@ -963,5 +963,5 @@ firstRunGuidance.saveIcon = Zotero has found a reference on this page. Click th
firstRunGuidance.authorMenu = Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
firstRunGuidance.quickFormat = Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
firstRunGuidance.quickFormatMac = Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
-firstRunGuidance.toolbarButton.upgrade = The Zotero icon can now be found in the Firefox toolbar. Click here to open Zotero, or use the %S keyboard shortcut.
-firstRunGuidance.toolbarButton.new = Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.new = The Zotero icon can now be found in the Firefox toolbar.
+firstRunGuidance.toolbarButton = Click here to open Zotero, or use the %S keyboard shortcut.
