Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorFabian Schneider <fabbbbbi+git@googlemail.com>2018-11-13 21:38:26 +0300
committerFabian Schneider <fabbbbbi+git@googlemail.com>2019-02-06 19:33:57 +0300
commit8fabc92e8b4779030c4fa09d8e1c72f213814787 (patch)
treed79ecbda0b0b5a2814379d83edb4f2395182526c /app/views
parent5402f3c360eaa668782d53cdf04fcc1cb0a400ec (diff)
Add helpers for first day of the week
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/application_settings/_localization.html.haml6
-rw-r--r--app/views/profiles/preferences/show.html.haml14
2 files changed, 10 insertions, 10 deletions
diff --git a/app/views/admin/application_settings/_localization.html.haml b/app/views/admin/application_settings/_localization.html.haml
index 87209da75fd..7392b32ee89 100644
--- a/app/views/admin/application_settings/_localization.html.haml
+++ b/app/views/admin/application_settings/_localization.html.haml
@@ -4,8 +4,8 @@
%fieldset
.form-group
= f.label :default_first_day_of_week, _('Default first day of the week'), class: 'label-bold'
- = f.select :default_first_day_of_week, options_for_select({_('Sunday') => 0, _('Monday') => 1}, @application_setting.default_first_day_of_week), {}, class: 'form-control'
+ = f.select :default_first_day_of_week, first_day_of_week_choices, {}, class: 'form-control'
.form-text.text-muted
- Default first day of the week in calendars and date pickers.
+ = _('Default first day of the week in calendars and date pickers.')
- = f.submit 'Save changes', class: "btn btn-success"
+ = f.submit _('Save changes'), class: "btn btn-success"
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index bed9aa05224..e290ba89684 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -66,17 +66,17 @@
.col-lg-4.profile-settings-sidebar
%h4.prepend-top-0
- Localization
+ = _('Localization')
%p
- Customize language and region related settings.
+ = _('Customize language and region related settings.')
= succeed '.' do
- = link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'localization'), target: '_blank'
+ = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'localization'), target: '_blank'
.col-lg-8
.form-group
= f.label :first_day_of_week, class: 'label-bold' do
- First day of the week
- = f.select :first_day_of_week, first_day_of_week_choices, {}, class: 'form-control'
+ = _('First day of the week')
+ = f.select :first_day_of_week, first_day_of_week_choices_with_default, {}, class: 'form-control'
.form-text.text-muted
- Choose on what day the week should start.
+ = _('Choose on what day the week should start.')
.form-group
- = f.submit 'Save changes', class: 'btn btn-success'
+ = f.submit _('Save changes'), class: 'btn btn-success'