summaryrefslogtreecommitdiff
path: root/config/locales
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-06-12 10:12:07 +0200
committerBob Van Landuyt <bob@gitlab.com>2017-06-15 14:47:05 +0200
commit7d024a1db37b0632df88f91ed1e4115e8cef951d (patch)
treef13fab027175d19689f64a070ca289bb2237a0d4 /config/locales
parent59610c42ca3466af5f47d415fbb8b22f4a108629 (diff)
downloadgitlab-ce-7d024a1db37b0632df88f91ed1e4115e8cef951d.tar.gz
Make sure there's only 1 `errors.messages` definition in en.yml
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml10
1 files changed, 4 insertions, 6 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 10c5d7f54f3..6f23ca353e3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,12 +2,6 @@
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
en:
- errors:
- messages:
- label_already_exists_at_group_level: "already exists at group level for %{group}. Please choose another one."
- wrong_size: "is the wrong size (should be %{file_size})"
- size_too_small: "is too small (should be at least %{file_size})"
- size_too_big: "is too big (should be at most %{file_size})"
views:
pagination:
previous: "Prev"
@@ -114,6 +108,10 @@ en:
errors:
format: "%{attribute} %{message}"
messages:
+ label_already_exists_at_group_level: "already exists at group level for %{group}. Please choose another one."
+ wrong_size: "is the wrong size (should be %{file_size})"
+ size_too_small: "is too small (should be at least %{file_size})"
+ size_too_big: "is too big (should be at most %{file_size})"
accepted: must be accepted
blank: can't be blank
present: must be blank