Merge branch 'fix-label-color-titles' into 'master'

Fix inconsistent capitalization in label colors See merge request gitlab-org/gitlab-ce!28922

Merge branch 'fix-label-color-titles' into 'master'
Fix inconsistent capitalization in label colors See merge request gitlab-org/gitlab-ce!28922
a546b76a · Sean McGivern · 937faf7a · e88485eb · a546b76a · a546b76a
Commit a546b76a authored May 30, 2019 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

app/helpers/labels_helper.rb app/helpers/labels_helper.rb +2 -2

locale/gitlab.pot locale/gitlab.pot +4 -4

No files found.
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -79,10 +79,10 @@ module LabelsHelper
    {
      '#0033CC' => s_('SuggestedColors|UA blue'),
      '#428BCA' => s_('SuggestedColors|Moderate blue'),
-      '#44AD8E' => s_('SuggestedColors|lime green'),
+      '#44AD8E' => s_('SuggestedColors|Lime green'),
      '#A8D695' => s_('SuggestedColors|Feijoa'),
      '#5CB85C' => s_('SuggestedColors|Slightly desaturated green'),
-      '#69D100' => s_('SuggestedColors|Bright Green'),
+      '#69D100' => s_('SuggestedColors|Bright green'),
      '#004E00' => s_('SuggestedColors|Very dark lime green'),
      '#34495E' => s_('SuggestedColors|Very dark desaturated blue'),
      '#7F8C8D' => s_('SuggestedColors|Dark grayish cyan'),

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9415,7 +9415,7 @@ msgstr ""
 msgid "Suggested change"
 msgstr ""

-msgid "SuggestedColors|Bright Green"
+msgid "SuggestedColors|Bright green"
 msgstr ""

 msgid "SuggestedColors|Dark grayish cyan"
@@ -9436,6 +9436,9 @@ msgstr ""
 msgid "SuggestedColors|Feijoa"
 msgstr ""

+msgid "SuggestedColors|Lime green"
+msgstr ""
+
 msgid "SuggestedColors|Moderate blue"
 msgstr ""

@@ -9475,9 +9478,6 @@ msgstr ""
 msgid "SuggestedColors|Very pale orange"
 msgstr ""

-msgid "SuggestedColors|lime green"
-msgstr ""
-
 msgid "Sunday"
 msgstr ""