You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/03/18 16:56:54 UTC

ambari git commit: AMBARI-10120. Knox: Label for startdemoldap has no spaces in it (alexantonenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk b21d8176f -> 7d4fdd9be


AMBARI-10120. Knox: Label for startdemoldap has no spaces in it (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d4fdd9b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d4fdd9b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d4fdd9b

Branch: refs/heads/trunk
Commit: 7d4fdd9be0814b6fcd92651edfefd07af3842f16
Parents: b21d817
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Mar 18 16:15:55 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Mar 18 17:56:50 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/messages.js     | 2 ++
 ambari-web/app/utils/helper.js | 6 ++++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d4fdd9b/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index fbae5dc..b909f2b 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1441,7 +1441,9 @@ Em.I18n.translations = {
   'services.service.actions.reassign.master':'Move {0}',
   'services.service.actions.reassign.master.hive':'Move HiveServer2, WebHCat Server, MySQL Server',
   'services.service.actions.manage_configuration_groups':'Manage Configuration Groups...',
+  'services.service.actions.run.startLdapKnox.title':'Start Demo LDAP Knox Gateway',
   'services.service.actions.run.startLdapKnox.context':'Start Demo LDAP',
+  'services.service.actions.run.stopLdapKnox.title':'Stop Demo LDAP Knox Gateway',
   'services.service.actions.run.stopLdapKnox.context':'Stop Demo LDAP',
   'services.service.actions.run.startStopLdapKnox.error': 'Error during remote command: ',
   'services.service.actions.manage_configuration_groups.short':'Manage Config Groups',

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d4fdd9b/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 3d5a9ad..2b6eae5 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -491,6 +491,12 @@ App.format = {
     if (result === ' Rebalancehdfs NameNode') {
        result = Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.title');
     }
+    if (result === " Startdemoldap Knox Gateway") {
+      result = Em.I18n.t('services.service.actions.run.startLdapKnox.title');
+    }
+    if (result === " Stopdemoldap Knox Gateway") {
+      result = Em.I18n.t('services.service.actions.run.stopLdapKnox.title');
+    }
     return result;
   },