[PATCH conductor 2/2] Unifiy the way we store error messages for model attributes
ifarkas at redhat.com
ifarkas at redhat.com
Mon May 28 12:38:31 UTC 2012
From: Imre Farkas <ifarkas at redhat.com>
---
src/app/models/provider.rb | 4 ++--
src/config/locales/activerecord/en.yml | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index 8fb7685..fe9ab97 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -263,8 +263,8 @@ class Provider < ActiveRecord::Base
def validate_provider
if !nil_or_empty(url)
- errors.add("url", I18n.t("activerecord.errors.provider.url")) unless valid_framework?
- #errors.add("deltacloud_provider", I18n.t("activerecord.errors.provider.deltacloud_provider")) unless valid_provider?
+ errors.add('url', :invalid_framework) unless valid_framework?
+ #errors.add('deltacloud_provider', :invalid_provider) unless valid_provider?
end
end
diff --git a/src/config/locales/activerecord/en.yml b/src/config/locales/activerecord/en.yml
index edab8a6..5f301b0 100644
--- a/src/config/locales/activerecord/en.yml
+++ b/src/config/locales/activerecord/en.yml
@@ -344,9 +344,6 @@ en:
created_at: "Created At"
updated_at: "Updated At"
errors:
- provider:
- url: "Must be a valid provider uri"
- deltacloud_provider: "Must be a valid provider identifier"
models:
pool:
attributes:
@@ -360,3 +357,7 @@ en:
attributes:
name:
invalid: "must only contain: numbers, letters, spaces, '_' and '-'"
+ url:
+ invalid_framework: "Must be a valid provider uri"
+ deltacloud_provider:
+ invalid_provider: "Must be a valid provider identifier"
--
1.7.6.5
More information about the aeolus-devel
mailing list