From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/models/pool.rb | 2 +-
src/app/models/pool_family.rb | 2 +-
src/app/models/provider.rb | 2 +-
src/config/locales/activerecord/de.yml | 14 ++++++++++++++
src/config/locales/activerecord/en.yml | 13 +++++++++++++
src/config/locales/activerecord/es.yml | 14 ++++++++++++++
src/config/locales/activerecord/fr.yml | 14 ++++++++++++++
src/config/locales/activerecord/it.yml | 14 ++++++++++++++
src/config/locales/activerecord/ja.yml | 14 ++++++++++++++
src/config/locales/activerecord/ko.yml | 14 ++++++++++++++
src/config/locales/activerecord/pt-BR.yml | 14 ++++++++++++++
src/config/locales/activerecord/ru.yml | 14 ++++++++++++++
src/config/locales/activerecord/zh-CN.yml | 14 ++++++++++++++
src/config/locales/activerecord/zh-TW.yml | 14 ++++++++++++++
src/config/locales/de.yml | 1 -
src/config/locales/en.yml | 1 -
src/config/locales/es.yml | 1 -
src/config/locales/fr.yml | 1 -
src/config/locales/it.yml | 1 -
src/config/locales/ja.yml | 1 -
src/config/locales/ko.yml | 1 -
src/config/locales/pt-BR.yml | 1 -
src/config/locales/ru.yml | 1 -
src/config/locales/zh-CN.yml | 1 -
src/config/locales/zh-TW.yml | 1 -
25 files changed, 156 insertions(+), 14 deletions(-)
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index a47a64a..4b3fe95 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -55,7 +55,7 @@ class Pool < ActiveRecord::Base
validates_uniqueness_of :exported_as, :if => :exported_as
validates_length_of :name, :maximum => 255
- validates_format_of :name, :with => /^[\w -]*$/n, :message =>
I18n.t('pools.valid_format_of_name')
+ validates_format_of :name, :with => /^[\w -]*$/n
has_many :permissions, :as => :permission_object, :dependent => :destroy,
:include => [:role],
diff --git a/src/app/models/pool_family.rb b/src/app/models/pool_family.rb
index 60fb0cb..f464723 100644
--- a/src/app/models/pool_family.rb
+++ b/src/app/models/pool_family.rb
@@ -53,7 +53,7 @@ class PoolFamily < ActiveRecord::Base
has_many :deployments
validates_length_of :name, :maximum => 255
- validates_format_of :name, :with => /^[\w -]*$/n, :message => "must only
contain: numbers, letters, spaces, '_' and '-'"
+ validates_format_of :name, :with => /^[\w -]*$/n
validates_presence_of :name
validates_uniqueness_of :name
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index e61e5a6..8fb7685 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -49,7 +49,7 @@ class Provider < ActiveRecord::Base
validates_presence_of :provider_type_id
validates_presence_of :url
- validates_format_of :name, :with => /^[\w -]*$/n, :message => "must only
contain: numbers, letters, spaces, '_' and '-'"
+ validates_format_of :name, :with => /^[\w -]*$/n
validates_length_of :name, :maximum => 255
validate :validate_provider
diff --git a/src/config/locales/activerecord/de.yml
b/src/config/locales/activerecord/de.yml
index 555fe16..52e4308 100644
--- a/src/config/locales/activerecord/de.yml
+++ b/src/config/locales/activerecord/de.yml
@@ -343,3 +343,17 @@ de:
task: Aufgabe
user: Benutzer
view_state: "Status anzeigen"
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "darf nur enthalten: Ziffern, Buchstaben, Leerzeichen,
'_' und '-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "darf nur enthalten: Ziffern, Buchstaben, Leerzeichen,
'_' und '-'"
+ provider:
+ attributes:
+ name:
+ invalid: "darf nur enthalten: Ziffern, Buchstaben, Leerzeichen,
'_' und '-'"
diff --git a/src/config/locales/activerecord/en.yml
b/src/config/locales/activerecord/en.yml
index 86b250f..edab8a6 100644
--- a/src/config/locales/activerecord/en.yml
+++ b/src/config/locales/activerecord/en.yml
@@ -347,3 +347,16 @@ en:
provider:
url: "Must be a valid provider uri"
deltacloud_provider: "Must be a valid provider identifier"
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "must only contain: numbers, letters, spaces, '_' and
'-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "must only contain: numbers, letters, spaces, '_' and
'-'"
+ provider:
+ attributes:
+ name:
+ invalid: "must only contain: numbers, letters, spaces, '_' and
'-'"
diff --git a/src/config/locales/activerecord/es.yml
b/src/config/locales/activerecord/es.yml
index f8aaf34..f02a125 100644
--- a/src/config/locales/activerecord/es.yml
+++ b/src/config/locales/activerecord/es.yml
@@ -343,3 +343,17 @@ es:
task: Tarea
user: Usuario
view_state: "Ver estado"
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "Debe contener únicamente: números, letras, espacios,
'_' y '-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "Debe contener únicamente: números, letras, espacios,
'_' y '-'"
+ provider:
+ attributes:
+ name:
+ invalid: "Debe contener únicamente: números, letras, espacios,
'_' y '-'"
diff --git a/src/config/locales/activerecord/fr.yml
b/src/config/locales/activerecord/fr.yml
index ad6905d..86b4459 100644
--- a/src/config/locales/activerecord/fr.yml
+++ b/src/config/locales/activerecord/fr.yml
@@ -343,3 +343,17 @@ fr:
task: Tâche
user: Utilisateur
view_state: "Afficher l'état"
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "doit uniquement contenir : nombres, lettres, espaces,
'_' et '-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "doit uniquement contenir : nombres, lettres, espaces,
'_' et '-'"
+ provider:
+ attributes:
+ name:
+ invalid: "doit uniquement contenir : nombres, lettres, espaces,
'_' et '-'"
diff --git a/src/config/locales/activerecord/it.yml
b/src/config/locales/activerecord/it.yml
index 8d8e7a8..ce7a73f 100644
--- a/src/config/locales/activerecord/it.yml
+++ b/src/config/locales/activerecord/it.yml
@@ -343,3 +343,17 @@ it:
task: Attività
user: Utente
view_state: "Visualizza stato"
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "deve contenere solo: numeri, lettere, spazi, '_' e
'-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "deve contenere solo: numeri, lettere, spazi, '_' e
'-'"
+ provider:
+ attributes:
+ name:
+ invalid: "deve contenere solo: numeri, lettere, spazi, '_' e
'-'"
diff --git a/src/config/locales/activerecord/ja.yml
b/src/config/locales/activerecord/ja.yml
index 13878c3..9cfef92 100644
--- a/src/config/locales/activerecord/ja.yml
+++ b/src/config/locales/activerecord/ja.yml
@@ -343,3 +343,17 @@ ja:
task: タスク
user: ユーザー
view_state: 表示状態
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: 数字、文字、空白、「_」、「-」以外は含ませないようにしてください。
+ pool_family:
+ attributes:
+ name:
+ invalid: 数字、文字、空白、「_」、「-」以外は含ませないようにしてください。
+ provider:
+ attributes:
+ name:
+ invalid: 数字、文字、空白、「_」、「-」以外は含ませないようにしてください。
diff --git a/src/config/locales/activerecord/ko.yml
b/src/config/locales/activerecord/ko.yml
index ecacfb5..afaa7fb 100644
--- a/src/config/locales/activerecord/ko.yml
+++ b/src/config/locales/activerecord/ko.yml
@@ -343,3 +343,17 @@ ko:
task: "작업 "
user: "사용자 "
view_state: "상태 보기 "
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "숫자, 문자, 공백, '_' 및 '-'만 사용할 수 있음 "
+ pool_family:
+ attributes:
+ name:
+ invalid: "숫자, 문자, 공백, '_' 및 '-'만 사용할 수 있음 "
+ provider:
+ attributes:
+ name:
+ invalid: "숫자, 문자, 공백, '_' 및 '-'만 사용할 수 있음 "
diff --git a/src/config/locales/activerecord/pt-BR.yml
b/src/config/locales/activerecord/pt-BR.yml
index 4204cb5..60e0e39 100644
--- a/src/config/locales/activerecord/pt-BR.yml
+++ b/src/config/locales/activerecord/pt-BR.yml
@@ -343,3 +343,17 @@ pt-BR:
task: Tarefa
user: Usuário
view_state: "Visualizar Estado"
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "deve conter: números, letras, espaços, '_' e
'-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "deve conter: números, letras, espaços, '_' e
'-'"
+ provider:
+ attributes:
+ name:
+ invalid: "deve conter: números, letras, espaços, '_' e
'-'"
diff --git a/src/config/locales/activerecord/ru.yml
b/src/config/locales/activerecord/ru.yml
index 23839ee..4f02e25 100644
--- a/src/config/locales/activerecord/ru.yml
+++ b/src/config/locales/activerecord/ru.yml
@@ -343,3 +343,17 @@ ru:
task: Задача
user: Пользователь
view_state: "Показать статус"
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "может содержать буквы, цифры, пробелы, «-», «_»"
+ pool_family:
+ attributes:
+ name:
+ invalid: "может содержать буквы, цифры, пробелы, «-», «_»"
+ provider:
+ attributes:
+ name:
+ invalid: "может содержать буквы, цифры, пробелы, «-», «_»"
diff --git a/src/config/locales/activerecord/zh-CN.yml
b/src/config/locales/activerecord/zh-CN.yml
index 876142d..47c56a2 100644
--- a/src/config/locales/activerecord/zh-CN.yml
+++ b/src/config/locales/activerecord/zh-CN.yml
@@ -343,3 +343,17 @@ zh-CN:
task: 任务
user: 用户
view_state: 查看状态
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: 只能包含文數字、空白字元、底線符號與減號
+ pool_family:
+ attributes:
+ name:
+ invalid: 只能包含文數字、空白字元、底線符號與減號
+ provider:
+ attributes:
+ name:
+ invalid: 只能包含文數字、空白字元、底線符號與減號
diff --git a/src/config/locales/activerecord/zh-TW.yml
b/src/config/locales/activerecord/zh-TW.yml
index 9d36be2..bce4d4f 100644
--- a/src/config/locales/activerecord/zh-TW.yml
+++ b/src/config/locales/activerecord/zh-TW.yml
@@ -343,3 +343,17 @@ zh-TW:
task: 工作
user: 使用者
view_state: 檢視狀態
+ errors:
+ models:
+ pool:
+ attributes:
+ name:
+ invalid: "必须只能包含:数字、字母、空格、'_' 和 '-'"
+ pool_family:
+ attributes:
+ name:
+ invalid: "必须只能包含:数字、字母、空格、'_' 和 '-'"
+ provider:
+ attributes:
+ name:
+ invalid: "必须只能包含:数字、字母、空格、'_' 和 '-'"
diff --git a/src/config/locales/de.yml b/src/config/locales/de.yml
index 4459569..fd40e7a 100644
--- a/src/config/locales/de.yml
+++ b/src/config/locales/de.yml
@@ -870,7 +870,6 @@ de:
with_stopped_instances: "Mit gestoppten Instanzen"
properties:
properties: "Eigenschaften für %{pool}"
- valid_format_of_name: "darf nur enthalten: Ziffern, Buchstaben, Leerzeichen,
'_' und '-'"
privileges: Privilegien
properties: Eigenschaften
provider_accounts:
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 7b1ca00..3b927fc 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -520,7 +520,6 @@ en:
iwhd_unavailable: Catalog Images are unavailable. It appears the image warehouse
is not reachable
warning:
creation_failed: Pool creation failed.
- valid_format_of_name: "must only contain: numbers, letters, spaces, '_'
and '-'"
list:
more_actions: More actions
form:
diff --git a/src/config/locales/es.yml b/src/config/locales/es.yml
index fbd8535..adc80c6 100644
--- a/src/config/locales/es.yml
+++ b/src/config/locales/es.yml
@@ -870,7 +870,6 @@ es:
with_stopped_instances: "Con instancias detenidas"
properties:
properties: "Propiedades para %{pool}"
- valid_format_of_name: "Debe contener únicamente: números, letras, espacios,
'_' y '-'"
privileges: Privilegios
properties: "Añadir cuenta"
provider_accounts:
diff --git a/src/config/locales/fr.yml b/src/config/locales/fr.yml
index 477fc89..59959d5 100644
--- a/src/config/locales/fr.yml
+++ b/src/config/locales/fr.yml
@@ -870,7 +870,6 @@ fr:
with_stopped_instances: "Avec des instances arrêtées"
properties:
properties: "Propriétés de %{pool}"
- valid_format_of_name: "doit uniquement contenir : nombres, lettres, espaces,
'_' et '-'"
privileges: Privilèges
properties: Propriétés
provider_accounts:
diff --git a/src/config/locales/it.yml b/src/config/locales/it.yml
index e7ef019..ab64a45 100644
--- a/src/config/locales/it.yml
+++ b/src/config/locales/it.yml
@@ -870,7 +870,6 @@ it:
with_stopped_instances: "Con istanze arrestate"
properties:
properties: "Proprietà per %{pool}"
- valid_format_of_name: "deve contenere solo: numeri, lettere, spazi, '_'
e '-'"
privileges: Privilegi
properties: Proprietà
provider_accounts:
diff --git a/src/config/locales/ja.yml b/src/config/locales/ja.yml
index d834b4e..efd088c 100644
--- a/src/config/locales/ja.yml
+++ b/src/config/locales/ja.yml
@@ -870,7 +870,6 @@ ja:
with_stopped_instances: 停止インスタンスあり
properties:
properties: "%{pool} のプロパティ"
- valid_format_of_name: 数字、文字、空白、「_」、「-」以外は含ませないようにしてください。
privileges: 特権
properties: プロパティ
provider_accounts:
diff --git a/src/config/locales/ko.yml b/src/config/locales/ko.yml
index 0e13f6d..b27ef3e 100644
--- a/src/config/locales/ko.yml
+++ b/src/config/locales/ko.yml
@@ -870,7 +870,6 @@ ko:
with_stopped_instances: "중지된 인스턴스로 "
properties:
properties: "%{pool}의 속성 "
- valid_format_of_name: "숫자, 문자, 공백, '_' 및 '-'만 사용할 수 있음 "
privileges: "권한 "
properties: "속성 "
provider_accounts:
diff --git a/src/config/locales/pt-BR.yml b/src/config/locales/pt-BR.yml
index 18634a9..b818c63 100644
--- a/src/config/locales/pt-BR.yml
+++ b/src/config/locales/pt-BR.yml
@@ -870,7 +870,6 @@ pt-BR:
with_stopped_instances: "Com Instâncias interrompidas"
properties:
properties: "Propriedades para %{pool}"
- valid_format_of_name: "deve conter: números, letras, espaços, '_' e
'-'"
privileges: Previlégios
properties: Propriedades
provider_accounts:
diff --git a/src/config/locales/ru.yml b/src/config/locales/ru.yml
index 25fb937..e4edf78 100644
--- a/src/config/locales/ru.yml
+++ b/src/config/locales/ru.yml
@@ -870,7 +870,6 @@ ru:
with_stopped_instances: "Включая остановленные"
properties:
properties: "Свойства %{pool}"
- valid_format_of_name: "может содержать буквы, цифры, пробелы, «-», «_»"
privileges: Права
properties: "Свойства "
provider_accounts:
diff --git a/src/config/locales/zh-CN.yml b/src/config/locales/zh-CN.yml
index fc1a645..571348f 100644
--- a/src/config/locales/zh-CN.yml
+++ b/src/config/locales/zh-CN.yml
@@ -870,7 +870,6 @@ zh-CN:
with_stopped_instances: 包含停止的实例
properties:
properties: "%{pool} 属性"
- valid_format_of_name: "必须只能包含:数字、字母、空格、'_' 和 '-'"
privileges: 特权
properties: 属性
provider_accounts:
diff --git a/src/config/locales/zh-TW.yml b/src/config/locales/zh-TW.yml
index 1996b89..adfe81a 100644
--- a/src/config/locales/zh-TW.yml
+++ b/src/config/locales/zh-TW.yml
@@ -870,7 +870,6 @@ zh-TW:
with_stopped_instances: "與停止的 instance"
properties:
properties: "%{pool} 的屬性"
- valid_format_of_name: 只能包含文數字、空白字元、底線符號與減號
privileges: 特權
properties: 屬性
provider_accounts:
--
1.7.6.5