rails/locale/en.yml in rails-i18n-6.0.0.beta1 vs rails/locale/en.yml in rails-i18n-6.0.0

- old
+ new

@@ -1,25 +1,25 @@ --- en: activerecord: errors: messages: - record_invalid: "Validation failed: %{errors}" + record_invalid: 'Validation failed: %{errors}' restrict_dependent_destroy: - has_one: "Cannot delete record because a dependent %{record} exists" - has_many: "Cannot delete record because dependent %{record} exist" + has_one: Cannot delete record because a dependent %{record} exists + has_many: Cannot delete record because dependent %{record} exist date: abbr_day_names: - Sun - Mon - Tue - Wed - Thu - Fri - Sat abbr_month_names: - - + - - Jan - Feb - Mar - Apr - May @@ -41,11 +41,11 @@ formats: default: "%Y-%m-%d" long: "%B %d, %Y" short: "%b %d" month_names: - - + - - January - February - March - April - May @@ -73,47 +73,46 @@ 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 + less_than_x_minutes: + one: less than a minute + other: less than %{count} minutes over_x_years: one: over 1 year other: over %{count} years - x_days: - one: 1 day - other: "%{count} days" + x_seconds: + one: 1 second + other: "%{count} seconds" x_minutes: one: 1 minute other: "%{count} minutes" + x_days: + one: 1 day + other: "%{count} days" x_months: one: 1 month other: "%{count} months" x_years: one: 1 year other: "%{count} years" - x_seconds: - one: 1 second - other: "%{count} seconds" prompts: - day: Day - hour: Hour + second: Second minute: Minute + hour: Hour + day: Day month: Month - second: Seconds year: Year errors: format: "%{attribute} %{message}" messages: accepted: must be accepted blank: can't be blank - present: must be blank confirmation: doesn't match %{attribute} empty: can't be empty equal_to: must be equal to %{count} even: must be even exclusion: is reserved @@ -121,14 +120,16 @@ 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} - model_invalid: "Validation failed: %{errors}" + model_invalid: 'Validation failed: %{errors}' not_a_number: is not a number not_an_integer: must be an integer odd: must be odd + other_than: must be other than %{count} + present: must be blank required: must exist taken: has already been taken too_long: one: is too long (maximum is 1 character) other: is too long (maximum is %{count} characters) @@ -136,11 +137,10 @@ 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) - other_than: must be other than %{count} 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" @@ -186,15 +186,15 @@ format: "%n %u" units: byte: one: Byte other: Bytes + eb: EB gb: GB kb: KB mb: MB - tb: TB pb: PB - eb: EB + tb: TB percentage: format: delimiter: '' format: "%n%" precision: