[PATCH 2/2] BZ 809894 fix duplicate error message, I18n the error message
Tzu-Mainn Chen
tzumainn at redhat.com
Wed Apr 4 15:35:55 UTC 2012
---
src/app/models/deployment.rb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 509bb10..4f80aff 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -287,7 +287,7 @@ class Deployment < ActiveRecord::Base
begin
deployable_xml.assemblies.each do |assembly|
hw_profile = permissioned_frontend_hwprofile(user, assembly.hwp)
- raise "Hardware Profile #{assembly.hwp} not found." unless hw_profile
+ raise I18n.t('deployments.flash.error.no_hwp_permission', :hwp => assembly.hwp) unless hw_profile
instance = Instance.new(
:deployment => self,
:name => "#{name}/#{assembly.name}",
@@ -321,7 +321,7 @@ class Deployment < ActiveRecord::Base
raise Aeolus::Conductor::MultiError::UnlaunchableAssembly.new(I18n.t('deployments.flash.error.not_launched'), deployment_errors)
end
rescue
- errs = $!.message
+ errs << $!.message
end
errs
end
@@ -524,7 +524,7 @@ class Deployment < ActiveRecord::Base
deployable_xml.assemblies.each do |assembly|
begin
hw_profile = permissioned_frontend_hwprofile(user, assembly.hwp)
- raise "Hardware Profile #{assembly.hwp} not found." unless hw_profile
+ raise I18n.t('deployments.flash.error.no_hwp_permission', :hwp => assembly.hwp) unless hw_profile
Instance.transaction do
instance = Instance.create!(
:deployment => self,
--
1.7.6.5
More information about the aeolus-devel
mailing list