Merge branch 'master' into openstreetbugs

[rails.git] / vendor / rails-locales / en-GB.yml

diff --git a/vendor/rails-locales/en-GB.yml b/vendor/rails-locales/en-GB.yml
index a29947f599788cf246c74f7f0226d71e3d0674a3..b13b383ec209a5ac49040df9a873cd1723ca0c40 100644 (file)
--- a/vendor/rails-locales/en-GB.yml
+++ b/vendor/rails-locales/en-GB.yml
@@ -190,9 +190,15 @@
       accepted: "must be accepted"
       empty: "can't be empty"
       blank: "can't be blank"
       accepted: "must be accepted"
       empty: "can't be empty"
       blank: "can't be blank"

-      too_long: "is too long (maximum is %{count} characters)"
-      too_short: "is too short (minimum is %{count} characters)"
-      wrong_length: "is the wrong length (should be %{count} characters)"
+      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)"

       not_a_number: "is not a number"
       not_an_integer: "must be an integer"
       greater_than: "must be greater than %{count}"
       not_a_number: "is not a number"
       not_an_integer: "must be an integer"
       greater_than: "must be greater than %{count}"


@@ -202,19 +208,20 @@
       less_than_or_equal_to: "must be less than or equal to %{count}"
       odd: "must be odd"
       even: "must be even"
       less_than_or_equal_to: "must be less than or equal to %{count}"
       odd: "must be odd"
       even: "must be even"

+      taken: "has already been taken"
+      record_invalid: "Validation failed: %{errors}"
+    template: &errors_template
+      header:
+        one: "1 error prohibited this %{model} from being saved"
+        other: "%{count} errors prohibited this %{model} from being saved"
+      body: "There were problems with the following fields:"

 
   activerecord:
     errors:
 
   activerecord:
     errors:

-      template:
-        header:
-          one:    "1 error prohibited this %{model} from being saved"
-          other:  "%{count} errors prohibited this %{model} from being saved"
-        body: "There were problems with the following fields:"
-

       messages:
       messages:

-        taken: "has already been taken"
-        record_invalid: "Validation failed: %{errors}"

         <<: *errors_messages
         <<: *errors_messages

+      template:
+        <<: *errors_template

 
       full_messages:
         format: "%{attribute} %{message}"
 
       full_messages:
         format: "%{attribute} %{message}"