diff --git a/app/views/groups/_create_chat_team.html.haml b/app/views/groups/_create_chat_team.html.haml index 561e68a9155e98e8f15e812f0f7bea59d0749f72..2531993a095b20e7337ccb5f1eb4f91d522258e9 100644 --- a/app/views/groups/_create_chat_team.html.haml +++ b/app/views/groups/_create_chat_team.html.haml @@ -8,7 +8,7 @@ .form-check.js-toggle-container .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 - Create a Mattermost team for this group + = _('Create a Mattermost team for this group') %br %small.light.js-toggle-content Mattermost URL: diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 06e05d898d6e72909ae504327a97fd0d559f06f3..376624f4786590c4e2789e8706b3147d83a4c7a7 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -40,5 +40,5 @@ = render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled .form-actions - = f.submit 'Create group', class: "btn btn-success" - = link_to 'Cancel', dashboard_groups_path, class: 'btn btn-cancel' + = f.submit _('Create group'), class: "btn btn-success" + = link_to _('Cancel'), dashboard_groups_path, class: 'btn btn-cancel' diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index 973c756f49685e360a7586e288897fef6e498fab..959792718ca32998d059f4b53c75c4c63fbb771e 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -30,9 +30,9 @@ - if @group.persisted? .alert.alert-warning.prepend-top-10 - Changing group path can have unintended side effects. + = _('Changing group path can have unintended side effects.') = 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? .row diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b5ffe1bc28a1ed1c2f58ac166b444ac8818c8125..285e6f620487df497b2ad8f141050b5f2d4c9bfc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2946,6 +2946,9 @@ msgstr "" msgid "Changes won't take place until the index is %{link_start}recreated%{link_end}." msgstr "" +msgid "Changing group path can have unintended side effects." +msgstr "" + msgid "Charts" msgstr "" @@ -4618,6 +4621,9 @@ msgstr "" msgid "Create a GitLab account first, and then connect it to your %{label} account." 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." msgstr "" diff --git a/qa/qa/page/group/new.rb b/qa/qa/page/group/new.rb index 9e37d14fbf38cbd76c9dace3da2fa6c85235ab04..e01b8754d556c4c79af46fc6ded08683e5143d08 100644 --- a/qa/qa/page/group/new.rb +++ b/qa/qa/page/group/new.rb @@ -11,7 +11,7 @@ class New < Page::Base end 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 end