=?yes?q?=5BPATCH=20conductor=201/2=5D=20BZ798555=20added=20default=20translations=20from=20rails-i18n=20gem=20which=20should=20be=20used=20in=20later=20versions?=
jtomasek at redhat.com
jtomasek at redhat.com
Tue Mar 6 16:28:36 UTC 2012
From: Jiri Tomasek <jtomasek at redhat.com>
---
src/app/views/layouts/_error_messages.html.haml | 2 +-
src/config/locales/defaults/en.yml | 205 ++++++++++++++++++++++
src/config/locales/defaults/fr.yml | 207 +++++++++++++++++++++++
src/config/locales/defaults/ja.yml | 197 +++++++++++++++++++++
src/config/locales/en.yml | 22 +--
5 files changed, 615 insertions(+), 18 deletions(-)
create mode 100644 src/config/locales/defaults/en.yml
create mode 100644 src/config/locales/defaults/fr.yml
create mode 100644 src/config/locales/defaults/ja.yml
diff --git a/src/app/views/layouts/_error_messages.html.haml b/src/app/views/layouts/_error_messages.html.haml
index 39d9720..5ce1fab 100644
--- a/src/app/views/layouts/_error_messages.html.haml
+++ b/src/app/views/layouts/_error_messages.html.haml
@@ -5,6 +5,6 @@
=image_tag 'flash_warning_icon.png', :alt => 'Errors'
%ul.flashes
%li
- %strong= pluralize(object.errors.count, "error") + " prohibited this record from being saved:"
+ %strong= t("errors.template.header", :count => object.errors.count)
- object.errors.full_messages.each do |msg|
%li= msg
diff --git a/src/config/locales/defaults/en.yml b/src/config/locales/defaults/en.yml
new file mode 100644
index 0000000..ca5c85f
--- /dev/null
+++ b/src/config/locales/defaults/en.yml
@@ -0,0 +1,205 @@
+en:
+ date:
+ abbr_day_names:
+ - Sun
+ - Mon
+ - Tue
+ - Wed
+ - Thu
+ - Fri
+ - Sat
+ abbr_month_names:
+ -
+ - Jan
+ - Feb
+ - Mar
+ - Apr
+ - May
+ - Jun
+ - Jul
+ - Aug
+ - Sep
+ - Oct
+ - Nov
+ - Dec
+ day_names:
+ - Sunday
+ - Monday
+ - Tuesday
+ - Wednesday
+ - Thursday
+ - Friday
+ - Saturday
+ formats:
+ default: ! '%Y-%m-%d'
+ long: ! '%B %d, %Y'
+ short: ! '%b %d'
+ month_names:
+ -
+ - January
+ - February
+ - March
+ - April
+ - May
+ - June
+ - July
+ - August
+ - September
+ - October
+ - November
+ - December
+ order:
+ - :year
+ - :month
+ - :day
+ datetime:
+ distance_in_words:
+ about_x_hours:
+ one: about 1 hour
+ other: about %{count} hours
+ about_x_months:
+ one: about 1 month
+ other: about %{count} months
+ about_x_years:
+ one: about 1 year
+ other: about %{count} years
+ almost_x_years:
+ one: almost 1 year
+ other: almost %{count} years
+ half_a_minute: half a minute
+ less_than_x_minutes:
+ one: less than a minute
+ other: less than %{count} minutes
+ less_than_x_seconds:
+ one: less than 1 second
+ other: less than %{count} seconds
+ over_x_years:
+ one: over 1 year
+ other: over %{count} years
+ x_days:
+ one: 1 day
+ other: ! '%{count} days'
+ x_minutes:
+ one: 1 minute
+ other: ! '%{count} minutes'
+ x_months:
+ one: 1 month
+ other: ! '%{count} months'
+ x_seconds:
+ one: 1 second
+ other: ! '%{count} seconds'
+ prompts:
+ day: Day
+ hour: Hour
+ minute: Minute
+ month: Month
+ second: Seconds
+ year: Year
+ errors: &errors
+ format: ! '%{attribute} %{message}'
+ messages:
+ accepted: must be accepted
+ blank: can't be blank
+ confirmation: doesn't match confirmation
+ empty: can't be empty
+ equal_to: must be equal to %{count}
+ even: must be even
+ exclusion: is reserved
+ greater_than: must be greater than %{count}
+ greater_than_or_equal_to: must be greater than or equal to %{count}
+ inclusion: is not included in the list
+ invalid: is invalid
+ less_than: must be less than %{count}
+ less_than_or_equal_to: must be less than or equal to %{count}
+ not_a_number: is not a number
+ not_an_integer: must be an integer
+ odd: must be odd
+ record_invalid: ! 'Validation failed: %{errors}'
+ taken: has already been taken
+ too_long:
+ one: is too long (maximum is 1 character)
+ other: is too long (maximum is %{count} characters)
+ too_short:
+ one: is too short (minimum is 1 character)
+ other: is too short (minimum is %{count} characters)
+ wrong_length:
+ one: is the wrong length (should be 1 character)
+ other: is the wrong length (should be %{count} characters)
+ template:
+ body: ! 'There were problems with the following fields:'
+ header:
+ one: 1 error prohibited this %{model} from being saved
+ other: ! '%{count} errors prohibited this %{model} from being saved'
+ helpers:
+ select:
+ prompt: Please select
+ submit:
+ create: Create %{model}
+ submit: Save %{model}
+ update: Update %{model}
+ number:
+ currency:
+ format:
+ delimiter: ! ','
+ format: ! '%u%n'
+ precision: 2
+ separator: .
+ significant: false
+ strip_insignificant_zeros: false
+ unit: $
+ format:
+ delimiter: ! ','
+ precision: 3
+ separator: .
+ significant: false
+ strip_insignificant_zeros: false
+ human:
+ decimal_units:
+ format: ! '%n %u'
+ units:
+ billion: Billion
+ million: Million
+ quadrillion: Quadrillion
+ thousand: Thousand
+ trillion: Trillion
+ unit: ''
+ format:
+ delimiter: ''
+ precision: 3
+ significant: true
+ strip_insignificant_zeros: true
+ storage_units:
+ format: ! '%n %u'
+ units:
+ byte:
+ one: Byte
+ other: Bytes
+ gb: GB
+ kb: KB
+ mb: MB
+ tb: TB
+ percentage:
+ format:
+ delimiter: ''
+ precision:
+ format:
+ delimiter: ''
+ support:
+ array:
+ last_word_connector: ! ', and '
+ two_words_connector: ! ' and '
+ words_connector: ! ', '
+ time:
+ am: am
+ formats:
+ default: ! '%a, %d %b %Y %H:%M:%S %z'
+ long: ! '%B %d, %Y %H:%M'
+ short: ! '%d %b %H:%M'
+ pm: pm
+ # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
+ activemodel:
+ errors:
+ <<: *errors
+ activerecord:
+ errors:
+ <<: *errors
diff --git a/src/config/locales/defaults/fr.yml b/src/config/locales/defaults/fr.yml
new file mode 100644
index 0000000..d8c4e8c
--- /dev/null
+++ b/src/config/locales/defaults/fr.yml
@@ -0,0 +1,207 @@
+fr:
+ date:
+ abbr_day_names:
+ - dim
+ - lun
+ - mar
+ - mer
+ - jeu
+ - ven
+ - sam
+ abbr_month_names:
+ -
+ - jan.
+ - fév.
+ - mar.
+ - avr.
+ - mai
+ - juin
+ - juil.
+ - août
+ - sept.
+ - oct.
+ - nov.
+ - déc.
+ day_names:
+ - dimanche
+ - lundi
+ - mardi
+ - mercredi
+ - jeudi
+ - vendredi
+ - samedi
+ formats:
+ default: ! '%d/%m/%Y'
+ long: ! '%e %B %Y'
+ short: ! '%e %b'
+ month_names:
+ -
+ - janvier
+ - février
+ - mars
+ - avril
+ - mai
+ - juin
+ - juillet
+ - août
+ - septembre
+ - octobre
+ - novembre
+ - décembre
+ order:
+ - :day
+ - :month
+ - :year
+ datetime:
+ distance_in_words:
+ about_x_hours:
+ one: environ %{count} heure
+ other: environ %{count} heures
+ about_x_months:
+ one: environ %{count} mois
+ other: environ %{count} mois
+ about_x_years:
+ one: environ %{count} an
+ other: environ %{count} ans
+ almost_x_years:
+ one: presque %{count} an
+ other: presque %{count} ans
+ half_a_minute: une demi-minute
+ less_than_x_minutes:
+ one: moins de %{count} minute
+ other: moins de %{count} minutes
+ zero: moins d'une minute
+ less_than_x_seconds:
+ one: moins de %{count} seconde
+ other: moins de %{count} secondes
+ zero: moins d'une seconde
+ over_x_years:
+ one: plus de %{count} an
+ other: plus de %{count} ans
+ x_days:
+ one: ! '%{count} jour'
+ other: ! '%{count} jours'
+ x_minutes:
+ one: ! '%{count} minute'
+ other: ! '%{count} minutes'
+ x_months:
+ one: ! '%{count} mois'
+ other: ! '%{count} mois'
+ x_seconds:
+ one: ! '%{count} seconde'
+ other: ! '%{count} secondes'
+ prompts:
+ day: Jour
+ hour: Heure
+ minute: Minute
+ month: Mois
+ second: Seconde
+ year: Année
+ errors: &errors
+ format: Le %{attribute} %{message}
+ messages:
+ accepted: doit être accepté(e)
+ blank: doit être rempli(e)
+ confirmation: ne concorde pas avec la confirmation
+ empty: doit être rempli(e)
+ equal_to: doit être égal à %{count}
+ even: doit être pair
+ exclusion: n'est pas disponible
+ greater_than: doit être supérieur à %{count}
+ greater_than_or_equal_to: doit être supérieur ou égal à %{count}
+ inclusion: n'est pas inclus(e) dans la liste
+ invalid: n'est pas valide
+ less_than: doit être inférieur à %{count}
+ less_than_or_equal_to: doit être inférieur ou égal à %{count}
+ not_a_number: n'est pas un nombre
+ not_an_integer: doit être un nombre entier
+ odd: doit être impair
+ record_invalid: ! 'La validation a échoué : %{errors}'
+ taken: n'est pas disponible
+ too_long:
+ one: est trop long (pas plus de %{count} caractère)
+ other: est trop long (pas plus de %{count} caractères)
+ too_short:
+ one: est trop court (au moins %{count} caractère)
+ other: est trop court (au moins %{count} caractères)
+ wrong_length:
+ one: ne fait pas la bonne longueur (doit comporter %{count} caractère)
+ other: ne fait pas la bonne longueur (doit comporter %{count} caractères)
+ template:
+ body: ! 'Veuillez vérifier les champs suivants : '
+ header:
+ one: ! 'Impossible d''enregistrer ce(tte) %{model} : %{count} erreur'
+ other: ! 'Impossible d''enregistrer ce(tte) %{model} : %{count} erreurs'
+ helpers:
+ select:
+ prompt: Veuillez sélectionner
+ submit:
+ create: Créer un(e) %{model}
+ submit: Enregistrer ce(tte) %{model}
+ update: Modifier ce(tte) %{model}
+ number:
+ currency:
+ format:
+ delimiter: ! ' '
+ format: ! '%n %u'
+ precision: 2
+ separator: ! ','
+ significant: false
+ strip_insignificant_zeros: false
+ unit: €
+ format:
+ delimiter: ! ' '
+ precision: 3
+ separator: ! ','
+ significant: false
+ strip_insignificant_zeros: false
+ human:
+ decimal_units:
+ format: ! '%n %u'
+ units:
+ billion: milliard
+ million: million
+ quadrillion: million de milliards
+ thousand: millier
+ trillion: billion
+ unit: ''
+ format:
+ delimiter: ''
+ precision: 2
+ significant: true
+ strip_insignificant_zeros: true
+ storage_units:
+ format: ! '%n %u'
+ units:
+ byte:
+ one: octet
+ other: octets
+ gb: Go
+ kb: ko
+ mb: Mo
+ tb: To
+ percentage:
+ format:
+ delimiter: ''
+ precision:
+ format:
+ delimiter: ''
+ support:
+ array:
+ last_word_connector: ! ' et '
+ two_words_connector: ! ' et '
+ words_connector: ! ', '
+ time:
+ am: am
+ formats:
+ default: ! '%d %B %Y %H:%M:%S'
+ long: ! '%A %d %B %Y %H:%M'
+ short: ! '%d %b %H:%M'
+ pm: pm
+ # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
+ activemodel:
+ errors:
+ <<: *errors
+ activerecord:
+ errors:
+ <<: *errors
diff --git a/src/config/locales/defaults/ja.yml b/src/config/locales/defaults/ja.yml
new file mode 100644
index 0000000..ec25b8d
--- /dev/null
+++ b/src/config/locales/defaults/ja.yml
@@ -0,0 +1,197 @@
+ja:
+ date:
+ abbr_day_names:
+ - 日
+ - 月
+ - 火
+ - 水
+ - 木
+ - 金
+ - 土
+ abbr_month_names:
+ -
+ - 1月
+ - 2月
+ - 3月
+ - 4月
+ - 5月
+ - 6月
+ - 7月
+ - 8月
+ - 9月
+ - 10月
+ - 11月
+ - 12月
+ day_names:
+ - 日曜日
+ - 月曜日
+ - 火曜日
+ - 水曜日
+ - 木曜日
+ - 金曜日
+ - 土曜日
+ formats:
+ default: ! '%Y/%m/%d'
+ long: ! '%Y年%m月%d日(%a)'
+ short: ! '%m/%d'
+ month_names:
+ -
+ - 1月
+ - 2月
+ - 3月
+ - 4月
+ - 5月
+ - 6月
+ - 7月
+ - 8月
+ - 9月
+ - 10月
+ - 11月
+ - 12月
+ order:
+ - :year
+ - :month
+ - :day
+ datetime:
+ distance_in_words:
+ about_x_hours:
+ one: 約1時間
+ other: 約%{count}時間
+ about_x_months:
+ one: 約1ヶ月
+ other: 約%{count}ヶ月
+ about_x_years:
+ one: 約1年
+ other: 約%{count}年
+ almost_x_years:
+ one: 1年弱
+ other: ! '%{count}年弱'
+ half_a_minute: 30秒前後
+ less_than_x_minutes:
+ one: 1分以内
+ other: ! '%{count}分以内'
+ less_than_x_seconds:
+ one: 1秒以内
+ other: ! '%{count}秒以内'
+ over_x_years:
+ one: 1年以上
+ other: ! '%{count}年以上'
+ x_days:
+ one: 1日
+ other: ! '%{count}日'
+ x_minutes:
+ one: 1分
+ other: ! '%{count}分'
+ x_months:
+ one: 1ヶ月
+ other: ! '%{count}ヶ月'
+ x_seconds:
+ one: 1秒
+ other: ! '%{count}秒'
+ prompts:
+ day: 日
+ hour: 時
+ minute: 分
+ month: 月
+ second: 秒
+ year: 年
+ errors: &errors
+ format: ! '%{attribute}%{message}'
+ messages:
+ accepted: を受諾してください。
+ blank: を入力してください。
+ confirmation: と確認の入力が一致しません。
+ empty: を入力してください。
+ equal_to: は%{count}にしてください。
+ even: は偶数にしてください。
+ exclusion: は予約されています。
+ greater_than: は%{count}より大きい値にしてください。
+ greater_than_or_equal_to: は%{count}以上の値にしてください。
+ inclusion: は一覧にありません。
+ invalid: は不正な値です。
+ less_than: は%{count}より小さい値にしてください。
+ less_than_or_equal_to: は%{count}以下の値にしてください。
+ not_a_number: は数値で入力してください。
+ not_an_integer: は整数で入力してください。
+ odd: は奇数にしてください。
+ record_invalid: バリデーションに失敗しました。 %{errors}
+ taken: はすでに存在します。
+ too_long: は%{count}文字以内で入力してください。
+ too_short: は%{count}文字以上で入力してください。
+ wrong_length: は%{count}文字で入力してください。
+ template:
+ body: 次の項目を確認してください。
+ header:
+ one: ! '%{model}にエラーが発生しました。'
+ other: ! '%{model}に%{count}つのエラーが発生しました。'
+ helpers:
+ select:
+ prompt: 選択してください。
+ submit:
+ create: 登録する
+ submit: 保存する
+ update: 更新する
+ number:
+ currency:
+ format:
+ delimiter: ! ','
+ format: ! '%n%u'
+ precision: 0
+ separator: .
+ significant: false
+ strip_insignificant_zeros: false
+ unit: 円
+ format:
+ delimiter: ! ','
+ precision: 3
+ separator: .
+ significant: false
+ strip_insignificant_zeros: false
+ human:
+ decimal_units:
+ format: ! '%n %u'
+ units:
+ billion: 十億
+ million: 百万
+ quadrillion: 千兆
+ thousand: 千
+ trillion: 兆
+ unit: ''
+ format:
+ delimiter: ''
+ precision: 3
+ significant: true
+ strip_insignificant_zeros: true
+ storage_units:
+ format: ! '%n%u'
+ units:
+ byte: バイト
+ gb: ギガバイト
+ kb: キロバイト
+ mb: メガバイト
+ tb: テラバイト
+ percentage:
+ format:
+ delimiter: ''
+ precision:
+ format:
+ delimiter: ''
+ support:
+ array:
+ last_word_connector: と
+ two_words_connector: と
+ words_connector: と
+ time:
+ am: 午前
+ formats:
+ default: ! '%Y/%m/%d %H:%M:%S'
+ long: ! '%Y年%m月%d日(%a) %H時%M分%S秒 %z'
+ short: ! '%y/%m/%d %H:%M'
+ pm: 午後
+ # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
+ activemodel:
+ errors:
+ <<: *errors
+ activerecord:
+ errors:
+ <<: *errors
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 4bcbbc5..1ce89a3 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -8,6 +8,11 @@ en:
x_hours:
one: 1 hour
other: "%{count} hours"
+ errors:
+ template:
+ header:
+ one: 1 error prohibited this record from being saved
+ other: '%{count} errors prohibited this record from being saved'
search:
no_results: "No matching results."
users:
@@ -1263,18 +1268,6 @@ en:
more_deleted: "These Roles were deleted:"
error:
more_not_deleted: "Could not delete these Roles:"
- date:
- formats:
- default: "%Y-%m-%d"
- short: "%b %d"
- long: "%B %d, %Y"
- time:
- formats:
- default: "%a, %d %b %Y %H:%M:%S %z"
- short: "%d %b %H:%M"
- long: "%d %B, %Y %H:%M"
- am: "am"
- pm: "pm"
navigation:
first_level:
monitor: Monitor
@@ -1334,11 +1327,6 @@ en:
target_image_not_found_for_account: Could not find an appropriate target image for account %{account}
target_not_found: Could not find Target %{target}
target_not_found_in_environment: "Target %{target} has no provider accounts in this environment. Valid targets include %{targets}."
- support:
- array:
- words_connector: ', '
- two_words_connector: ' and '
- last_word_connector: ', and '
breadcrumbs:
pools: Pools
instances: Instances
--
1.7.7.6
More information about the aeolus-devel
mailing list