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

Merge branch '34780-restricted-visibility-levels-in-admin-application-settings-looks-off' into 'master'

Browse source 
Fix wrong helper used for adding context for translations.

Closes #34780

See merge request !12731
This commit is contained in:
Robert Speicher 2017-07-13 04:43:00 +00:00
commit 3c197e7482
3 changed files with 89 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_settings_helper.rb
View file

@ -35,7 +35,7 @@ module ApplicationSettingsHelper
# Return a group of checkboxes that use Bootstrap's button plugin for a
# toggle button effect.
def restricted_level_checkboxes(help_block_id, checkbox_name)
Gitlab::VisibilityLevel.options.map do |name, level|
Gitlab::VisibilityLevel.values.map do |level|
checked = restricted_visibility_levels(true).include?(level)
css_class = checked ? 'active' : ''
tag_name = "application_setting_visibility_level_#{level}"
@ -44,7 +44,7 @@ module ApplicationSettingsHelper
check_box_tag(checkbox_name, level, checked,
autocomplete: 'off',
'aria-describedby' => help_block_id,
id: tag_name) + visibility_level_icon(level) + name
id: tag_name) + visibility_level_icon(level) + visibility_level_label(level)
end
end
end

88
locale/es/gitlab.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2017-06-21 12:09-0500\n"
"PO-Revision-Date: 2017-07-12 12:35-0500\n"
"Language-Team: Spanish\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@ -17,19 +17,27 @@ msgstr ""
"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
"X-Generator: Poedit 2.0.2\n"
msgid "%d additional commit has been omitted to prevent performance issues."
msgid_plural "%d additional commits have been omitted to prevent performance issues."
msgstr[0] "%d cambio adicional ha sido omitido para evitar problemas de rendimiento."
msgstr[1] "%d cambios adicionales han sido omitidos para evitar problemas de rendimiento."
msgid "%d commit"
msgid_plural "%d commits"
msgstr[0] "%d cambio"
msgstr[1] "%d cambios"
msgid "%s additional commit has been omitted to prevent performance issues."
msgid_plural "%s additional commits have been omitted to prevent performance issues."
msgstr[0] "%s cambio adicional ha sido omitido para evitar problemas de rendimiento."
msgstr[1] "%s cambios adicionales han sido omitidos para evitar problemas de rendimiento."
msgid "%{commit_author_link} committed %{commit_timeago}"
msgstr "%{commit_author_link} cambió %{commit_timeago}"
msgid "1 pipeline"
msgid_plural "%d pipelines"
msgstr[0] "1 pipeline"
msgstr[1] "%d pipelines"
msgid "A collection of graphs regarding Continuous Integration"
msgstr "Una colección de gráficos sobre Integración Continua"
msgid "About auto deploy"
msgstr "Acerca del auto despliegue"
@ -184,6 +192,9 @@ msgid_plural "Commits"
msgstr[0] "Cambio"
msgstr[1] "Cambios"
msgid "Commit duration in minutes for last 30 commits"
msgstr "Duración de los cambios en minutos para los últimos 30"
msgid "Commit message"
msgstr "Mensaje del cambio"
@ -223,6 +234,9 @@ msgstr "Copiar SHA del cambio al portapapeles"
msgid "Create New Directory"
msgstr "Crear Nuevo Directorio"
msgid "Create a personal access token on your account to pull or push via %{protocol}."
msgstr "Crear un token de acceso personal en tu cuenta para actualizar o enviar a través de %{protocol}."
msgid "Create directory"
msgstr "Crear directorio"
@ -241,6 +255,9 @@ msgstr "Bifurcar"
msgid "CreateTag|Tag"
msgstr "Etiqueta"
msgid "CreateTokenToCloneLink|create a personal access token"
msgstr "crear un token de acceso personal"
msgid "Cron Timezone"
msgstr "Zona horaria del Cron"
@ -401,6 +418,15 @@ msgstr "Patrón de intervalo"
msgid "Introducing Cycle Analytics"
msgstr "Introducción a Cycle Analytics"
msgid "Jobs for last month"
msgstr "Trabajos del mes pasado"
msgid "Jobs for last week"
msgstr "Trabajos de la semana pasada"
msgid "Jobs for last year"
msgstr "Trabajos del año pasado"
msgid "LFSStatus|Disabled"
msgstr "Deshabilitado"
@ -566,6 +592,21 @@ msgstr "Programación del Pipeline"
msgid "Pipeline Schedules"
msgstr "Programaciones de los Pipelines"
msgid "PipelineCharts|Failed:"
msgstr "Fallidos:"
msgid "PipelineCharts|Overall statistics"
msgstr "Estadísticas generales"
msgid "PipelineCharts|Success ratio:"
msgstr "Ratio de éxito"
msgid "PipelineCharts|Successful:"
msgstr "Exitosos:"
msgid "PipelineCharts|Total:"
msgstr "Total:"
msgid "PipelineSchedules|Activated"
msgstr "Activado"
@ -578,6 +619,12 @@ msgstr "Todos"
msgid "PipelineSchedules|Inactive"
msgstr "Inactivos"
msgid "PipelineSchedules|Input variable key"
msgstr "Ingrese nombre de clave"
msgid "PipelineSchedules|Input variable value"
msgstr "Ingrese el valor de la variable"
msgid "PipelineSchedules|Next Run"
msgstr "Próxima Ejecución"
@ -585,7 +632,10 @@ msgid "PipelineSchedules|None"
msgstr "Ninguno"
msgid "PipelineSchedules|Provide a short description for this pipeline"
msgstr "Proporcione una breve descripción para este pipeline"
msgstr "Proporcione una descripción breve para este pipeline"
msgid "PipelineSchedules|Remove variable row"
msgstr "Eliminar fila de variable"
msgid "PipelineSchedules|Take ownership"
msgstr "Tomar posesión"
@ -593,9 +643,24 @@ msgstr "Tomar posesión"
msgid "PipelineSchedules|Target"
msgstr "Destino"
msgid "PipelineSchedules|Variables"
msgstr "Variables"
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr "Personalizado"
msgid "Pipelines"
msgstr "Pipelines"
msgid "Pipelines charts"
msgstr "Gráficos de los pipelines"
msgid "Pipeline|all"
msgstr "todos"
msgid "Pipeline|success"
msgstr "exitósos"
msgid "Pipeline|with stage"
msgstr "con etapa"
@ -1003,6 +1068,15 @@ msgstr "No hay suficientes datos para mostrar en esta etapa."
msgid "Withdraw Access Request"
msgstr "Retirar Solicitud de Acceso"
msgid ""
"You are going to remove %{group_name}.\n"
"Removed groups CANNOT be restored!\n"
"Are you ABSOLUTELY sure?"
msgstr ""
"Va a eliminar %{group_name}.\n"
"¡El grupo eliminado NO puede ser restaurado!\n"
"¿Estás TOTALMENTE seguro?"
msgid ""
"You are going to remove %{project_name_with_namespace}.\n"
"Removed project CANNOT be restored!\n"

12
locale/gitlab.pot
View file

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-05 08:50-0500\n"
"PO-Revision-Date: 2017-07-05 08:50-0500\n"
"POT-Creation-Date: 2017-07-12 12:31-0500\n"
"PO-Revision-Date: 2017-07-12 12:31-0500\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
msgid "%d additional commit has been omitted to prevent performance issues."
msgid_plural "%d additional commits have been omitted to prevent performance issues."
msgid "%d commit"
msgid_plural "%d commits"
msgstr[0] ""
msgstr[1] ""
msgid "%d commit"
msgid_plural "%d commits"
msgid "%s additional commit has been omitted to prevent performance issues."
msgid_plural "%s additional commits have been omitted to prevent performance issues."
msgstr[0] ""
msgstr[1] ""