[PATCH conductor 2/2] BZ798575 removed classnames translations and replaced it with activerecord translations

jtomasek at redhat.com jtomasek at redhat.com
Wed Mar 7 15:59:14 UTC 2012


From: Jiri Tomasek <jtomasek at redhat.com>

---
 src/app/controllers/permissions_controller.rb |    4 ++--
 src/config/locales/activerecord/en.yml        |    2 +-
 src/config/locales/classnames/en.yml          |   11 -----------
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 src/config/locales/classnames/en.yml

diff --git a/src/app/controllers/permissions_controller.rb b/src/app/controllers/permissions_controller.rb
index 37c5979..67ca3cd 100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
@@ -37,8 +37,8 @@ class PermissionsController < ApplicationController
       @return_text = t("permissions.new.global_role_grants")
       @summary_text =  t("permissions.new.choose_global_role")
     else
-      @return_text =  "#{@permission_object.name} " + t("classnames.#{@permission_object.class.to_s.downcase}")
-      @summary_text = t('permissions.new.choose_roles') + " " + t("classnames.#{@permission_object.class.to_s.downcase}")
+      @return_text =  "#{@permission_object.name} " + @permission_object.class.model_name.human
+      @summary_text = t('permissions.new.choose_roles') + " " + @permission_object.class.model_name.human
     end
     load_headers
     load_users
diff --git a/src/config/locales/activerecord/en.yml b/src/config/locales/activerecord/en.yml
index e93499c..3e8839f 100644
--- a/src/config/locales/activerecord/en.yml
+++ b/src/config/locales/activerecord/en.yml
@@ -12,7 +12,7 @@ en:
       deployment: "Deployment"
       event: "Event"
       frontend_realm: "Frontend Realm"
-      hardware_profile_propertie: "Hardware Profile Propertie"
+      hardware_profile_property: "Hardware Profile Property"
       hardware_profile: "Hardware Profile"
       hook: "Hook"
       icicle: "Icicle"
diff --git a/src/config/locales/classnames/en.yml b/src/config/locales/classnames/en.yml
deleted file mode 100644
index aa7bbd1..0000000
--- a/src/config/locales/classnames/en.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-en:
-  classnames:
-    catalog: Catalog
-    deployable: Deployable
-    deployment: Deployment
-    hardwareprofile: HWP
-    instance: Instance
-    pool: Pool
-    poolfamily: Pool Family
-    provider: Provider
-    provideraccount: Provider Account
-- 
1.7.7.6




More information about the aeolus-devel mailing list