summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Dave Hello <hsu@peterdavehello.org>2019-07-20 23:30:51 +0800
committerPeter Dave Hello <hsu@peterdavehello.org>2019-07-22 21:52:46 +0800
commitafdb618bd3913c38168ec4ca167e9572a39ba86f (patch)
tree433fba6f67f8177ba88c0a5a872b07c0e4753dbe
parentb40630e134c09e02322d9b17ddf45667d2fa6573 (diff)
downloadgitlab-ce-afdb618bd3913c38168ec4ca167e9572a39ba86f.tar.gz
Remove duplicated mapping key in config/locales/en.yml
The "errors" section was defined twice in this file, the first one was the once being removed here, another one is at line 164 (before removal) or line 158 (after removal). The content of duplicated strings definition are totally the same, the second part has more data (41 lines in total, compare to the removed 6 lines), so I removed the first part but not the second part. cc !16710
-rw-r--r--changelogs/unreleased/FixLocaleEN.yml5
-rw-r--r--config/locales/en.yml6
2 files changed, 5 insertions, 6 deletions
diff --git a/changelogs/unreleased/FixLocaleEN.yml b/changelogs/unreleased/FixLocaleEN.yml
new file mode 100644
index 00000000000..49738a6d127
--- /dev/null
+++ b/changelogs/unreleased/FixLocaleEN.yml
@@ -0,0 +1,5 @@
+---
+title: Remove duplicated mapping key in config/locales/en.yml
+merge_request: 30980
+author: Peter Dave Hello
+type: fixed
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a3dceb2fb62..a60f86e1d80 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -16,12 +16,6 @@ en:
api_url: "Sentry API URL"
project/metrics_setting:
external_dashboard_url: "External dashboard URL"
- 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"