Commit d89405fd authored by Phil Hughes's avatar Phil Hughes

Merge branch 'gt-externalize-profiles-preferences' into 'master'

Externalize profiles preferences

Closes #53349

See merge request gitlab-org/gitlab-ce!28470
parents be1e1cea c52ccf41
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
.col-lg-4.application-theme .col-lg-4.application-theme
%h4.prepend-top-0 %h4.prepend-top-0
= s_('Preferences|Navigation theme') = s_('Preferences|Navigation theme')
%p= _('Customize the appearance of the application header and navigation sidebar.') %p
= s_('Preferences|Customize the appearance of the application header and navigation sidebar.')
.col-lg-8.application-theme .col-lg-8.application-theme
- Gitlab::Themes.each do |theme| - Gitlab::Themes.each do |theme|
= label_tag do = label_tag do
...@@ -18,9 +19,9 @@ ...@@ -18,9 +19,9 @@
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.prepend-top-0 %h4.prepend-top-0
= _('Syntax highlighting theme') = s_('Preferences|Syntax highlighting theme')
%p %p
= _('This setting allows you to customize the appearance of the syntax.') = s_('Preferences|This setting allows you to customize the appearance of the syntax.')
= succeed '.' do = succeed '.' do
= link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'syntax-highlighting-theme'), target: '_blank' = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'syntax-highlighting-theme'), target: '_blank'
.col-lg-8.syntax-theme .col-lg-8.syntax-theme
...@@ -35,31 +36,31 @@ ...@@ -35,31 +36,31 @@
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.prepend-top-0 %h4.prepend-top-0
= _('Behavior') = s_('Preferences|Behavior')
%p %p
= _('This setting allows you to customize the behavior of the system layout and default views.') = s_('Preferences|This setting allows you to customize the behavior of the system layout and default views.')
= succeed '.' do = succeed '.' do
= link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank' = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank'
.col-lg-8 .col-lg-8
.form-group .form-group
= f.label :layout, class: 'label-bold' do = f.label :layout, class: 'label-bold' do
= _('Layout width') = s_('Preferences|Layout width')
= f.select :layout, layout_choices, {}, class: 'form-control' = f.select :layout, layout_choices, {}, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= _('Choose between fixed (max. 1280px) and fluid (100%%) application layout.') = s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.')
.form-group .form-group
= f.label :dashboard, class: 'label-bold' do = f.label :dashboard, class: 'label-bold' do
= _('Default dashboard') = s_('Preferences|Default dashboard')
= f.select :dashboard, dashboard_choices, {}, class: 'form-control' = f.select :dashboard, dashboard_choices, {}, class: 'form-control'
= render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
.form-group .form-group
= f.label :project_view, class: 'label-bold' do = f.label :project_view, class: 'label-bold' do
= _('Project overview content') = s_('Preferences|Project overview content')
= f.select :project_view, project_view_choices, {}, class: 'form-control' = f.select :project_view, project_view_choices, {}, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= _('Choose what content you want to see on a project’s overview page.') = s_('Preferences|Choose what content you want to see on a project’s overview page.')
.col-sm-12 .col-sm-12
%hr %hr
......
---
title: Externalize profiles preferences
merge_request: 28470
author: George Tsiolis
type: other
...@@ -1485,9 +1485,6 @@ msgstr "" ...@@ -1485,9 +1485,6 @@ msgstr ""
msgid "Begin with the selected commit" msgid "Begin with the selected commit"
msgstr "" msgstr ""
msgid "Behavior"
msgstr ""
msgid "Below are examples of regex for existing tools:" msgid "Below are examples of regex for existing tools:"
msgstr "" msgstr ""
...@@ -1911,9 +1908,6 @@ msgstr "" ...@@ -1911,9 +1908,6 @@ msgstr ""
msgid "Choose between <code>clone</code> or <code>fetch</code> to get the recent application code" msgid "Choose between <code>clone</code> or <code>fetch</code> to get the recent application code"
msgstr "" msgstr ""
msgid "Choose between fixed (max. 1280px) and fluid (100%%) application layout."
msgstr ""
msgid "Choose file…" msgid "Choose file…"
msgstr "" msgstr ""
...@@ -1923,9 +1917,6 @@ msgstr "" ...@@ -1923,9 +1917,6 @@ msgstr ""
msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions." msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions."
msgstr "" msgstr ""
msgid "Choose what content you want to see on a project’s overview page."
msgstr ""
msgid "Choose your merge method, options, checks, and set up a default merge request description template." msgid "Choose your merge method, options, checks, and set up a default merge request description template."
msgstr "" msgstr ""
...@@ -3167,9 +3158,6 @@ msgstr "" ...@@ -3167,9 +3158,6 @@ msgstr ""
msgid "Customize language and region related settings." msgid "Customize language and region related settings."
msgstr "" msgstr ""
msgid "Customize the appearance of the application header and navigation sidebar."
msgstr ""
msgid "Customize your pipeline configuration, view your pipeline status and coverage report." msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
msgstr "" msgstr ""
...@@ -3257,9 +3245,6 @@ msgstr "" ...@@ -3257,9 +3245,6 @@ msgstr ""
msgid "Default classification label" msgid "Default classification label"
msgstr "" msgstr ""
msgid "Default dashboard"
msgstr ""
msgid "Default first day of the week" msgid "Default first day of the week"
msgstr "" msgstr ""
...@@ -5776,9 +5761,6 @@ msgstr "" ...@@ -5776,9 +5761,6 @@ msgstr ""
msgid "Latest pipeline for this branch" msgid "Latest pipeline for this branch"
msgstr "" msgstr ""
msgid "Layout width"
msgstr ""
msgid "Lead" msgid "Lead"
msgstr "" msgstr ""
...@@ -7321,21 +7303,51 @@ msgstr "" ...@@ -7321,21 +7303,51 @@ msgstr ""
msgid "Preferences saved." msgid "Preferences saved."
msgstr "" msgstr ""
msgid "Preferences|Behavior"
msgstr ""
msgid "Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout."
msgstr ""
msgid "Preferences|Choose what content you want to see on a project’s overview page."
msgstr ""
msgid "Preferences|Customize the appearance of the application header and navigation sidebar."
msgstr ""
msgid "Preferences|Default dashboard"
msgstr ""
msgid "Preferences|Display time in 24-hour format" msgid "Preferences|Display time in 24-hour format"
msgstr "" msgstr ""
msgid "Preferences|For example: 30 mins ago." msgid "Preferences|For example: 30 mins ago."
msgstr "" msgstr ""
msgid "Preferences|Layout width"
msgstr ""
msgid "Preferences|Navigation theme" msgid "Preferences|Navigation theme"
msgstr "" msgstr ""
msgid "Preferences|Project overview content"
msgstr ""
msgid "Preferences|Syntax highlighting theme"
msgstr ""
msgid "Preferences|These settings will update how dates and times are displayed for you." msgid "Preferences|These settings will update how dates and times are displayed for you."
msgstr "" msgstr ""
msgid "Preferences|This feature is experimental and translations are not complete yet" msgid "Preferences|This feature is experimental and translations are not complete yet"
msgstr "" msgstr ""
msgid "Preferences|This setting allows you to customize the appearance of the syntax."
msgstr ""
msgid "Preferences|This setting allows you to customize the behavior of the system layout and default views."
msgstr ""
msgid "Preferences|Time display" msgid "Preferences|Time display"
msgstr "" msgstr ""
...@@ -7771,9 +7783,6 @@ msgstr "" ...@@ -7771,9 +7783,6 @@ msgstr ""
msgid "Project name" msgid "Project name"
msgstr "" msgstr ""
msgid "Project overview content"
msgstr ""
msgid "Project slug" msgid "Project slug"
msgstr "" msgstr ""
...@@ -9679,9 +9688,6 @@ msgstr "" ...@@ -9679,9 +9688,6 @@ msgstr ""
msgid "Switch to the source to copy it to the clipboard" msgid "Switch to the source to copy it to the clipboard"
msgstr "" msgstr ""
msgid "Syntax highlighting theme"
msgstr ""
msgid "System Hooks" msgid "System Hooks"
msgstr "" msgstr ""
...@@ -10395,12 +10401,6 @@ msgstr "" ...@@ -10395,12 +10401,6 @@ msgstr ""
msgid "This runner will only run on pipelines triggered on protected branches" msgid "This runner will only run on pipelines triggered on protected branches"
msgstr "" msgstr ""
msgid "This setting allows you to customize the appearance of the syntax."
msgstr ""
msgid "This setting allows you to customize the behavior of the system layout and default views."
msgstr ""
msgid "This setting can be overridden in each project." msgid "This setting can be overridden in each project."
msgstr "" msgstr ""
......
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