diff options
| -rw-r--r-- | app/assets/javascripts/pages/users/activity_calendar.js | 15 | ||||
| -rw-r--r-- | app/helpers/preferences_helper.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/58023-add-Saturday-to-localization-first-day-of-the-week.yml | 5 | ||||
| -rw-r--r-- | doc/api/settings.md | 2 | ||||
| -rw-r--r-- | doc/user/profile/preferences.md | 8 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/helpers/preferences_helper_spec.rb | 16 |
7 files changed, 43 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js index afa099d0e0b..61204c37307 100644 --- a/app/assets/javascripts/pages/users/activity_calendar.js +++ b/app/assets/javascripts/pages/users/activity_calendar.js @@ -10,6 +10,12 @@ import { __ } from '~/locale'; const d3 = { select, scaleLinear, scaleThreshold }; +const firstDayOfWeekChoices = Object.freeze({ + sunday: 0, + monday: 1, + saturday: 6, +}); + const LOADING_HTML = ` <div class="text-center"> <i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i> @@ -49,7 +55,7 @@ export default class ActivityCalendar { timestamps, calendarActivitiesPath, utcOffset = 0, - firstDayOfWeek = 0, + firstDayOfWeek = firstDayOfWeekChoices.sunday, monthsAgo = 12, ) { this.calendarActivitiesPath = calendarActivitiesPath; @@ -206,11 +212,16 @@ export default class ActivityCalendar { }, ]; - if (this.firstDayOfWeek === 1) { + if (this.firstDayOfWeek === firstDayOfWeekChoices.monday) { days.push({ text: 'S', y: 29 + this.dayYPos(7), }); + } else if (this.firstDayOfWeek === firstDayOfWeekChoices.saturday) { + days.push({ + text: 'S', + y: 29 + this.dayYPos(6), + }); } this.svg diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index eed529f93db..766508b6609 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -46,7 +46,8 @@ module PreferencesHelper def first_day_of_week_choices [ [_('Sunday'), 0], - [_('Monday'), 1] + [_('Monday'), 1], + [_('Saturday'), 6] ] end diff --git a/changelogs/unreleased/58023-add-Saturday-to-localization-first-day-of-the-week.yml b/changelogs/unreleased/58023-add-Saturday-to-localization-first-day-of-the-week.yml new file mode 100644 index 00000000000..69d927dc5e4 --- /dev/null +++ b/changelogs/unreleased/58023-add-Saturday-to-localization-first-day-of-the-week.yml @@ -0,0 +1,5 @@ +--- +title: Add Saturday to Localization first day of the week +merge_request: 25509 +author: Ahmad Haghighi +type: added diff --git a/doc/api/settings.md b/doc/api/settings.md index 2e0a2a09133..c2a1f7feefd 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -161,7 +161,7 @@ are listed in the descriptions of the relevant settings. | `email_author_in_body` | boolean | no | Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. | | `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. | | `enforce_terms` | boolean | no | (**If enabled, requires:** `terms`) Enforce application ToS to all users. | -| `first_day_of_week` | integer | no | Start day of the week for calendar views and date pickers. Valid values are `0` (default) for Sunday and `1` for Monday. | +| `first_day_of_week` | integer | no | Start day of the week for calendar views and date pickers. Valid values are `0` (default) for Sunday, `1` for Monday, and `6` for Saturday. | | `gitaly_timeout_default` | integer | no | Default Gitaly timeout, in seconds. This timeout is not enforced for git fetch/push operations or Sidekiq jobs. Set to `0` to disable timeouts. | | `gitaly_timeout_fast` | integer | no | Gitaly fast operation timeout, in seconds. Some Gitaly operations are expected to be fast. If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance. Set to `0` to disable timeouts. | | `gitaly_timeout_medium` | integer | no | Medium Gitaly timeout, in seconds. This should be a value between the Fast and the Default timeout. Set to `0` to disable timeouts. | diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index db68510c46d..f399dc40164 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -103,4 +103,10 @@ Select your preferred language from a list of supported languages. The first day of the week can be customised for calendar views and date pickers. -You can choose **Sunday** or **Monday** as the first day of the week. If you select **System Default**, the system-wide default setting will be used. +You can choose one of the following options as the first day of the week: + +- Saturday +- Sunday +- Monday + +If you select **System Default**, the system-wide default setting will be used. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index cb599e4744c..861a90ae64e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6464,6 +6464,9 @@ msgstr "" msgid "SSL Verification" msgstr "" +msgid "Saturday" +msgstr "" + msgid "Save" msgstr "" diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb index e0e8ebd0c3c..db0d45c3692 100644 --- a/spec/helpers/preferences_helper_spec.rb +++ b/spec/helpers/preferences_helper_spec.rb @@ -36,10 +36,11 @@ describe PreferencesHelper do end describe '#first_day_of_week_choices' do - it 'returns Sunday and Monday as choices' do + it 'returns Saturday, Sunday and Monday as choices' do expect(helper.first_day_of_week_choices).to eq [ ['Sunday', 0], - ['Monday', 1] + ['Monday', 1], + ['Saturday', 6] ] end end @@ -47,14 +48,21 @@ describe PreferencesHelper do describe '#first_day_of_week_choices_with_default' do it 'returns choices including system default' do expect(helper.first_day_of_week_choices_with_default).to eq [ - ['System default (Sunday)', nil], ['Sunday', 0], ['Monday', 1] + ['System default (Sunday)', nil], ['Sunday', 0], ['Monday', 1], ['Saturday', 6] ] end it 'returns choices including system default set to Monday' do stub_application_setting(first_day_of_week: 1) expect(helper.first_day_of_week_choices_with_default).to eq [ - ['System default (Monday)', nil], ['Sunday', 0], ['Monday', 1] + ['System default (Monday)', nil], ['Sunday', 0], ['Monday', 1], ['Saturday', 6] + ] + end + + it 'returns choices including system default set to Saturday' do + stub_application_setting(first_day_of_week: 6) + expect(helper.first_day_of_week_choices_with_default).to eq [ + ['System default (Saturday)', nil], ['Sunday', 0], ['Monday', 1], ['Saturday', 6] ] end end |