On 01/02/2012 05:50 PM, tsedovic(a)redhat.com wrote:
From: Tomas Sedovic<tomas(a)sedovic.cz>
---
src/app/controllers/deployments_controller.rb | 4 ++--
src/app/controllers/pools_controller.rb | 6 +++---
src/app/models/deployment.rb | 1 +
src/app/views/deployments/_pretty_view.html.haml | 8 ++++----
src/app/views/pools/_deployments.html.haml | 4 ++--
src/app/views/pools/_pretty_list.html.haml | 2 +-
src/app/views/pools/_scoreboard_index.html.haml | 2 +-
src/app/views/pools/_scoreboard_show.html.haml | 2 +-
src/app/views/settings/self_service.html.haml | 2 +-
src/config/locales/en.yml | 4 +++-
10 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/app/controllers/deployments_controller.rb
b/src/app/controllers/deployments_controller.rb
index 8245dd1..5c31830 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -165,7 +165,7 @@ class DeploymentsController< ApplicationController
@view = 'pretty_view_show'
end
#TODO add links to real data for history, permissions, services
- @tabs = [{:name => t('instances.instances'), :view => @view, :id
=> 'instances', :count => @deployment.instances.count},
+ @tabs = [{:name => t('instances.instances.other'), :view => @view,
:id => 'instances', :count => @deployment.instances.count},
#{:name => 'Services', :view => @view, :id =>
'services'},
#{:name => 'History', :view => 'history', :id
=> 'history'},
{:name => t('properties'), :view => 'properties',
:id => 'properties'}
@@ -332,7 +332,7 @@ class DeploymentsController< ApplicationController
{ :name => t("pools.index.deployed_on"), :sortable => false },
{ :name => t("deployables.index.base_deployable"), :sortable =>
false },
{ :name => t("deployables.index.state"), :sortable => false },
- { :name => t("instances.instances"), :class => 'center',
:sortable => false },
+ { :name => t("instances.instances.other"), :class =>
'center', :sortable => false },
{ :name => t("pools.pool"), :sortable => false },
{ :name => t("pools.index.owner"), :sortable => false },
{ :name => t("providers.provider"), :sortable => false }
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index 37f238e..76c6d5a 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -39,7 +39,7 @@ class PoolsController< ApplicationController
if filter_view?
@tabs = [{:name => "#{t'pools.pools'}", :view =>
'list', :id => 'pools'},
{:name => "#{t'deployments.deployments'}", :view
=> 'deployments/list', :id => 'deployments'},
- {:name => "#{t'instances.instances'}", :view =>
'instances/list', :id => 'instances'},
+ {:name => "#{t'instances.instances.other'}", :view
=> 'instances/list', :id => 'instances'},
]
details_tab_name = params[:details_tab].blank? ? 'pools' :
params[:details_tab]
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} ||
@tabs.first[:name].downcase
@@ -239,7 +239,7 @@ class PoolsController< ApplicationController
{ :name => '', :class => 'alert', :sortable => false
},
{ :name => t("pools.index.pool_name"), :sort_attr => :name },
{ :name => t("deployments.deployments"), :class =>
'center', :sortable => false },
- { :name => t("instances.instances"), :class => 'center',
:sortable => false },
+ { :name => t("instances.instances.other"), :class =>
'center', :sortable => false },
{ :name => t("pools.index.pending"), :class =>
'center', :sortable => false },
{ :name => t("pools.index.failed"), :class => 'center',
:sortable => false },
{ :name => t("quota_used"), :class => 'center',
:sortable => false },
@@ -253,7 +253,7 @@ class PoolsController< ApplicationController
{ :name => t("pools.index.deployed_on"), :sortable => false },
{ :name => t("deployables.index.base_deployable"), :sortable =>
false },
{ :name => t("deployables.index.state"), :sortable => false },
- { :name => t("instances.instances"), :class => 'center',
:sortable => false },
+ { :name => t("instances.instances.other"), :class =>
'center', :sortable => false },
{ :name => t("pools.pool"), :sortable => false },
{ :name => t("pools.index.owner"), :sortable => false },
{ :name => t("providers.provider"), :sortable => false }
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 4842645..52880c0 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -401,6 +401,7 @@ class Deployment< ActiveRecord::Base
:deployable_xml_name => deployable_xml.name,
:deployment_state => deployment_state,
:instances_count => instances.count,
+ :instances_count_text => I18n.t('instances.instances', :count =>
instances.count.to_i),
:uptime => ApplicationHelper.count_uptime(uptime_1st_instance),
:global_uptime => ApplicationHelper.count_uptime(uptime_all),
:pool => {
diff --git a/src/app/views/deployments/_pretty_view.html.haml
b/src/app/views/deployments/_pretty_view.html.haml
index 9f9af4f..97c586e 100644
--- a/src/app/views/deployments/_pretty_view.html.haml
+++ b/src/app/views/deployments/_pretty_view.html.haml
@@ -11,10 +11,10 @@
%dt.uptime=t'uptime'
%dd= count_uptime(deployment.uptime_1st_instance)
%li.instances
- %dt.instances.count=t'instances.instances'
+ %dt.instances.count=t'instances.instances.other'
%dd
= deployment.instances.count || 0
- %span.inline-label=t'instances.instances'
+ %span.inline-label=t('instances.instances', :count =>
deployment.instances.count.to_i)
%li.provider
%dt.instances.count=t'providers.provider'
%dd= deployment.provider.provider_type.name unless
deployment.provider.blank?
@@ -39,9 +39,9 @@
<dd>${uptime}</dd>
</li>
<li class="instances">
-<dt class="instances
count">#{t'instances.instances'}</dt>
+<dt class="instances
count">#{t'instances.instances.other'}</dt>
<dd>${instances_count}
-<span
class="inline-label">#{t'instances.instances'}</span>
+<span class="inline-label">${instances_count_text}</span>
</dd>
</li>
<li class="provider">
diff --git a/src/app/views/pools/_deployments.html.haml
b/src/app/views/pools/_deployments.html.haml
index af0b8b8..3f98bde 100644
--- a/src/app/views/pools/_deployments.html.haml
+++ b/src/app/views/pools/_deployments.html.haml
@@ -9,7 +9,7 @@
%dl.statistics
%ul
%li.right
- %dt.instances.count= t 'instances.instances'
+ %dt.instances.count= t 'instances.instances.other'
%dd= deployment.instances.count || 0
%li.left
@@ -27,7 +27,7 @@
<dl class="statistics">
<ul>
<li class="right">
-<dt class="instances count">#{t
'instances.instances'}</dt>
+<dt class="instances count">#{t
'instances.instances.other'}</dt>
<dd>${instances_count}</dd>
</li>
<li class="left">
diff --git a/src/app/views/pools/_pretty_list.html.haml
b/src/app/views/pools/_pretty_list.html.haml
index ac2af4d..e31b8b6 100644
--- a/src/app/views/pools/_pretty_list.html.haml
+++ b/src/app/views/pools/_pretty_list.html.haml
@@ -14,7 +14,7 @@
%dt=t 'deployments.deployments'
%dd.count.deployment= pool.deployments.count
%li
- %dt=t 'instances.instances'
+ %dt=t 'instances.instances.other'
%dd.count.instance= pool.instances.count
%dd.count.instance.pending= pool.instances.select {|i| i.state ==
Instance::STATE_PENDING }.length
%dd.count.instance.failure= pool.instances.select {|i| i.state ==
Instance::STATE_ERROR || i.state == Instance::STATE_CREATE_FAILED }.length
diff --git a/src/app/views/pools/_scoreboard_index.html.haml
b/src/app/views/pools/_scoreboard_index.html.haml
index f264dd5..0781bdb 100644
--- a/src/app/views/pools/_scoreboard_index.html.haml
+++ b/src/app/views/pools/_scoreboard_index.html.haml
@@ -9,7 +9,7 @@
%dt= t("deployments.deployments")
%dd.count.deployment= @statistics[:deployments]
%li
- %dt= t("instances.instances")
+ %dt= t("instances.instances.other")
%dd.count.instance= @statistics[:instances]
%dd.count.instance.pending= @statistics[:instances_pending]
%dd.count.instance.failure= @statistics[:instances_failed]
diff --git a/src/app/views/pools/_scoreboard_show.html.haml
b/src/app/views/pools/_scoreboard_show.html.haml
index 8bba937..9f457b3 100644
--- a/src/app/views/pools/_scoreboard_show.html.haml
+++ b/src/app/views/pools/_scoreboard_show.html.haml
@@ -8,7 +8,7 @@
%dt=t'deployments.deployments'
%dd.count.deployment= @statistics[:deployments]
%li
- %dt=t'instances.instances'
+ %dt=t'instances.instances.other'
%dd.count.instance= @statistics[:instances_deployed]
%dd.count.instance.pending= @statistics[:instances_pending]
%dd.count.instance.failure= @statistics[:instances_failed]
diff --git a/src/app/views/settings/self_service.html.haml
b/src/app/views/settings/self_service.html.haml
index 2ed2be3..2567883 100644
--- a/src/app/views/settings/self_service.html.haml
+++ b/src/app/views/settings/self_service.html.haml
@@ -17,7 +17,7 @@
= hidden_field :self_service_default_quota, :id
%p
%label
- =t 'instances.instances'
+ =t 'instances.instances.other'
= t('.quota') + ":"
= text_field :self_service_default_quota, :maximum_running_instances, :class
=> 'grid_5'
%fieldset.options
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index a996011..ac47e5d 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -272,7 +272,9 @@ en:
preset_filters:
all_deployments: All Deployments
instances:
- instances: Instances
+ instances:
+ one: Instance
+ other: Instances
reboot: Reboot
instance: Instance
none_selected: "You must select one or more instances to stop."
Self-ack & pushed.