From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/controllers/application_controller.rb | 2 +-
src/app/controllers/catalogs_controller.rb | 4 ++--
src/app/controllers/deployments_controller.rb | 2 +-
src/app/controllers/pools_controller.rb | 4 ++--
src/app/controllers/realm_mappings_controller.rb | 2 +-
src/app/views/pools/_header_show.html.haml | 2 +-
src/app/views/pools/_scoreboard_index.html.haml | 2 +-
src/config/locales/en.yml | 9 ++++++---
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb
index 1a26272..4247fe4 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -302,7 +302,7 @@ class ApplicationController < ActionController::Base
end
def set_locale
- I18n.locale = detect_locale || I18n.default_locale
+ I18n.locale = env.nil? ? I18n.default_locale : detect_locale
end
def detect_locale
diff --git a/src/app/controllers/catalogs_controller.rb
b/src/app/controllers/catalogs_controller.rb
index 1272a6a..db8e824 100644
--- a/src/app/controllers/catalogs_controller.rb
+++ b/src/app/controllers/catalogs_controller.rb
@@ -86,7 +86,7 @@ class CatalogsController < ApplicationController
require_privilege(Privilege::MODIFY, catalog)
catalog.destroy
end
- redirect_to catalogs_path, :notice => t("catalogs.deleted", :count =>
catalogs.count)
+ redirect_to catalogs_path, :notice => t("catalogs.flash.notice.deleted",
:count => catalogs.count)
end
def destroy
@@ -95,7 +95,7 @@ class CatalogsController < ApplicationController
catalog.destroy
respond_to do |format|
- format.html { redirect_to catalogs_path, :notice =>
t("catalogs.deleted", :count => 1) }
+ format.html { redirect_to catalogs_path, :notice =>
t("catalogs.flash.notice.deleted", :count => 1) }
end
end
diff --git a/src/app/controllers/deployments_controller.rb
b/src/app/controllers/deployments_controller.rb
index a488d0a..9d32123 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -330,7 +330,7 @@ class DeploymentsController < ApplicationController
{ :name => t("pools.index.deployed_on"), :sortable => false },
{ :name => t("deployables.index.base_deployable"), :sortable =>
false },
{ :name => t("instances.instances"), :class => 'center',
:sortable => false },
- { :name => t("pools.index.pool"), :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 53d0eaf..0066cd8 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -41,7 +41,7 @@ class PoolsController < ApplicationController
@user_pools = Pool.list_for_user(current_user, Privilege::VIEW)
@user_pool_families = PoolFamily.list_for_user(current_user, Privilege::VIEW)
if filter_view?
- @tabs = [{:name => "#{t'pools.index.pools'}", :view =>
'list', :id => 'pools'},
+ @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'},
]
@@ -264,7 +264,7 @@ class PoolsController < ApplicationController
{ :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("pools.index.pool"), :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/realm_mappings_controller.rb
b/src/app/controllers/realm_mappings_controller.rb
index fb49979..c9afcaf 100644
--- a/src/app/controllers/realm_mappings_controller.rb
+++ b/src/app/controllers/realm_mappings_controller.rb
@@ -29,7 +29,7 @@ class RealmMappingsController < ApplicationController
require_privilege(Privilege::CREATE, Realm)
@realm_target = RealmBackendTarget.new(params[:realm_backend_target])
if @realm_target.save
- flash[:notice] = t"realms.flash.notice.added_"
+ flash[:notice] = t"realms.flash.notice.added_mapping"
redirect_to realm_path((a)realm_target.frontend_realm, :details_tab =>
'mapping') and return
#redirect_to realms_path and return
end
diff --git a/src/app/views/pools/_header_show.html.haml
b/src/app/views/pools/_header_show.html.haml
index 08956b0..04a1797 100644
--- a/src/app/views/pools/_header_show.html.haml
+++ b/src/app/views/pools/_header_show.html.haml
@@ -1,6 +1,6 @@
%header.page-header
%h1.pools
- = [@pool.name, "#{t'pools.index.pool'}"].join(' ')
+ = [@pool.name, "#{t'pools.pool'}"].join(' ')
#obj_actions.button-container
= link_to t('deployments.new_deployment'),
launch_new_deployments_path(:pool_id => @pool.id), :class => 'button
primary', :id => 'new_deployment_button'
.button-group
diff --git a/src/app/views/pools/_scoreboard_index.html.haml
b/src/app/views/pools/_scoreboard_index.html.haml
index dfdfec7..4987850 100644
--- a/src/app/views/pools/_scoreboard_index.html.haml
+++ b/src/app/views/pools/_scoreboard_index.html.haml
@@ -2,7 +2,7 @@
%dl.statistics
%ul.groups
%li
- %dt= t("pools.index.pools")
+ %dt= t("pools.pools")
%dd.count.pool= @user_pools.count
%dd.count.pool.partial= @statistics[:pools_in_use]
%li
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index b3fa663..b001774 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -244,12 +244,12 @@ en:
cloud_engine_hardware_profiles: Hardware Profiles
cloud_engine_realms: Realms
pools:
+ pool: Pool
pools: Pools
new_pool: New Pool
edit_pool: Edit Pool
create_new_pool: Create New Pool
index:
- pool: Pool
pool_name: Pool name
deployment_name: Deployment name
deployed_on: Deployed on
@@ -374,10 +374,13 @@ en:
notice:
updated:
one: Catalog updated successfully!
- many: Catalogs updated successfully!
+ other: Catalogs updated successfully!
created:
one: Catalog created!
- many: Catalogs created!
+ other: Catalogs created!
+ deleted:
+ one: Catalog deleted!
+ other: "%{count} Catalogs deleted!"
deployables:
index:
deployables: Deployables
--
1.7.6.4