Repository: ambari Updated Branches: refs/heads/trunk ba276b489 -> 81b8e8fe4
AMBARI-5045. Temporarily wrong location of progress bar. (xiwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/81b8e8fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/81b8e8fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/81b8e8fe Branch: refs/heads/trunk Commit: 81b8e8fe4ae76a5a0d34fbc8ff9a08664b7d2af3 Parents: ba276b4 Author: Yusaku Sako <[email protected]> Authored: Wed Mar 12 18:37:08 2014 -0700 Committer: Yusaku Sako <[email protected]> Committed: Wed Mar 12 18:37:08 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/utils/date.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/81b8e8fe/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index ccc3db4..69557af 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -150,6 +150,7 @@ Em.I18n.translations = { 'common.userSettings': 'User Settings', 'common.aboutAmbari': 'About', 'common.notAvailable': 'Not Available', + 'common.na': 'n/a', 'common.operations': 'Operations', 'common.startTime': 'Start Time', 'common.duration': 'Duration', http://git-wip-us.apache.org/repos/asf/ambari/blob/81b8e8fe/ambari-web/app/utils/date.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/date.js b/ambari-web/app/utils/date.js index 964a952..5ceff21 100644 --- a/ambari-web/app/utils/date.js +++ b/ambari-web/app/utils/date.js @@ -91,7 +91,8 @@ module.exports = { var endDate = new Date(endTimestamp); var self = this; if (startDate.getFullYear() == 1969 || startTimestamp < 1) { - return ''; + // not started + return Em.I18n.t('common.na'); } if (endDate.getFullYear() != 1969 && endTimestamp > 0) { return '' + this.timingFormat(endTimestamp - startTimestamp, 1); //lasted for xx secs
