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
119f7a5f
Commit
119f7a5f
authored
Oct 20, 2021
by
scootergrisen
Committed by
Phil Hughes
Oct 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add "will" to "ServiceDesk" string
parent
fb0dc313
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
5 deletions
+2
-5
app/assets/javascripts/issues_list/service_desk_helper.js
app/assets/javascripts/issues_list/service_desk_helper.js
+1
-1
app/views/projects/issues/_service_desk_empty_state.html.haml
...views/projects/issues/_service_desk_empty_state.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
app/assets/javascripts/issues_list/service_desk_helper.js
View file @
119f7a5f
...
...
@@ -20,7 +20,7 @@ export function generateMessages(emptyStateMeta) {
);
const
serviceDeskSupportedMessage
=
s__
(
'
ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation.
'
,
'
ServiceDesk|Issues created from Service Desk emails
will
appear here. Each comment becomes part of the email conversation.
'
,
);
const
commonDescription
=
`
...
...
app/views/projects/issues/_service_desk_empty_state.html.haml
View file @
119f7a5f
...
...
@@ -16,7 +16,7 @@
=
s_
(
"ServiceDesk|Your users can send emails to this address:"
)
%code
=
@project
.
service_desk_address
%span
=
s_
(
"ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation."
)
%span
=
s_
(
"ServiceDesk|Issues created from Service Desk emails
will
appear here. Each comment becomes part of the email conversation."
)
=
link_to
_
(
'Learn more.'
),
help_page_path
(
'user/project/service_desk'
)
-
if
can_edit_project_settings
&&
!
service_desk_enabled
...
...
locale/gitlab.pot
View file @
119f7a5f
...
...
@@ -31058,9 +31058,6 @@ msgstr ""
msgid "ServiceDesk|For help setting up the Service Desk for your instance, please contact an administrator."
msgstr ""
msgid "ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation."
msgstr ""
msgid "ServiceDesk|Issues created from Service Desk emails will appear here. Each comment becomes part of the email conversation."
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