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'

Browse source 
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
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
Unfortunately, your email message to GitLab could not be processed.
= _("Unfortunately, your email message to GitLab could not be processed.")
= markdown @reason
= 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
= 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"
msgstr ""
msgid "Unfortunately, your email message to GitLab could not be processed."
msgstr ""
msgid "Unlock"
msgstr ""