diff --git a/src/extensions/default/AutoUpdate/UpdateStatus.js b/src/extensions/default/AutoUpdate/UpdateStatus.js index b000370f92f..5508add4bd4 100644 --- a/src/extensions/default/AutoUpdate/UpdateStatus.js +++ b/src/extensions/default/AutoUpdate/UpdateStatus.js @@ -27,7 +27,8 @@ define(function (require, exports, module) { var UpdateStatusHtml = require("text!htmlContent/updateStatus.html"), ExtensionUtils = brackets.getModule("utils/ExtensionUtils"), Mustache = brackets.getModule("thirdparty/mustache/mustache"), - Strings = brackets.getModule("strings"); + Strings = brackets.getModule("strings"), + StringUtils = brackets.getModule("utils/StringUtils"); ExtensionUtils.loadStyleSheet(module, "styles/styles.css"); @@ -47,6 +48,8 @@ define(function (require, exports, module) { var $updateStatus = $(Mustache.render(UpdateStatusHtml, {"Strings": Strings})); $updateStatus.appendTo('#status-bar'); + var valStr = StringUtils.format(Strings.NUMBER_WITH_PERCENTAGE, 0); + $('#update-status #' + id + ' #' + 'percent').text(valStr); $('#update-status #' + id).show(); } @@ -61,7 +64,8 @@ define(function (require, exports, module) { */ function modifyUpdateStatus(statusObj) { statusObj.spans.forEach(function (span) { - $('#update-status #' + statusObj.target + ' #' + span.id).text(span.val); + var valStr = StringUtils.format(Strings.NUMBER_WITH_PERCENTAGE, span.val.split('%')[0]); + $('#update-status #' + statusObj.target + ' #' + span.id).text(valStr); }); } diff --git a/src/extensions/default/AutoUpdate/htmlContent/updateStatus.html b/src/extensions/default/AutoUpdate/htmlContent/updateStatus.html index a7de44f3c3f..88c645f0e16 100644 --- a/src/extensions/default/AutoUpdate/htmlContent/updateStatus.html +++ b/src/extensions/default/AutoUpdate/htmlContent/updateStatus.html @@ -1,5 +1,5 @@
-

{{Strings.INITIAL_DOWNLOAD}}0%

+

{{Strings.INITIAL_DOWNLOAD}}

{{Strings.RETRY_DOWNLOAD}}1/5

{{Strings.VALIDATING_INSTALLER}}

diff --git a/src/extensions/default/AutoUpdate/main.js b/src/extensions/default/AutoUpdate/main.js index 8bd7f42ed24..474a72e1f85 100644 --- a/src/extensions/default/AutoUpdate/main.js +++ b/src/extensions/default/AutoUpdate/main.js @@ -181,7 +181,7 @@ define(function (require, exports, module) { * Checks and handles the update success and failure scenarios */ function checkUpdateStatus() { - var filesToCache = null, + var filesToCache = ['.logs'], downloadCompleted = updateJsonHandler.get("downloadCompleted"), updateInitiatedInPrevSession = updateJsonHandler.get("updateInitiatedInPrevSession"); @@ -204,7 +204,6 @@ define(function (require, exports, module) { } else { // We get here if the update started but failed checkInstallationStatus(); - filesToCache = ['.logs']; //AUTOUPDATE_PRERELEASE UpdateInfoBar.showUpdateBar({ type: "error", title: Strings.UPDATE_FAILED, diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 85622c529d4..6bc80b12a84 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -870,6 +870,7 @@ define({ "LATER_BUTTON" : "Later", "DESCRIPTION_AUTO_UPDATE" : "Enable/disable Brackets Auto-update", + "NUMBER_WITH_PERCENTAGE" : "{0}%", // Strings for Related Files "CMD_FIND_RELATED_FILES" : "Find Related Files" });