Skip to content

Commit

Permalink
Moved :'activerecord.errors.messages.taken' and :'activerecord.errors…
Browse files Browse the repository at this point in the history
….messages.record_invalid' into the :'errors.messages' scope

Closes #136
  • Loading branch information
tigrish committed Oct 18, 2011
1 parent ec0d21a commit 988879e
Show file tree
Hide file tree
Showing 28 changed files with 56 additions and 56 deletions.
4 changes: 2 additions & 2 deletions rails/locale/ar.yml
Expand Up @@ -207,6 +207,8 @@
less_than_or_equal_to: "يجب أن يكون أصغر من أو يساوي %{count}" less_than_or_equal_to: "يجب أن يكون أصغر من أو يساوي %{count}"
odd: "يجب أن يكون فردي" odd: "يجب أن يكون فردي"
even: "يجب أن يكون زوجي" even: "يجب أن يكون زوجي"
taken: "غير متوفر (مستخدم)"
record_invalid: "%{errors} فشل التحقق من صحة"


activerecord: activerecord:
errors: errors:
Expand All @@ -217,8 +219,6 @@
body: "يرجى التحقق من الحقول التالية:" body: "يرجى التحقق من الحقول التالية:"


messages: messages:
taken: "غير متوفر (مستخدم)"
record_invalid: "%{errors} فشل التحقق من صحة"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/bg.yml
Expand Up @@ -214,6 +214,8 @@ bg:
less_than_or_equal_to: "трябва да има стойност, по-голяма или равна на %{count}" less_than_or_equal_to: "трябва да има стойност, по-голяма или равна на %{count}"
odd: "трябва да е четно" odd: "трябва да е четно"
even: "трябва да е нечетно" even: "трябва да е нечетно"
taken: "вече съществува"
record_invalid: "имаше грешки: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -224,8 +226,6 @@ bg:
body: "Възникнаха проблеми със следните полета:" body: "Възникнаха проблеми със следните полета:"


messages: messages:
taken: "вече съществува"
record_invalid: "имаше грешки: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/bs.yml
Expand Up @@ -241,6 +241,8 @@ bs:
less_than_or_equal_to: "mora biti manje ili jednako %{count}" less_than_or_equal_to: "mora biti manje ili jednako %{count}"
odd: "mora biti neparno" odd: "mora biti neparno"
even: "mora biti parno" even: "mora biti parno"
taken: "je već zauzet"
record_invalid: "Validacija nije uspjela: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -253,8 +255,6 @@ bs:
body: "Desili su se problemi sa slijedećim poljima:" body: "Desili su se problemi sa slijedećim poljima:"


messages: messages:
taken: "je već zauzet"
record_invalid: "Validacija nije uspjela: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/csb.yml
Expand Up @@ -214,6 +214,8 @@ csb:
less_than_or_equal_to: "mùszi bëc mniszé abò równé %{count}" less_than_or_equal_to: "mùszi bëc mniszé abò równé %{count}"
odd: "mùszi bëc nieparzësté" odd: "mùszi bëc nieparzësté"
even: "mùszé bëc parzësté" even: "mùszé bëc parzësté"
taken: "je ju zajãté"
record_invalid: "Negatiwné sprôwdzenié pòprawnoscë: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -224,8 +226,6 @@ csb:
body: "Fele tikają sã nëch pól:" body: "Fele tikają sã nëch pól:"


messages: messages:
taken: "je ju zajãté"
record_invalid: "Negatiwné sprôwdzenié pòprawnoscë: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/cy.yml
Expand Up @@ -203,6 +203,8 @@ cy:
less_than_or_equal_to: "angen bod yr un maint neu lai na %{count}" less_than_or_equal_to: "angen bod yr un maint neu lai na %{count}"
odd: "rhaid bod yn odrif" odd: "rhaid bod yn odrif"
even: "rhaid bod yn eilrif" even: "rhaid bod yn eilrif"
taken: "wedi'i gymryd yn barod"
record_invalid: "Gwirio wedi methu: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -213,8 +215,6 @@ cy:
body: "Cafwyd broblemau gyda'r meysydd canlynol:" body: "Cafwyd broblemau gyda'r meysydd canlynol:"


messages: messages:
taken: "wedi'i gymryd yn barod"
record_invalid: "Gwirio wedi methu: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/da.yml
Expand Up @@ -221,6 +221,8 @@ da:
less_than_or_equal_to: "skal være mindre end, eller lig med, %{count}" less_than_or_equal_to: "skal være mindre end, eller lig med, %{count}"
odd: "skal være et ulige tal" odd: "skal være et ulige tal"
even: "skal være et lige tal" even: "skal være et lige tal"
taken: "er allerede brugt"
record_invalid: "Godkendelse gik galt: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -231,8 +233,6 @@ da:
body: "Der var problemer med følgende felter:" body: "Der var problemer med følgende felter:"


messages: messages:
taken: "er allerede brugt"
record_invalid: "Godkendelse gik galt: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/de-AT.yml
Expand Up @@ -202,6 +202,8 @@ de-AT:
odd: "muss ungerade sein" odd: "muss ungerade sein"
even: "muss gerade sein" even: "muss gerade sein"
not_an_integer: "muss ganzzahlig sein" not_an_integer: "muss ganzzahlig sein"
taken: "ist bereits vergeben"
record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "Konnte %{model} nicht speichern: ein Fehler." one: "Konnte %{model} nicht speichern: ein Fehler."
Expand All @@ -211,8 +213,6 @@ de-AT:
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "ist bereits vergeben"
record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/de-CH.yml
Expand Up @@ -202,6 +202,8 @@ de-CH:
odd: "muss ungerade sein" odd: "muss ungerade sein"
even: "muss gerade sein" even: "muss gerade sein"
not_an_integer: "muss ganzzahlig sein" not_an_integer: "muss ganzzahlig sein"
taken: "ist bereits vergeben"
record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "Konnte %{model} nicht speichern: ein Fehler." one: "Konnte %{model} nicht speichern: ein Fehler."
Expand All @@ -211,8 +213,6 @@ de-CH:
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "ist bereits vergeben"
record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/de.yml
Expand Up @@ -204,6 +204,8 @@ de:
odd: "muss ungerade sein" odd: "muss ungerade sein"
even: "muss gerade sein" even: "muss gerade sein"
not_an_integer: "muss ganzzahlig sein" not_an_integer: "muss ganzzahlig sein"
taken: "ist bereits vergeben"
record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "Konnte %{model} nicht speichern: ein Fehler." one: "Konnte %{model} nicht speichern: ein Fehler."
Expand All @@ -213,8 +215,6 @@ de:
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "ist bereits vergeben"
record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/el.yml
Expand Up @@ -207,6 +207,8 @@ el:
less_than_or_equal_to: "πρέπει να είναι λιγότερο ή ίσο με %{count}" less_than_or_equal_to: "πρέπει να είναι λιγότερο ή ίσο με %{count}"
odd: "πρέπει να είναι περιττός" odd: "πρέπει να είναι περιττός"
even: "πρέπει να είναι άρτιος" even: "πρέπει να είναι άρτιος"
taken: "το έχουν ήδη χρησιμοποιήσει"
record_invalid: "Επικύρωση απέτυχε: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -216,8 +218,6 @@ el:
other: "%{count} λάθη εμπόδισαν αυτό το %{model} να αποθηκευθεί." other: "%{count} λάθη εμπόδισαν αυτό το %{model} να αποθηκευθεί."
body: "Υπήρξαν προβλήματα με τα ακόλουθα πεδία:" body: "Υπήρξαν προβλήματα με τα ακόλουθα πεδία:"
messages: messages:
taken: "το έχουν ήδη χρησιμοποιήσει"
record_invalid: "Επικύρωση απέτυχε: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/en-AU.yml
Expand Up @@ -208,6 +208,8 @@
less_than_or_equal_to: "must be less than or equal to %{count}" less_than_or_equal_to: "must be less than or equal to %{count}"
odd: "must be odd" odd: "must be odd"
even: "must be even" even: "must be even"
taken: "has already been taken"
record_invalid: "Validation failed: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "1 error prohibited this %{model} from being saved" one: "1 error prohibited this %{model} from being saved"
Expand All @@ -217,8 +219,6 @@
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "has already been taken"
record_invalid: "Validation failed: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/en-GB.yml
Expand Up @@ -208,6 +208,8 @@
less_than_or_equal_to: "must be less than or equal to %{count}" less_than_or_equal_to: "must be less than or equal to %{count}"
odd: "must be odd" odd: "must be odd"
even: "must be even" even: "must be even"
taken: "has already been taken"
record_invalid: "Validation failed: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "1 error prohibited this %{model} from being saved" one: "1 error prohibited this %{model} from being saved"
Expand All @@ -217,8 +219,6 @@
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "has already been taken"
record_invalid: "Validation failed: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/en-US.yml
Expand Up @@ -210,6 +210,8 @@
less_than_or_equal_to: "must be less than or equal to %{count}" less_than_or_equal_to: "must be less than or equal to %{count}"
odd: "must be odd" odd: "must be odd"
even: "must be even" even: "must be even"
taken: "has already been taken"
record_invalid: "Validation failed: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "1 error prohibited this %{model} from being saved" one: "1 error prohibited this %{model} from being saved"
Expand All @@ -219,8 +221,6 @@
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "has already been taken"
record_invalid: "Validation failed: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/eo.yml
Expand Up @@ -209,12 +209,12 @@ eo:
less_than_or_equal_to: "devas malsuperi aŭ egali %{count}" less_than_or_equal_to: "devas malsuperi aŭ egali %{count}"
odd: "devas esti nepara" odd: "devas esti nepara"
even: "devas esti para" even: "devas esti para"
taken: "ne estas disponebla"
record_invalid: "Validado malsukcesis: %{errors}"


activerecord: activerecord:
errors: errors:
messages: messages:
taken: "ne estas disponebla"
record_invalid: "Validado malsukcesis: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/es-AR.yml
Expand Up @@ -201,6 +201,8 @@ es-AR:
accepted: "debe ser aceptado" accepted: "debe ser aceptado"
even: "debe ser un número par" even: "debe ser un número par"
odd: "debe ser un número non" odd: "debe ser un número non"
taken: "ya ha sido tomado"
record_invalid: "La validación falló: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -211,8 +213,6 @@ es-AR:
body: "Revise que los siguientes campos sean válidos:" body: "Revise que los siguientes campos sean válidos:"


messages: messages:
taken: "ya ha sido tomado"
record_invalid: "La validación falló: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/es-CL.yml
Expand Up @@ -205,6 +205,8 @@ es-CL:
less_than_or_equal_to: "debe ser menor que o igual a %{count}" less_than_or_equal_to: "debe ser menor que o igual a %{count}"
odd: "debe ser impar" odd: "debe ser impar"
even: "debe ser par" even: "debe ser par"
taken: "ya está en uso"
record_invalid: "La validación falló: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -216,8 +218,6 @@ es-CL:
body: "Se encontraron problemas con los siguientes campos:" body: "Se encontraron problemas con los siguientes campos:"


messages: messages:
taken: "ya está en uso"
record_invalid: "La validación falló: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/es-CO.yml
Expand Up @@ -202,6 +202,8 @@ es-CO:
accepted: "debe ser aceptado" accepted: "debe ser aceptado"
even: "debe ser un número par" even: "debe ser un número par"
odd: "debe ser un número impar" odd: "debe ser un número impar"
taken: "ya ha sido tomado"
record_invalid: "La validación falló: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -212,8 +214,6 @@ es-CO:
body: "Revise que los siguientes campos sean válidos:" body: "Revise que los siguientes campos sean válidos:"


messages: messages:
taken: "ya ha sido tomado"
record_invalid: "La validación falló: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/es-MX.yml
Expand Up @@ -209,6 +209,8 @@ es-MX:
accepted: "debe ser aceptado" accepted: "debe ser aceptado"
even: "debe ser un número par" even: "debe ser un número par"
odd: "debe ser un número non" odd: "debe ser un número non"
taken: "ya ha sido tomado"
record_invalid: "La validación falló: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -219,8 +221,6 @@ es-MX:
body: "Revise que los siguientes campos sean válidos:" body: "Revise que los siguientes campos sean válidos:"


messages: messages:
taken: "ya ha sido tomado"
record_invalid: "La validación falló: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/es.yml
Expand Up @@ -206,6 +206,8 @@
less_than_or_equal_to: "debe ser menor que o igual a %{count}" less_than_or_equal_to: "debe ser menor que o igual a %{count}"
odd: "debe ser impar" odd: "debe ser impar"
even: "debe ser par" even: "debe ser par"
taken: "ya está en uso"
record_invalid: "La validación falló: %{errors}"
template: &errors_template template: &errors_template
header: header:
one: "No se pudo guardar este/a %{model} porque se encontró 1 error" one: "No se pudo guardar este/a %{model} porque se encontró 1 error"
Expand All @@ -215,8 +217,6 @@
activerecord: activerecord:
errors: errors:
messages: messages:
taken: "ya está en uso"
record_invalid: "La validación falló: %{errors}"
<<: *errors_messages <<: *errors_messages
template: template:
<<: *errors_template <<: *errors_template
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/et.yml
Expand Up @@ -242,6 +242,8 @@ et:
less_than_or_equal_to: "peab olema vähem või võrdne arvuga %{count}" less_than_or_equal_to: "peab olema vähem või võrdne arvuga %{count}"
odd: "peab olema paaritu arv" odd: "peab olema paaritu arv"
even: "peab olema paarisarv" even: "peab olema paarisarv"
taken: "on juba võetud"
record_invalid: "Valideerimine ebaõnnestus: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -252,8 +254,6 @@ et:
body: "Probleeme ilmnes järgmiste väljadega:" body: "Probleeme ilmnes järgmiste väljadega:"


messages: messages:
taken: "on juba võetud"
record_invalid: "Valideerimine ebaõnnestus: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/eu.yml
Expand Up @@ -205,6 +205,8 @@
less_than_or_equal_to: "%{count} baino txikiago edo berdin izan behar da" less_than_or_equal_to: "%{count} baino txikiago edo berdin izan behar da"
odd: "bakoitia izan behar du" odd: "bakoitia izan behar du"
even: "bikoitia izan behar du" even: "bikoitia izan behar du"
taken: "hartuta dago"
record_invalid: "Balioztatze arazoa: %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -215,8 +217,6 @@
body: "Arazoak egon dira ondoko eremuekin:" body: "Arazoak egon dira ondoko eremuekin:"


messages: messages:
taken: "hartuta dago"
record_invalid: "Balioztatze arazoa: %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/fa.yml
Expand Up @@ -204,6 +204,8 @@
less_than_or_equal_to: "باید کمتر یا برابر %{count} باشد" less_than_or_equal_to: "باید کمتر یا برابر %{count} باشد"
odd: "باید فرد باشد" odd: "باید فرد باشد"
even: "باید زوج باشد" even: "باید زوج باشد"
taken: "پیشتر گرفته شده"
record_invalid: "رکورد نامعتبر است %{errors}"


activerecord: activerecord:
errors: errors:
Expand All @@ -214,8 +216,6 @@
body: "موارد زیر مشکل داشت:" body: "موارد زیر مشکل داشت:"


messages: messages:
taken: "پیشتر گرفته شده"
record_invalid: "رکورد نامعتبر است %{errors}"
<<: *errors_messages <<: *errors_messages


full_messages: full_messages:
Expand Down

0 comments on commit 988879e

Please sign in to comment.