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

Fix display of some startup errors in toolbar icon tooltip

Browse source
This commit is contained in:
Dan Stillman 2015-02-21 20:33:58 -05:00
parent 9a87f15956
commit 3089685b33
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,19 +175,19 @@ function getTooltipText(button) {
if (key) { if (key) {
// Add RLE mark in RTL mode to make shortcut render the right way // Add RLE mark in RTL mode to make shortcut render the right way
text += (Zotero.rtl ? ' \u202B' : ' ') + '(' text += (Zotero.rtl ? ' \u202B' : ' ') + '('
+ (Zotero.isMac ? '⇧⌘' : Zotero.getString('general.keys.ctrlShift')) + (Zotero.isMac ? '⇧⌘' : Zotero.getString('general.keys.ctrlShift'))
+ key + key
+ ')'; + ')';
} }
} }
else { else {
if (Zotero) { if (Zotero) {
var errMsg = Zotero.startupError; text = Zotero.startupError;
} }
// Use defaults if necessary // Use defaults if necessary
if (!errMsg) { if (!text) {
// Get the stringbundle manually // Get the stringbundle manually
let src = 'chrome://zotero/locale/zotero.properties'; let src = 'chrome://zotero/locale/zotero.properties';
let localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1'] let localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
@ -203,6 +203,7 @@ function getTooltipText(button) {
case 'save': case 'save':
text = Zotero.getString('ingester.saveToZotero'); text = Zotero.getString('ingester.saveToZotero');
break;
} }
return text; return text;
} }