kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '35034-fix-unstranslated-visibility-levels' into 'master' 

Always return the translated level name.

Closes #35034

See merge request !12852
This commit is contained in:
Robert Speicher 2017-07-19 14:03:59 +00:00
parent c6ee1776e8 2f6d02c4ee
commit 55b981343b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab/visibility_level.rb
View File

@ -89,12 +89,12 @@ module Gitlab
end end
def level_name(level) def level_name(level)
level_name = 'Unknown' level_name = N_('VisibilityLevel|Unknown')
options.each do |name, lvl| options.each do |name, lvl|
level_name = name if lvl == level.to_i level_name = name if lvl == level.to_i
end end
level_name s_(level_name)
end end
def level_value(level) def level_value(level)

5
locale/es/gitlab.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \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-Team: Spanish\n"
"Language: es\n" "Language: es\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1059,6 +1059,9 @@ msgstr "Privado"
msgid "VisibilityLevel|Public" msgid "VisibilityLevel|Public"
msgstr "Público" msgstr "Público"
msgid "VisibilityLevel|Unknown"
msgstr "Desconocido"
msgid "Want to see the data? Please ask an administrator for access." msgid "Want to see the data? Please ask an administrator for access."
msgstr "¿Quieres ver los datos? Por favor pide acceso al administrador." msgstr "¿Quieres ver los datos? Por favor pide acceso al administrador."

7
locale/gitlab.pot
View File

@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-12 12:31-0500\n" "POT-Creation-Date: 2017-07-13 12:07-0500\n"
"PO-Revision-Date: 2017-07-12 12:31-0500\n" "PO-Revision-Date: 2017-07-13 12:07-0500\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
@ -1060,6 +1060,9 @@ msgstr ""
msgid "VisibilityLevel|Public" msgid "VisibilityLevel|Public"
msgstr "" msgstr ""
msgid "VisibilityLevel|Unknown"
msgstr ""
msgid "Want to see the data? Please ask an administrator for access." msgid "Want to see the data? Please ask an administrator for access."
msgstr "" msgstr ""