summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantonyliu <sun_apollo@yeah.net>2019-05-17 12:37:39 +0800
committerantonyliu <sun_apollo@yeah.net>2019-05-25 15:11:37 +0800
commitb315af809f7bcb8cad5ff917d4fd990397d15c2f (patch)
tree1ee55ff2a0aec4ff049b810c643225ccc6980a8f
parent1ae718f2f944c9e2fdc160ef7a6bc33b8fd1fb13 (diff)
downloadgitlab-ce-b315af809f7bcb8cad5ff917d4fd990397d15c2f.tar.gz
Externalize strings of preferences page in user profile
-rw-r--r--app/views/profiles/preferences/show.html.haml26
-rw-r--r--locale/gitlab.pot30
2 files changed, 43 insertions, 13 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 58f2eb229ba..46384bc28ef 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -1,11 +1,11 @@
-- page_title 'Preferences'
+- page_title _('Preferences')
- @content_class = "limit-container-width" unless fluid_layout
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
.col-lg-4.application-theme
%h4.prepend-top-0
= s_('Preferences|Navigation theme')
- %p Customize the appearance of the application header and navigation sidebar.
+ %p= _('Customize the appearance of the application header and navigation sidebar.')
.col-lg-8.application-theme
- Gitlab::Themes.each do |theme|
= label_tag do
@@ -18,11 +18,11 @@
.col-lg-4.profile-settings-sidebar
%h4.prepend-top-0
- Syntax highlighting theme
+ = _('Syntax highlighting theme')
%p
- This setting allows you to customize the appearance of the syntax.
+ = _('This setting allows you to customize the appearance of the syntax.')
= 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
- Gitlab::ColorSchemes.each do |scheme|
= label_tag do
@@ -35,31 +35,31 @@
.col-lg-4.profile-settings-sidebar
%h4.prepend-top-0
- Behavior
+ = _('Behavior')
%p
- This setting allows you to customize the behavior of the system layout and default views.
+ = _('This setting allows you to customize the behavior of the system layout and default views.')
= 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
.form-group
= f.label :layout, class: 'label-bold' do
- Layout width
+ = _('Layout width')
= f.select :layout, layout_choices, {}, class: 'form-control'
.form-text.text-muted
- Choose between fixed (max. 1280px) and fluid (100%) application layout.
+ = _('Choose between fixed (max. 1280px) and fluid (100%%) application layout.')
.form-group
= f.label :dashboard, class: 'label-bold' do
- Default dashboard
+ = _('Default dashboard')
= f.select :dashboard, dashboard_choices, {}, class: 'form-control'
= render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
.form-group
= f.label :project_view, class: 'label-bold' do
- Project overview content
+ = _('Project overview content')
= f.select :project_view, project_view_choices, {}, class: 'form-control'
.form-text.text-muted
- Choose what content you want to see on a project’s overview page.
+ = _('Choose what content you want to see on a project’s overview page.')
.col-sm-12
%hr
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 700266bc026..c0561020b60 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1443,6 +1443,9 @@ msgstr ""
msgid "Begin with the selected commit"
msgstr ""
+msgid "Behavior"
+msgstr ""
+
msgid "Below are examples of regex for existing tools:"
msgstr ""
@@ -1848,6 +1851,9 @@ msgstr ""
msgid "Choose between <code>clone</code> or <code>fetch</code> to get the recent application code"
msgstr ""
+msgid "Choose between fixed (max. 1280px) and fluid (100%%) application layout."
+msgstr ""
+
msgid "Choose file…"
msgstr ""
@@ -1857,6 +1863,9 @@ msgstr ""
msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions."
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."
msgstr ""
@@ -3110,6 +3119,9 @@ msgstr ""
msgid "Customize language and region related settings."
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."
msgstr ""
@@ -3197,6 +3209,9 @@ msgstr ""
msgid "Default classification label"
msgstr ""
+msgid "Default dashboard"
+msgstr ""
+
msgid "Default first day of the week"
msgstr ""
@@ -5623,6 +5638,9 @@ msgstr ""
msgid "Latest pipeline for this branch"
msgstr ""
+msgid "Layout width"
+msgstr ""
+
msgid "Lead"
msgstr ""
@@ -7534,6 +7552,9 @@ msgstr ""
msgid "Project name"
msgstr ""
+msgid "Project overview content"
+msgstr ""
+
msgid "Project slug"
msgstr ""
@@ -9316,6 +9337,9 @@ msgstr ""
msgid "Switch to the source to copy it to the clipboard"
msgstr ""
+msgid "Syntax highlighting theme"
+msgstr ""
+
msgid "System Hooks"
msgstr ""
@@ -9996,6 +10020,12 @@ msgstr ""
msgid "This runner will only run on pipelines triggered on protected branches"
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."
msgstr ""