diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-09 12:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-09 12:09:10 +0300 |
commit | 7484851b5f762fad81ddecb4735d22828e205af1 (patch) | |
tree | b7e5da6212d2b32626b9b3d70c9089b98d05bb92 /app/views | |
parent | 760822a53715549c2f115370ed24a19db1b7d63a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/help/index.html.haml | 27 | ||||
-rw-r--r-- | app/views/jira_connect/subscriptions/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/jira_connect/users/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/notes/_comment_button.html.haml | 2 |
5 files changed, 19 insertions, 18 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 03f8539293b..a56eaaf685f 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -13,19 +13,20 @@ - unless Gitlab::CurrentSettings.help_page_hide_commercial_content? %p.slead - GitLab is open source software to collaborate on code. + = _('GitLab is open source software to collaborate on code.') %br - Manage git repositories with fine-grained access controls that keep your code secure. + = _('Manage git repositories with fine-grained access controls that keep your code secure.') %br - Perform code reviews and enhance collaboration with merge requests. + = _('Perform code reviews and enhance collaboration with merge requests.') %br - Each project can also have an issue tracker and a wiki. + = _('Each project can also have an issue tracker and a wiki.') %br - Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises. + = _('Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.') %br - Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}. + - link_to_promo = link_to(promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer') + = _("Read more about GitLab at %{link_to_promo}.").html_safe % { link_to_promo: link_to_promo } -%p= link_to 'Check the current instance configuration ', help_instance_configuration_url +%p= link_to _('Check the current instance configuration '), help_instance_configuration_url %hr .row.gl-mt-3 @@ -35,15 +36,15 @@ .col-md-4 .card.links-card .card-header - Quick help + = _('Quick help') %ul.content-list - %li= link_to 'See our website for getting help', support_url + %li= link_to _('See our website for getting help'), support_url %li %button.btn-blank.btn-link.js-trigger-search-bar{ type: 'button' } - Use the search bar on the top of this page + = _('Use the search bar on the top of this page') %li %button.btn-blank.btn-link.js-trigger-shortcut{ type: 'button' } - Use shortcuts + = _('Use shortcuts') - unless Gitlab::CurrentSettings.help_page_hide_commercial_content? - %li= link_to 'Get a support subscription', 'https://about.gitlab.com/pricing/' - %li= link_to 'Compare GitLab editions', 'https://about.gitlab.com/features/#compare' + %li= link_to _('Get a support subscription'), 'https://about.gitlab.com/pricing/' + %li= link_to _('Compare GitLab editions'), 'https://about.gitlab.com/features/#compare' diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml index c7873991010..8ce46a28252 100644 --- a/app/views/jira_connect/subscriptions/index.html.haml +++ b/app/views/jira_connect/subscriptions/index.html.haml @@ -39,13 +39,13 @@ - else .gl-text-center %h4= s_('Integrations|No linked namespaces') - %p= s_('Integrations|Namespaces are your GitLab groups and subgroups that will be linked to this Jira instance.') + %p= s_('Integrations|Namespaces are the GitLab groups and subgroups you link to this Jira instance.') %p.jira-connect-app-body.gl-mt-7.gl-font-base.gl-text-center %strong= s_('Integrations|Browser limitations') - firefox_link_url = 'https://www.mozilla.org/en-US/firefox/' - firefox_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: firefox_link_url } - = s_('Integrations|Adding a namespace currently works only in browsers that allow cross‑site cookies. Please make sure to use %{firefox_link_start}Firefox%{firefox_link_end} or enable cross‑site cookies in your browser when adding a namespace.').html_safe % { firefox_link_start: firefox_link_start, firefox_link_end: '</a>'.html_safe } + = s_('Integrations|Adding a namespace works only in browsers that allow cross‑site cookies. Use %{firefox_link_start}Firefox%{firefox_link_end}, or enable cross‑site cookies in your browser, when adding a namespace.').html_safe % { firefox_link_start: firefox_link_start, firefox_link_end: '</a>'.html_safe } = link_to _('Learn more'), 'https://gitlab.com/gitlab-org/gitlab/-/issues/284211', target: '_blank', rel: 'noopener noreferrer' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? diff --git a/app/views/jira_connect/users/show.html.haml b/app/views/jira_connect/users/show.html.haml index 2ff92ab0dc8..9cc2b41e5c8 100644 --- a/app/views/jira_connect/users/show.html.haml +++ b/app/views/jira_connect/users/show.html.haml @@ -1,6 +1,6 @@ .jira-connect-users-container.gl-text-center - user_link = link_to(current_user.to_reference, user_path(current_user), target: '_blank', rel: 'noopener noreferrer') - %h2= _('You are signed into GitLab as %{user_link}').html_safe % { user_link: user_link } + %h2= _('You are signed in to GitLab as %{user_link}').html_safe % { user_link: user_link } %p= s_('Integrations|You can now close this window and return to the GitLab for Jira application.') diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index cc5ce00669e..15544fb9c45 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -84,7 +84,7 @@ .col-lg-8 -# TODO: might need an entry in user/profile.md to describe some of these settings -# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070 - %h5= ("Time zone") + %h5= _("Time zone") = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) %input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone } .col-lg-12 diff --git a/app/views/shared/notes/_comment_button.html.haml b/app/views/shared/notes/_comment_button.html.haml index d415c64b929..1129fed9c3b 100644 --- a/app/views/shared/notes/_comment_button.html.haml +++ b/app/views/shared/notes/_comment_button.html.haml @@ -4,7 +4,7 @@ %input.btn.gl-button.btn-confirm.js-comment-button.js-comment-submit-button{ type: 'submit', value: _('Comment'), data: { qa_selector: 'comment_button' } } - if @note.can_be_discussion_note? - = button_tag type: 'button', class: 'gl-button btn dropdown-toggle btn-confirm btn-icon js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => _('Open comment type dropdown') do + = button_tag type: 'button', class: 'gl-button btn dropdown-toggle btn-confirm js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => _('Open comment type dropdown') do = sprite_icon('chevron-down') %ul#resolvable-comment-menu.dropdown-menu.dropdown-open-top{ data: { dropdown: true } } |