diff options
author | Robert Speicher <robert@gitlab.com> | 2017-07-19 17:03:59 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-07-19 17:03:59 +0300 |
commit | 55b981343b8e91a9890f6be1c202289cc425f89b (patch) | |
tree | 4284e28e98cb1f708355e6920252394a854b8291 | |
parent | c6ee1776e8b3e7f1301ab97bca642703443ae0eb (diff) | |
parent | 2f6d02c4eed0027f0e319dbb7520138658c44d4f (diff) |
Merge branch '35034-fix-unstranslated-visibility-levels' into 'master'
Always return the translated level name.
Closes #35034
See merge request !12852
-rw-r--r-- | lib/gitlab/visibility_level.rb | 4 | ||||
-rw-r--r-- | locale/es/gitlab.po | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb index 48f3d950779..c60bd91ea6e 100644 --- a/lib/gitlab/visibility_level.rb +++ b/lib/gitlab/visibility_level.rb @@ -89,12 +89,12 @@ module Gitlab end def level_name(level) - level_name = 'Unknown' + level_name = N_('VisibilityLevel|Unknown') options.each do |name, lvl| level_name = name if lvl == level.to_i end - level_name + s_(level_name) end def level_value(level) diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 760a60f89d4..5c669d51a68 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2017-07-12 12:35-0500\n" +"PO-Revision-Date: 2017-07-13 12:10-0500\n" "Language-Team: Spanish\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -1059,6 +1059,9 @@ msgstr "Privado" msgid "VisibilityLevel|Public" msgstr "Público" +msgid "VisibilityLevel|Unknown" +msgstr "Desconocido" + msgid "Want to see the data? Please ask an administrator for access." msgstr "¿Quieres ver los datos? Por favor pide acceso al administrador." diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8f33c494de9..babef3ed0af 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-12 12:31-0500\n" -"PO-Revision-Date: 2017-07-12 12:31-0500\n" +"POT-Creation-Date: 2017-07-13 12:07-0500\n" +"PO-Revision-Date: 2017-07-13 12:07-0500\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -1060,6 +1060,9 @@ msgstr "" msgid "VisibilityLevel|Public" msgstr "" +msgid "VisibilityLevel|Unknown" +msgstr "" + msgid "Want to see the data? Please ask an administrator for access." msgstr "" |