From 24b5c2be0a373a4d870cc8bfb02dfa05b927109f Mon Sep 17 00:00:00 2001 From: Vitaly Kramskikh Date: Fri, 15 Nov 2013 15:29:40 +0400 Subject: [PATCH] Fix titles for disks/interfaces configuration screens Change-Id: Id9b87fdce7e12eee44e1b11d9391804bfa3aadad Closes-Bug: 1249328 --- nailgun/static/i18n/translation.json | 20 +++++++++---------- .../templates/cluster/edit_node_disks.html | 2 +- .../cluster/edit_node_interfaces.html | 4 +++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nailgun/static/i18n/translation.json b/nailgun/static/i18n/translation.json index 8451dd88a9..f80c4d35f0 100644 --- a/nailgun/static/i18n/translation.json +++ b/nailgun/static/i18n/translation.json @@ -100,6 +100,14 @@ }, "cluster_page": { "nodes_tab": { + "configure_interfaces": { + "title": "Configure interfaces on __name__", + "title_plural": "Configure interfaces on __count__ nodes" + }, + "configure_disks": { + "title": "Configure disks on __name__", + "title_plural": "Configure disks on __count__ nodes" + }, "back_to_nodes_button": "Back To Node List", "discovered": "Discovered", "offline": "Offline", @@ -118,17 +126,7 @@ "unallocated_nodes": "Unallocated Nodes", "disk_information": "Disk Information", "volume_groups": "Volume Groups", - "use_all_allowed_space": "Use All Allowed Space", - "configure_interfaces": { - "configure_interfaces_on_node": "Configure interfaces on __count__ node", - "configure_interfaces_on_node_plural": "Configure interfaces on __count__ nodes" - }, - "configure_disks": "Configure disks on __count__ node", - "configure_disks_plural": "Configure disks on __count__ nodes", - "return_button": "Back To Node List", - "load_defaults_button": "Load Defaults", - "cancel_changes_button": "Cancel Changes", - "apply_button": "Apply" + "use_all_allowed_space": "Use All Allowed Space" }, "settings_tab": { "title": "OpenStack Settings" diff --git a/nailgun/static/templates/cluster/edit_node_disks.html b/nailgun/static/templates/cluster/edit_node_disks.html index a15e4d7f84..a6a54ca46a 100644 --- a/nailgun/static/templates/cluster/edit_node_disks.html +++ b/nailgun/static/templates/cluster/edit_node_disks.html @@ -1,6 +1,6 @@

- <%- $.t('cluster_page.nodes_tab.edit_node_disks.configure_disks', {count: nodes.length}) %> + <%- $.t('cluster_page.nodes_tab.configure_disks.title', {count: nodes.length, name: nodes.length && nodes.at(0).get('name')}) %>

diff --git a/nailgun/static/templates/cluster/edit_node_interfaces.html b/nailgun/static/templates/cluster/edit_node_interfaces.html index 7a22531aea..cb3bb3e6b1 100644 --- a/nailgun/static/templates/cluster/edit_node_interfaces.html +++ b/nailgun/static/templates/cluster/edit_node_interfaces.html @@ -1,5 +1,7 @@
-

<%- $.t('cluster_page.nodes_tab.configure_interfaces.configure_interfaces_on_node', {count: nodes.length}) %>

+

+ <%- $.t('cluster_page.nodes_tab.configure_interfaces.title', {count: nodes.length, name: nodes.length && nodes.at(0).get('name')}) %> +