зеркало из https://github.com/mozilla/pjs.git
Fix bug 390508 - Unify calendar command sets. r=mickey
This commit is contained in:
Родитель
df22984f65
Коммит
39b0eb6262
|
@ -19,6 +19,7 @@
|
||||||
* the Initial Developer. All Rights Reserved.
|
* the Initial Developer. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Contributor(s): Matthew Willis <mattwillis@gmail.com>
|
* Contributor(s): Matthew Willis <mattwillis@gmail.com>
|
||||||
|
* Philipp Kewisch <mozilla@kewis.ch>
|
||||||
*
|
*
|
||||||
* Alternatively, the contents of this file may be used under the terms of
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
@ -348,7 +349,6 @@ function sbUpdateItem()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var strings = document.getElementById("bundle_calendar");
|
|
||||||
var activeUpdate = updateManager.activeUpdate;
|
var activeUpdate = updateManager.activeUpdate;
|
||||||
|
|
||||||
// By default, show "Check for Updates..."
|
// By default, show "Check for Updates..."
|
||||||
|
@ -372,9 +372,9 @@ function sbUpdateItem()
|
||||||
// If there's an active update, substitute its name into the label
|
// If there's an active update, substitute its name into the label
|
||||||
// we show for this item, otherwise display a generic label.
|
// we show for this item, otherwise display a generic label.
|
||||||
if (activeUpdate && activeUpdate.name) {
|
if (activeUpdate && activeUpdate.name) {
|
||||||
checkForUpdates.label = strings.getFormattedString("updatesItem_" + key, [activeUpdate.name]);
|
checkForUpdates.label = calGetString("calendar", "updatesItem_" + key, [activeUpdate.name]);
|
||||||
} else {
|
} else {
|
||||||
checkForUpdates.label = strings.getString("updatesItem_" + key + "Fallback");
|
checkForUpdates.label = calGetString("calendar", "updatesItem_" + key + "Fallback");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (updateManager.activeUpdate && updateService.isDownloading) {
|
if (updateManager.activeUpdate && updateService.isDownloading) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче