Skip to content
代码片段 群组 项目
提交 f7200a50 编辑于 作者: Peter Leitzen's avatar Peter Leitzen
浏览文件

Merge branch 'fix-i18n-on-admin-settings-page' into 'master'

Fix i18n about hard code on admin settings page

See merge request gitlab-org/gitlab!96552
No related branches found
No related tags found
无相关合并请求
......@@ -5,7 +5,7 @@
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
= _('Add License')
= render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle', data: { qa_selector: 'expand_add_license_button' } }) do
= expanded_by_default? ? 'Collapse' : 'Expand'
= expanded_by_default? ? _('Collapse') : _('Expand')
%p
- if License.current
= _('To continue using GitLab Enterprise Edition, upload the %{codeOpen}.gitlab-license%{codeClose} file or enter the license key you have received from GitLab Inc.').html_safe % {codeOpen: '<code>'.html_safe, codeClose: '</code>'.html_safe}
......@@ -40,4 +40,4 @@
= _('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe % { eula_link_start: eula_link_start, eula_url: eula_url, eula_link_end: '</a>'.html_safe }
.form-actions
= f.submit 'Add license', pajamas_button: true, data: { qa_selector: 'license_upload_button' }, disabled: true
= f.submit _('Add license'), pajamas_button: true, data: { qa_selector: 'license_upload_button' }, disabled: true
......@@ -2289,6 +2289,9 @@ msgstr ""
msgid "Add label(s)"
msgstr ""
 
msgid "Add license"
msgstr ""
msgid "Add list"
msgstr ""
 
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册