From afdb618bd3913c38168ec4ca167e9572a39ba86f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 20 Jul 2019 23:30:51 +0800 Subject: [PATCH] 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 --- changelogs/unreleased/FixLocaleEN.yml | 5 +++++ config/locales/en.yml | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 changelogs/unreleased/FixLocaleEN.yml 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"