diff --git a/README.md b/README.md index de15a8326..962fc6f18 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,9 @@ Currently, most locales are incomplete. Typically they lack the following keys: - `activerecord.errors.messages.record_invalid` - `activerecord.errors.messages.restrict_dependent_destroy.has_one` - `activerecord.errors.messages.restrict_dependent_destroy.has_many` + +The following keys should NOT be included: + - `errors.messages.model_invalid` - `errors.messages.required` diff --git a/rails/locale/iso-639-2/pap-AW.yml b/rails/locale/pap-AW.yml similarity index 65% rename from rails/locale/iso-639-2/pap-AW.yml rename to rails/locale/pap-AW.yml index e743025ae..0642f6ddc 100644 --- a/rails/locale/iso-639-2/pap-AW.yml +++ b/rails/locale/pap-AW.yml @@ -1,14 +1,21 @@ -# pap-AW copy of pap-CW and by no means correct. By M. Maduro for Suares & Co +# pap-AW merged M. Maduro and Rianne Helings by Richenel Ansano for Suares & Co pap-AW: + activerecord: + errors: + messages: + record_invalid: 'Validashon a faya: %{errors}' + restrict_dependent_destroy: + has_one: "No por kita e registro akí pasobra un otro %{record} ta dependé di dje" + has_many: "No por kita e registro akí pasobra otro %{record} ta dependé di dje" date: abbr_day_names: - - Dum - - Lun - - Mar - - Ras - - Wep - - Biè - - Sab + - dum + - lun + - mar + - ras + - wep + - biè + - sab abbr_month_names: - - yan @@ -32,9 +39,9 @@ pap-AW: - djabièrnè - djasabra formats: - default: ! '%Y-%m-%d' - long: ! '%B di %d, %Y' - short: ! '%b di %d' + default: '%Y-%m-%d' + long: '%B di %d, %Y' + short: '%b di %d' month_names: - - yanüari @@ -50,9 +57,9 @@ pap-AW: - novèmber - desèmber order: - - :year - - :month - - :day + - :aña + - :luna + - :dia datetime: distance_in_words: about_x_hours: @@ -60,7 +67,7 @@ pap-AW: other: mas o ménos %{count} ora about_x_months: one: mas o ménos 1 luna - other: about %{count} luna + other: mas o ménos %{count} luna about_x_years: one: mas o ménos 1 aña other: mas o ménos %{count} aña @@ -69,7 +76,7 @@ pap-AW: other: kasi %{count} aña half_a_minute: mei minüt less_than_x_minutes: - one: ménos ku un minüt + one: ménos ku 1 minüt other: ménos ku %{count} minüt less_than_x_seconds: one: ménos ku 1 sekònde @@ -79,16 +86,19 @@ pap-AW: other: mas ku %{count} aña x_days: one: 1 dia - other: ! '%{count} dia' + other: '%{count} dia' x_minutes: one: 1 minüt - other: ! '%{count} minüt' + other: '%{count} minüt' x_months: - one: 1 month - other: ! '%{count} luna' + one: 1 luna + other: '%{count} luna' + x_years: + one: 1 year + other: "%{count} years" x_seconds: - one: 1 second - other: ! '%{count} sekònde' + one: 1 sekònde + other: '%{count} sekònde' prompts: day: Dia hour: Ora @@ -97,12 +107,12 @@ pap-AW: second: Sekònde year: Aña errors: - format: ! '%{attribute} %{message}' + format: '%{attribute} %{message}' messages: accepted: mester asept'é blank: no por keda sin yen'é present: mester keda bashí - confirmation: ! "no ta meskos %{attribute}" + confirmation: "no ta meskos %{attribute}" empty: no por keda bashí equal_to: mester ta meskos ku %{count} even: mester ta par @@ -113,29 +123,27 @@ pap-AW: invalid: no ta bálido less_than: mester ta ménos ku %{count} less_than_or_equal_to: mester ta ménos òf mes tantu ku %{count} + model_invalid: "Validation failed: %{errors}" not_a_number: no ta un number not_an_integer: mester ta un number hinté odd: mester ta impar - record_invalid: ! 'Validashon a faya: %{errors}' - restrict_dependent_destroy: - one: "No por kita e registro akí pasobra un otro %{record} ta dependé di dje" - many: "No por kita e registro akí pasobra otro %{record} ta dependé di dje" + required: must exist taken: ta usá kaba too_long: one: ta muchu largu (máksimo ta 1 karakter) other: ta muchu largu (máksimo ta %{count} karakter) too_short: one: ta muchu kòrtiku (mínimo ta 1 karakter) - other: is too short (mínimo ta %{count} karakter) + other: ta muchu kòrtiku (mínimo ta %{count} karakter) wrong_length: one: su largura no ta korekto (mester ta 1 karakter) other: su largura no ta korekto (mester ta %{count} karakter) other_than: "no por ta %{count}" template: - body: ! 'E siguiente rúbrikanan ta duna problema:' + body: 'E siguiente rúbrikanan ta duna problema:' header: - one: 1 fout a pone ku no por a save e %{model} akí - other: ! '%{count} fout a pone ku no por a save e %{model} akí' + one: 1 fout a pone ku no por a warda e %{model} akí + other: '%{count} fout a pone ku no por a save e %{model} akí' helpers: select: prompt: Por fabor skohe @@ -146,22 +154,22 @@ pap-AW: number: currency: format: - delimiter: ! '.' - format: ! '%u%n' + delimiter: '.' + format: '%u%n' precision: 2 separator: ',' significant: false strip_insignificant_zeros: false unit: ANG format: - delimiter: ! '.' + delimiter: '.' precision: 3 separator: ',' - significant: false - strip_insignificant_zeros: false + significant: falsu + strip_insignificant_zeros: falsu human: decimal_units: - format: ! '%n %u' + format: '%n %u' units: billion: bion million: mion @@ -172,18 +180,20 @@ pap-AW: format: delimiter: '' precision: 3 - significant: true - strip_insignificant_zeros: true + significant: bèrdat + strip_insignificant_zeros: bèrdat storage_units: - format: ! '%n %u' + format: '%n %u' units: byte: - one: Byte - other: Bytes + one: Bait + other: Bait gb: GB kb: KB mb: MB tb: TB + pb: PB + eb: EB percentage: format: delimiter: '' @@ -193,13 +203,13 @@ pap-AW: delimiter: '' support: array: - last_word_connector: ! ', i ' - two_words_connector: ! ' i ' - words_connector: ! ', ' + last_word_connector: ', i ' + two_words_connector: ' i ' + 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' + default: '%a, %d %b %Y %H.%M.%S %z' + long: '%B %d, %Y %H.%M' + short: '%d %b %H.%M' pm: pm diff --git a/rails/locale/iso-639-2/pap-CW.yml b/rails/locale/pap-CW.yml similarity index 65% rename from rails/locale/iso-639-2/pap-CW.yml rename to rails/locale/pap-CW.yml index a862fa3cf..ac0c2d3b7 100644 --- a/rails/locale/iso-639-2/pap-CW.yml +++ b/rails/locale/pap-CW.yml @@ -1,14 +1,21 @@ -# pap-CW by M. Madurao for Suares & Co +# pap-CW merged M. Maduro and Rianne Helings by Richenel Ansano for Suares & Co pap-CW: + activerecord: + errors: + messages: + record_invalid: 'Validashon a faya: %{errors}' + restrict_dependent_destroy: + has_one: "No por kita e registro akí pasobra un otro %{record} ta dependé di dje" + has_many: "No por kita e registro akí pasobra otro %{record} ta dependé di dje" date: abbr_day_names: - - Dum - - Lun - - Mar - - Ras - - Wep - - Biè - - Sab + - dum + - lun + - mar + - ras + - wep + - biè + - sab abbr_month_names: - - yan @@ -32,9 +39,9 @@ pap-CW: - djabièrnè - djasabra formats: - default: ! '%Y-%m-%d' - long: ! '%B di %d, %Y' - short: ! '%b di %d' + default: '%Y-%m-%d' + long: '%B di %d, %Y' + short: '%b di %d' month_names: - - yanüari @@ -50,9 +57,9 @@ pap-CW: - novèmber - desèmber order: - - :year - - :month - - :day + - :aña + - :luna + - :dia datetime: distance_in_words: about_x_hours: @@ -60,7 +67,7 @@ pap-CW: other: mas o ménos %{count} ora about_x_months: one: mas o ménos 1 luna - other: about %{count} luna + other: mas o ménos %{count} luna about_x_years: one: mas o ménos 1 aña other: mas o ménos %{count} aña @@ -69,7 +76,7 @@ pap-CW: other: kasi %{count} aña half_a_minute: mei minüt less_than_x_minutes: - one: ménos ku un minüt + one: ménos ku 1 minüt other: ménos ku %{count} minüt less_than_x_seconds: one: ménos ku 1 sekònde @@ -79,16 +86,19 @@ pap-CW: other: mas ku %{count} aña x_days: one: 1 dia - other: ! '%{count} dia' + other: '%{count} dia' x_minutes: one: 1 minüt - other: ! '%{count} minüt' + other: '%{count} minüt' x_months: - one: 1 month - other: ! '%{count} luna' + one: 1 luna + other: '%{count} luna' + x_years: + one: 1 year + other: "%{count} years" x_seconds: - one: 1 second - other: ! '%{count} sekònde' + one: 1 sekònde + other: '%{count} sekònde' prompts: day: Dia hour: Ora @@ -97,12 +107,12 @@ pap-CW: second: Sekònde year: Aña errors: - format: ! '%{attribute} %{message}' + format: '%{attribute} %{message}' messages: accepted: mester asept'é blank: no por keda sin yen'é present: mester keda bashí - confirmation: ! "no ta meskos %{attribute}" + confirmation: "no ta meskos %{attribute}" empty: no por keda bashí equal_to: mester ta meskos ku %{count} even: mester ta par @@ -113,29 +123,27 @@ pap-CW: invalid: no ta bálido less_than: mester ta ménos ku %{count} less_than_or_equal_to: mester ta ménos òf mes tantu ku %{count} + model_invalid: "Validation failed: %{errors}" not_a_number: no ta un number not_an_integer: mester ta un number hinté odd: mester ta impar - record_invalid: ! 'Validashon a faya: %{errors}' - restrict_dependent_destroy: - one: "No por kita e registro akí pasobra un otro %{record} ta dependé di dje" - many: "No por kita e registro akí pasobra otro %{record} ta dependé di dje" + required: must exist taken: ta usá kaba too_long: one: ta muchu largu (máksimo ta 1 karakter) other: ta muchu largu (máksimo ta %{count} karakter) too_short: one: ta muchu kòrtiku (mínimo ta 1 karakter) - other: is too short (mínimo ta %{count} karakter) + other: ta muchu kòrtiku (mínimo ta %{count} karakter) wrong_length: one: su largura no ta korekto (mester ta 1 karakter) other: su largura no ta korekto (mester ta %{count} karakter) other_than: "no por ta %{count}" template: - body: ! 'E siguiente rúbrikanan ta duna problema:' + body: 'E siguiente rúbrikanan ta duna problema:' header: - one: 1 fout a pone ku no por a save e %{model} akí - other: ! '%{count} fout a pone ku no por a save e %{model} akí' + one: 1 fout a pone ku no por a warda e %{model} akí + other: '%{count} fout a pone ku no por a save e %{model} akí' helpers: select: prompt: Por fabor skohe @@ -146,22 +154,22 @@ pap-CW: number: currency: format: - delimiter: ! '.' - format: ! '%u%n' + delimiter: '.' + format: '%u%n' precision: 2 separator: ',' significant: false strip_insignificant_zeros: false unit: ANG format: - delimiter: ! '.' + delimiter: '.' precision: 3 separator: ',' - significant: false - strip_insignificant_zeros: false + significant: falsu + strip_insignificant_zeros: falsu human: decimal_units: - format: ! '%n %u' + format: '%n %u' units: billion: bion million: mion @@ -172,18 +180,20 @@ pap-CW: format: delimiter: '' precision: 3 - significant: true - strip_insignificant_zeros: true + significant: bèrdat + strip_insignificant_zeros: bèrdat storage_units: - format: ! '%n %u' + format: '%n %u' units: byte: - one: Byte - other: Bytes + one: Bait + other: Bait gb: GB kb: KB mb: MB tb: TB + pb: PB + eb: EB percentage: format: delimiter: '' @@ -193,13 +203,13 @@ pap-CW: delimiter: '' support: array: - last_word_connector: ! ', i ' - two_words_connector: ! ' i ' - words_connector: ! ', ' + last_word_connector: ', i ' + two_words_connector: ' i ' + 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' + default: '%a, %d %b %Y %H.%M.%S %z' + long: '%B %d, %Y %H.%M' + short: '%d %b %H.%M' pm: pm diff --git a/rails/pluralization/pap-AW.rb b/rails/pluralization/pap-AW.rb new file mode 100644 index 000000000..f366c03fc --- /dev/null +++ b/rails/pluralization/pap-AW.rb @@ -0,0 +1,3 @@ +require 'rails_i18n/common_pluralizations/other' + +::RailsI18n::Pluralization::Other.with_locale(:'pap-AW') diff --git a/rails/pluralization/pap-CW.rb b/rails/pluralization/pap-CW.rb new file mode 100644 index 000000000..0859570c9 --- /dev/null +++ b/rails/pluralization/pap-CW.rb @@ -0,0 +1,3 @@ +require 'rails_i18n/common_pluralizations/other' + +::RailsI18n::Pluralization::Other.with_locale(:'pap-CW')