kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'gt-externalize-app-views-email_rejection_mailer' into 'master' 

Externalize strings from `/app/views/email_rejection_mailer`

See merge request gitlab-org/gitlab-ce!24869
This commit is contained in:
Filipa Lacerda 2019-02-05 23:27:00 +00:00
parent 0975b9c4bb 34b7b27802
commit 7128814160
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/email_rejection_mailer/rejection.html.haml
View File

@ -1,5 +1,5 @@
%p %p
Unfortunately, your email message to GitLab could not be processed. = _("Unfortunately, your email message to GitLab could not be processed.")
= markdown @reason = markdown @reason
= render_if_exists 'shared/additional_email_text' = render_if_exists 'shared/additional_email_text'

2
app/views/email_rejection_mailer/rejection.text.haml
View File

@ -1,4 +1,4 @@
Unfortunately, your email message to GitLab could not be processed. = _("Unfortunately, your email message to GitLab could not be processed.")
\ \
= @reason = @reason
= render_if_exists 'shared/additional_email_text' = render_if_exists 'shared/additional_email_text'

5
changelogs/unreleased/gt-externalize-app-views-email_rejection_mailer.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Externalize strings from `/app/views/email_rejection_mailer`
merge_request: 24869
author: George Tsiolis
type: other

3
locale/gitlab.pot
View File

@ -7683,6 +7683,9 @@ msgstr ""
msgid "Undo" msgid "Undo"
msgstr "" msgstr ""
msgid "Unfortunately, your email message to GitLab could not be processed."
msgstr ""
msgid "Unlock" msgid "Unlock"
msgstr "" msgstr ""