From 0c483fa9f6591e55d5238a697635de753acbc5a0 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Tue, 6 Aug 2013 12:20:23 -0400 Subject: [PATCH] Correct I18N code for progress display - really fix #767 this time --- main/webapp/modules/core/scripts/project/process-panel.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/webapp/modules/core/scripts/project/process-panel.js b/main/webapp/modules/core/scripts/project/process-panel.js index 366babc23..f2697e07d 100644 --- a/main/webapp/modules/core/scripts/project/process-panel.js +++ b/main/webapp/modules/core/scripts/project/process-panel.js @@ -149,9 +149,10 @@ ProcessPanel.prototype._render = function(newData) { for (var i = 0; i < processes.length; i++) { var process = processes[i]; if (process.status != "pending") { - Refine.setTitle(process.progress + "% "+_elmts.or_proj_undo.html($.i18n._('core-project')["complete"])); + // TODO: We should be using formatting, not string concatenation here + Refine.setTitle(process.progress + "% "+$.i18n._('core-project')["complete"]); this._elmts.progressDescription.text(process.description); - this._elmts.progressSpan.text(process.progress + '% '+_elmts.or_proj_undo.html($.i18n._('core-project')["complete"])); + this._elmts.progressSpan.text(process.progress + '% '+$.i18n._('core-project')["complete"]); } if ("onDone" in process) { newProcessMap[process.id] = process; @@ -170,7 +171,7 @@ ProcessPanel.prototype._render = function(newData) { .click(function() { self._cancelAll(); $(this).text($.i18n._('core-project')["canceling"]).unbind(); - }) + }); this._div.fadeIn(200); }