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
14f6d92d
Commit
14f6d92d
authored
Apr 08, 2021
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong externalization in HAML
Signed-off-by:
Takuya Noguchi
<
takninnovationresearch@gmail.com
>
parent
4c99bf93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
6 deletions
+21
-6
ee/app/views/groups/group_members/_sync_button.html.haml
ee/app/views/groups/group_members/_sync_button.html.haml
+1
-1
ee/app/views/shared/_mirror_update_button.html.haml
ee/app/views/shared/_mirror_update_button.html.haml
+5
-5
locale/gitlab.pot
locale/gitlab.pot
+15
-0
No files found.
ee/app/views/groups/group_members/_sync_button.html.haml
View file @
14f6d92d
...
...
@@ -5,7 +5,7 @@
-
elsif
@group
.
ldap_sync_pending?
%span
.btn.gl-button.disabled
=
sprite_icon
(
"retry"
,
css_class:
'spin gl-mr-2'
)
=
(
'Pending sync…'
)
=
_
(
'Pending sync…'
)
-
else
=
link_to
sync_group_ldap_path
(
@group
),
method: :put
,
class:
'btn btn-default gl-button qa-sync-now-button'
do
=
sprite_icon
(
"retry"
,
css_class:
"gl-mr-2"
)
...
...
ee/app/views/shared/_mirror_update_button.html.haml
View file @
14f6d92d
...
...
@@ -3,19 +3,19 @@
-
if
@project
.
import_state
.
mirror_update_due?
%span
.btn.gl-button.btn-default.disabled
=
sprite_icon
(
'retry'
,
css_class:
'spin gl-mr-3'
)
=
(
'Update Scheduled…'
)
=
_
(
'Update Scheduled…'
)
-
elsif
@project
.
import_state
.
updating_mirror?
%span
.btn.gl-button.btn-default.disabled
=
sprite_icon
(
'retry'
,
css_class:
'spin gl-mr-3'
)
=
(
'Updating…'
)
=
_
(
'Updating…'
)
-
elsif
can?
(
current_user
,
:admin_project
,
@project
)
=
link_to
update_now_project_mirror_path
(
@project
),
method: :post
,
class:
'gl-button btn btn-default'
do
=
sprite_icon
(
'retry'
,
css_class:
'gl-mr-3'
)
=
(
'Update Now'
)
=
_
(
'Update Now'
)
-
else
%span
.btn.gl-button.btn-default.disabled
=
sprite_icon
(
'retry'
,
css_class:
'gl-mr-3'
)
=
(
'Update Now'
)
=
_
(
'Update Now'
)
-
if
@project
.
mirror_last_update_succeeded?
%p
.inline.gl-ml-3
=
(
'Successfully updated %{last_updated_timeago}.'
).
html_safe
%
{
last_updated_timeago:
time_ago_with_tooltip
(
@project
.
import_state
.
last_successful_update_at
)
}
=
_
(
'Successfully updated %{last_updated_timeago}.'
).
html_safe
%
{
last_updated_timeago:
time_ago_with_tooltip
(
@project
.
import_state
.
last_successful_update_at
)
}
locale/gitlab.pot
View file @
14f6d92d
...
...
@@ -22613,6 +22613,9 @@ msgstr ""
msgid "Pending comments"
msgstr ""
msgid "Pending sync…"
msgstr ""
msgid "People without permission will never get a notification and won't be able to comment."
msgstr ""
...
...
@@ -29790,6 +29793,9 @@ msgstr ""
msgid "Successfully unlocked"
msgstr ""
msgid "Successfully updated %{last_updated_timeago}."
msgstr ""
msgid "Successfully verified domain ownership"
msgstr ""
...
...
@@ -33051,6 +33057,12 @@ msgstr ""
msgid "Update %{sourcePath} file"
msgstr ""
msgid "Update Now"
msgstr ""
msgid "Update Scheduled…"
msgstr ""
msgid "Update all"
msgstr ""
...
...
@@ -33123,6 +33135,9 @@ msgstr ""
msgid "Updating"
msgstr ""
msgid "Updating…"
msgstr ""
msgid "Upgrade offers available!"
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