Commit fb5a54ad authored by Jeremy Wu's avatar Jeremy Wu Committed by Robert Hunt

Fix: notify service i18n for MR and Issues

Update notify email template for MR and issues with i18n

Changelog: changed
MR: !84123
parent cb06d0b1
%p.details
#{link_to @issue.author_name, user_url(@issue.author)}'s issue #{issue_reference_link(@issue)} is due soon.
= sprintf(s_("Notify|%{author_link}'s issue %{issue_reference_link} is due soon."), { author_link: link_to(@issue.author_name, user_url(@issue.author)), issue_reference_link: issue_reference_link(@issue) })
- if @issue.assignees.any?
%p
= assignees_label(@issue)
%p
This issue is due on: #{@issue.due_date.to_s(:medium)}
= sprintf(s_('Notify|This issue is due on: %{issue_due_date}'), { issue_due_date: @issue.due_date.to_s(:medium) }).html_safe
- if @issue.description
.md
......
%p
Issue was moved to another project.
= s_('Notify|Issue was moved to another project.')
- if @can_access_project
%p
New issue:
= link_to project_issue_url(@new_project, @new_issue) do
= @new_issue.title
= sprintf(s_('Notify|New issue: %{project_issue_url}'), { project_issue_url: link_to(@new_issue.title, project_issue_url(@new_project, @new_issue)) } ).html_safe
- else
You don't have access to the project.
= s_("Notify|You don't have access to the project.")
%p
Issue was #{@issue_status} by #{sanitize_name(@updated_by.name)}
= sprintf(s_('Notify|Issue was %{issue_status} by %{updated_by}'), { issue_status: @issue_status, updated_by: sanitize_name(@updated_by.name) }).html_safe
%p
Merge request #{merge_request_reference_link(@merge_request)}
was #{@mr_status} by #{sanitize_name(@updated_by.name)}
= sprintf(s_('Notify|Merge request %{merge_request} was %{mr_status} by %{updated_by}'),
{ merge_request: merge_request_reference_link(@merge_request), mr_status: @mr_status, updated_by: sanitize_name(@updated_by.name) }).html_safe
Merge request #{@merge_request.to_reference} was #{@mr_status} by #{sanitize_name(@updated_by.name)}
= sprintf(s_('Notify|Merge request %{merge_request} was %{mr_status}'), { merge_request: @merge_request.to_reference, mr_status: sanitize_name(@updated_by.name) })
Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= sprintf(s_('Notify|Merge request URL: %{merge_request_url}'), { merge_request_url: project_merge_request_url(@merge_request.target_project, @merge_request) })
= merge_path_description(@merge_request, 'to')
Author: #{sanitize_name(@merge_request.author_name)}
= sprintf(s_('Notify|Author: %{author_name}'), { author_name: sanitize_name(@merge_request.author_name) })
= assignees_label(@merge_request)
= reviewers_label(@merge_request)
%p
Merge request #{merge_request_reference_link(@merge_request)} can no longer be merged due to conflict.
= sprintf(s_('Notify|Merge request %{merge_request} can no longer be merged due to conflict.'), { merge_request: merge_request_reference_link(@merge_request) }).html_safe
Merge request #{@merge_request.to_reference} can no longer be merged due to conflict.
= sprintf(s_('Notify|Merge request %{merge_request} can no longer be merged due to conflict.'), { merge_request: @merge_request.to_reference })
Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= sprintf(s_('Notify|Merge request URL: %{merge_request_url}'), { merge_request_url: project_merge_request_url(@merge_request.target_project, @merge_request) })
= merge_path_description(@merge_request, 'to')
Author: #{sanitize_name(@merge_request.author_name)}
= sprintf(s_('Author: %{author_name}'), { author_name: sanitize_name(@merge_request.author_name) })
= assignees_label(@merge_request)
= reviewers_label(@merge_request)
%p
Merge request #{merge_request_reference_link(@merge_request)} was merged
= sprintf(s_('Notify|Merge request %{merge_request} was merged'), { merge_request: merge_request_reference_link(@merge_request) }).html_safe
Merge request #{@merge_request.to_reference} was merged
= sprintf(s_('Notify|Merge request %{merge_request} was merged'), { merge_request: @merge_request.to_reference })
Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= sprintf(s_('Notify|Merge request URL: %{merge_request_url}'), { merge_request_url: project_merge_request_url(@merge_request.target_project, @merge_request) })
= merge_path_description(@merge_request, 'to')
Author: #{sanitize_name(@merge_request.author_name)}
sprintf(s_('Notify|Author: %{author_name}'), { author_name: sanitize_name(@merge_request.author_name) })
= assignees_label(@merge_request)
= reviewers_label(@merge_request)
......@@ -25836,6 +25836,42 @@ msgstr ""
msgid "Notify users by email when sign-in location is not recognized."
msgstr ""
msgid "Notify|%{author_link}'s issue %{issue_reference_link} is due soon."
msgstr ""
msgid "Notify|Author: %{author_name}"
msgstr ""
msgid "Notify|Issue was %{issue_status} by %{updated_by}"
msgstr ""
msgid "Notify|Issue was moved to another project."
msgstr ""
msgid "Notify|Merge request %{merge_request} can no longer be merged due to conflict."
msgstr ""
msgid "Notify|Merge request %{merge_request} was %{mr_status}"
msgstr ""
msgid "Notify|Merge request %{merge_request} was %{mr_status} by %{updated_by}"
msgstr ""
msgid "Notify|Merge request %{merge_request} was merged"
msgstr ""
msgid "Notify|Merge request URL: %{merge_request_url}"
msgstr ""
msgid "Notify|New issue: %{project_issue_url}"
msgstr ""
msgid "Notify|This issue is due on: %{issue_due_date}"
msgstr ""
msgid "Notify|You don't have access to the project."
msgstr ""
msgid "Nov"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment