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

Small refactoring plus fixes for Spanish translations.

Browse source
This commit is contained in:
Ruben Davila 2017-06-15 22:02:14 -05:00
parent 9a0e67639d
commit 40a188b080
6 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/locale/es/app.js
View file

File diff suppressed because one or more lines are too long

7
app/views/projects/commit/_change.html.haml
View file

@ -25,12 +25,7 @@
= dropdown_tag(@project.default_branch, options: { title: n_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: n_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: namespace_project_branches_path(@project.namespace, @project), submit_form_on_click: false } })
- if can?(current_user, :push_code, @project)
.checkbox
= label_tag do
= check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: nil
- translation_variables = { new_merge_request: "<strong>#{_('new merge request')}</strong>" }
- translation = _('Start a %{new_merge_request} with these changes') % translation_variables
#{ translation.html_safe }
= render 'shared/new_merge_request_checkbox'
- else
= hidden_field_tag 'create_merge_request', 1, id: nil
.form-actions

6
app/views/shared/_new_commit_form.html.haml
View file

@ -10,11 +10,7 @@
= text_field_tag 'branch_name', @branch_name || tree_edit_branch, required: true, class: "form-control js-branch-name ref-name"
.js-create-merge-request-container
.checkbox
- nonce = SecureRandom.hex
= label_tag "create_merge_request-#{nonce}" do
= check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}"
#{ _('Start a <strong>new merge request</strong> with these changes').html_safe }
= render 'shared/new_merge_request_checkbox'
- else
= hidden_field_tag 'branch_name', @branch_name || tree_edit_branch
= hidden_field_tag 'create_merge_request', 1

8
app/views/shared/_new_merge_request_checkbox.html.haml Normal file
View file

@ -0,0 +1,8 @@
.checkbox
- nonce = SecureRandom.hex
= label_tag "create_merge_request-#{nonce}" do
= check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}"
- translation_variables = { new_merge_request: "<strong>#{_('new merge request')}</strong>" }
- translation = _('Start a %{new_merge_request} with these changes') % translation_variables
#{ translation.html_safe }

11
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-15 15:05+0200\n"
"PO-Revision-Date: 2017-06-15 21:59-0500\n"
"Language-Team: Spanish\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@ -205,7 +205,7 @@ msgid "Create merge request"
msgstr "Crear solicitud de fusión"
msgid "Create new..."
msgstr "Crear nuevo…"
msgstr "Crear nuevo..."
msgid "CreateNewFork|Fork"
msgstr "Bifurcar"
@ -563,7 +563,7 @@ msgid "PipelineSchedules|Target"
msgstr "Destino"
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr "Personalzado"
msgstr "Personalizado"
msgid "Pipeline|with stage"
msgstr "con etapa"
@ -714,12 +714,9 @@ msgstr "Código fuente"
msgid "StarProject|Star"
msgstr "Destacar"
msgid "Start a %{new_merge_request} with these changes"
msgid "Start a %{new_merge_request} with these changes"
msgstr "Iniciar una %{new_merge_request} con estos cambios"
msgid "Start a <strong>new merge request</strong> with these changes"
msgstr "Iniciar una <strong>nueva solicitud de fusión</strong> con estos cambios"
msgid "Switch branch/tag"
msgstr "Cambiar rama/etiqueta"

9
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-06-15 14:57+0200\n"
"PO-Revision-Date: 2017-06-15 14:57+0200\n"
"POT-Creation-Date: 2017-06-15 21:59-0500\n"
"PO-Revision-Date: 2017-06-15 21:59-0500\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@ -715,10 +715,7 @@ msgstr ""
msgid "StarProject|Star"
msgstr ""
msgid "Start a %{new_merge_request} with these changes"
msgstr ""
msgid "Start a <strong>new merge request</strong> with these changes"
msgid "Start a %{new_merge_request} with these changes"
msgstr ""
msgid "Switch branch/tag"