ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-17450: Host checks labels to be generated by the view instead of concat at the template level (dili)
Date Tue, 28 Jun 2016 12:26:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ff060c54d -> 04e607301


AMBARI-17450: Host checks labels to be generated by the view instead of concat at the template
level (dili)


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

Branch: refs/heads/trunk
Commit: 04e607301a1ee02d3b8a116e0c7afeea24862dc0
Parents: ff060c5
Author: Di Li <dili@apache.org>
Authored: Tue Jun 28 08:26:03 2016 -0400
Committer: Di Li <dili@apache.org>
Committed: Tue Jun 28 08:26:03 2016 -0400

----------------------------------------------------------------------
 ambari-web/app/messages.js                      |  2 +-
 .../wizard/step3/step3_host_warnings_popup.hbs  |  2 +-
 .../wizard/step3/hostWarningPopupBody_view.js   | 28 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/04e60730/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d40a84a..5d461c7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -751,7 +751,7 @@ Em.I18n.translations = {
   'installer.step3.hostWarningsPopup.alternatives.empty': 'alternative issues',
   'installer.step3.hostWarningsPopup.issue':'issue',
   'installer.step3.hostWarningsPopup.issues':'issues',
-  'installer.step3.hostWarningsPopup.emptyMessage':'There were no',
+  'installer.step3.hostWarningsPopup.emptyMessage':'There were no {0}',
   'installer.step3.hostWarningsPopup.empty.filesAndFolders':'unwanted files and folders',
   'installer.step3.hostWarningsPopup.empty.processes':'unwanted processes',
   'installer.step3.hostWarningsPopup.empty.packages':'unwanted packages',

http://git-wip-us.apache.org/repos/asf/ambari/blob/04e60730/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs b/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs
index 4b0f753..4553b0e 100644
--- a/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs
+++ b/ambari-web/app/templates/wizard/step3/step3_host_warnings_popup.hbs
@@ -84,7 +84,7 @@
                 </tbody>
               </table>
             {{else}}
-              {{t installer.step3.hostWarningsPopup.emptyMessage}} {{category.emptyName}}
+              {{category.emptyName}}
             {{/if}}
           </div>
         </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/04e60730/ambari-web/app/views/wizard/step3/hostWarningPopupBody_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step3/hostWarningPopupBody_view.js b/ambari-web/app/views/wizard/step3/hostWarningPopupBody_view.js
index 5128ca3..75e8743 100644
--- a/ambari-web/app/views/wizard/step3/hostWarningPopupBody_view.js
+++ b/ambari-web/app/views/wizard/step3/hostWarningPopupBody_view.js
@@ -152,7 +152,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.thp'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.thp.message'),
         type: Em.I18n.t('common.issues'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.thp'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.thp')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.enabled'),
         category: 'thp'
       }),
@@ -161,7 +161,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.jdk'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.jdk.message'),
         type: Em.I18n.t('common.issues'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.jdk'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.jdk')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.exists'),
         category: 'jdk'
       }),
@@ -170,7 +170,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.disk'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.disk.message'),
         type: Em.I18n.t('common.issues'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.disk'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.disk')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.exists'),
         category: 'disk'
       }),
@@ -179,7 +179,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.repositories'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.repositories.message'),
         type: Em.I18n.t('common.issues'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.repositories'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.repositories')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.invalid'),
         category: 'repositories'
       }),
@@ -188,7 +188,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.firewall'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.firewall.message'),
         type: Em.I18n.t('common.issues'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.firewall'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.firewall')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.running'),
         category: 'firewall'
       }),
@@ -197,7 +197,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.process'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.processes.message'),
         type: Em.I18n.t('common.process'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.processes'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.processes')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.running'),
         category: 'process'
       }),
@@ -206,7 +206,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.package'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.packages.message'),
         type: Em.I18n.t('common.package'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.packages'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.packages')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.installed'),
         category: 'package'
       }),
@@ -215,7 +215,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.fileAndFolder'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.fileFolders.message'),
         type: Em.I18n.t('common.path'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.filesAndFolders'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.filesAndFolders')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.exists'),
         category: 'fileFolders'
       }),
@@ -224,7 +224,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.service'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.services.message'),
         type: Em.I18n.t('common.service'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.services'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.services')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.notRunning'),
         category: 'service'
       }),
@@ -233,7 +233,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.user'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.users.message'),
         type: Em.I18n.t('common.user'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.users'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.users')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.exists'),
         category: 'user'
       }),
@@ -242,7 +242,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.misc'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.misc.message'),
         type: Em.I18n.t('installer.step3.hostWarningsPopup.misc.umask'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.empty.misc'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.empty.misc')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.exists'),
         category: 'misc'
       }),
@@ -251,7 +251,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.alternatives'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.alternatives.message'),
         type: Em.I18n.t('installer.step3.hostWarningsPopup.alternatives.umask'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.alternatives.empty'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.alternatives.empty')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.exists'),
         category: 'alternatives'
       }),
@@ -259,7 +259,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         warnings: categoryWarnings.filterProperty('category', 'reverseLookup'),
         title: Em.I18n.t('installer.step3.hostWarningsPopup.reverseLookup'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.reverseLookup.message'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.reverseLookup.empty'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.reverseLookup.empty')),
         category: 'reverseLookup'
       }),
       Em.Object.create({
@@ -267,7 +267,7 @@ App.WizardStep3HostWarningPopupBody = Em.View.extend({
         title: Em.I18n.t('installer.step3.hostWarningsPopup.resolution.validation.name'),
         message: Em.I18n.t('installer.step3.hostWarningsPopup.resolution.validation.message'),
         type: Em.I18n.t('common.issues'),
-        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.resolution.validation.empty'),
+        emptyName: Em.I18n.t('installer.step3.hostWarningsPopup.emptyMessage').format(Em.I18n.t('installer.step3.hostWarningsPopup.resolution.validation.empty')),
         action: Em.I18n.t('installer.step3.hostWarningsPopup.action.failed'),
         category: 'hostNameResolution'
       })


Mime
View raw message