Commit f23f0b6f authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'ee-i18n-groups-new' into 'master'

Externalize strings of page ‘groups/new’

See merge request gitlab-org/gitlab!15507
parents 872520ab cae696a0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.form-check.js-toggle-container .form-check.js-toggle-container
.js-toggle-button.form-check-input= f.check_box(:create_chat_team, { checked: true }, true, false) .js-toggle-button.form-check-input= f.check_box(:create_chat_team, { checked: true }, true, false)
= f.label :create_chat_team, class: 'form-check-label' do = f.label :create_chat_team, class: 'form-check-label' do
Create a Mattermost team for this group = _('Create a Mattermost team for this group')
%br %br
%small.light.js-toggle-content %small.light.js-toggle-content
Mattermost URL: Mattermost URL:
......
...@@ -40,5 +40,5 @@ ...@@ -40,5 +40,5 @@
= render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled = render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled
.form-actions .form-actions
= f.submit 'Create group', class: "btn btn-success" = f.submit _('Create group'), class: "btn btn-success"
= link_to 'Cancel', dashboard_groups_path, class: 'btn btn-cancel' = link_to _('Cancel'), dashboard_groups_path, class: 'btn btn-cancel'
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
- if @group.persisted? - if @group.persisted?
.alert.alert-warning.prepend-top-10 .alert.alert-warning.prepend-top-10
Changing group path can have unintended side effects. = _('Changing group path can have unintended side effects.')
= succeed '.' do = succeed '.' do
= link_to 'Learn more', help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' = link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank'
- if @group.persisted? - if @group.persisted?
.row .row
......
...@@ -2946,6 +2946,9 @@ msgstr "" ...@@ -2946,6 +2946,9 @@ msgstr ""
msgid "Changes won't take place until the index is %{link_start}recreated%{link_end}." msgid "Changes won't take place until the index is %{link_start}recreated%{link_end}."
msgstr "" msgstr ""
msgid "Changing group path can have unintended side effects."
msgstr ""
msgid "Charts" msgid "Charts"
msgstr "" msgstr ""
...@@ -4618,6 +4621,9 @@ msgstr "" ...@@ -4618,6 +4621,9 @@ msgstr ""
msgid "Create a GitLab account first, and then connect it to your %{label} account." msgid "Create a GitLab account first, and then connect it to your %{label} account."
msgstr "" msgstr ""
msgid "Create a Mattermost team for this group"
msgstr ""
msgid "Create a local proxy for storing frequently used upstream images. %{link_start}Learn more%{link_end} about dependency proxies." msgid "Create a local proxy for storing frequently used upstream images. %{link_start}Learn more%{link_end} about dependency proxies."
msgstr "" msgstr ""
......
...@@ -11,7 +11,7 @@ module QA ...@@ -11,7 +11,7 @@ module QA
end end
view 'app/views/groups/new.html.haml' do view 'app/views/groups/new.html.haml' do
element :create_group_button, "submit 'Create group'" # rubocop:disable QA/ElementWithPattern element :create_group_button, "submit _('Create group')" # rubocop:disable QA/ElementWithPattern
element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment