Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4c890fc3
Commit
4c890fc3
authored
Jul 06, 2021
by
Marcel Amirault
Committed by
Natalia Tepluhina
Jul 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update admin settings text for localization preferences
parent
237d9c71
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
5 deletions
+16
-5
app/views/admin/application_settings/_localization.html.haml
app/views/admin/application_settings/_localization.html.haml
+5
-0
app/views/admin/application_settings/preferences.html.haml
app/views/admin/application_settings/preferences.html.haml
+1
-1
doc/user/profile/preferences.md
doc/user/profile/preferences.md
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+9
-3
No files found.
app/views/admin/application_settings/_localization.html.haml
View file @
4c890fc3
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
=
f
.
select
:first_day_of_week
,
first_day_of_week_choices
,
{},
class:
'form-control'
=
f
.
select
:first_day_of_week
,
first_day_of_week_choices
,
{},
class:
'form-control'
.form-text.text-muted
.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.'
)
=
link_to
_
(
'Learn more.'
),
help_page_path
(
'user/admin_area/settings/index.md'
,
anchor:
'default-first-day-of-the-week'
),
target:
'_blank'
.form-group
.form-group
=
f
.
label
:time_tracking
,
_
(
'Time tracking'
),
class:
'label-bold'
=
f
.
label
:time_tracking
,
_
(
'Time tracking'
),
class:
'label-bold'
...
@@ -14,5 +15,9 @@
...
@@ -14,5 +15,9 @@
=
f
.
check_box
:time_tracking_limit_to_hours
,
class:
'form-check-input'
=
f
.
check_box
:time_tracking_limit_to_hours
,
class:
'form-check-input'
=
f
.
label
:time_tracking_limit_to_hours
,
class:
'form-check-label'
do
=
f
.
label
:time_tracking_limit_to_hours
,
class:
'form-check-label'
do
=
_
(
'Limit display of time tracking units to hours.'
)
=
_
(
'Limit display of time tracking units to hours.'
)
.form-text.text-muted
=
_
(
'Display time tracking in issues in total hours only.'
)
=
link_to
_
(
'What is time tracking?'
),
help_page_path
(
'user/project/time_tracking.md'
),
target:
'_blank'
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
app/views/admin/application_settings/preferences.html.haml
View file @
4c890fc3
...
@@ -77,6 +77,6 @@
...
@@ -77,6 +77,6 @@
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'
Various localization setting
s.'
)
=
_
(
'
Configure the default first day of the week and time tracking unit
s.'
)
.settings-content
.settings-content
=
render
'localization'
=
render
'localization'
doc/user/profile/preferences.md
View file @
4c890fc3
...
@@ -163,7 +163,7 @@ You can choose one of the following options as the first day of the week:
...
@@ -163,7 +163,7 @@ You can choose one of the following options as the first day of the week:
-
Sunday
-
Sunday
-
Monday
-
Monday
If you select
**System Default**
, the
system-wide default
setting is used.
If you select
**System Default**
, the
[
instance default
](
../admin_area/settings/index.md#default-first-day-of-the-week
)
setting is used.
## Integrations
## Integrations
...
...
locale/gitlab.pot
View file @
4c890fc3
...
@@ -8277,6 +8277,9 @@ msgstr ""
...
@@ -8277,6 +8277,9 @@ msgstr ""
msgid "Configure the %{link} integration."
msgid "Configure the %{link} integration."
msgstr ""
msgstr ""
msgid "Configure the default first day of the week and time tracking units."
msgstr ""
msgid "Configure the way a user creates a new account."
msgid "Configure the way a user creates a new account."
msgstr ""
msgstr ""
...
@@ -11524,6 +11527,9 @@ msgstr ""
...
@@ -11524,6 +11527,9 @@ msgstr ""
msgid "Display source"
msgid "Display source"
msgstr ""
msgstr ""
msgid "Display time tracking in issues in total hours only."
msgstr ""
msgid "Do not display offers from third parties"
msgid "Do not display offers from third parties"
msgstr ""
msgstr ""
...
@@ -35892,9 +35898,6 @@ msgstr ""
...
@@ -35892,9 +35898,6 @@ msgstr ""
msgid "Various email settings."
msgid "Various email settings."
msgstr ""
msgstr ""
msgid "Various localization settings."
msgstr ""
msgid "Various settings that affect GitLab performance."
msgid "Various settings that affect GitLab performance."
msgstr ""
msgstr ""
...
@@ -36718,6 +36721,9 @@ msgstr ""
...
@@ -36718,6 +36721,9 @@ msgstr ""
msgid "What is squashing?"
msgid "What is squashing?"
msgstr ""
msgstr ""
msgid "What is time tracking?"
msgstr ""
msgid "What is your job title? (optional)"
msgid "What is your job title? (optional)"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment