summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2019-02-01 16:52:38 +0200
committerGeorge Tsiolis <tsiolis.g@gmail.com>2019-02-05 10:43:42 +0200
commit34b7b27802b7f8ba43f902e867b39d6e6977c5ec (patch)
tree9dcec118e3e2a2f341f9ca4c1ae747e1badb23ba
parent74abc7750357c5e5bef4962abd2bf3f5da39b752 (diff)
downloadgitlab-ce-34b7b27802b7f8ba43f902e867b39d6e6977c5ec.tar.gz
Externalize strings from `/app/views/email_rejection_mailer`
-rw-r--r--app/views/email_rejection_mailer/rejection.html.haml2
-rw-r--r--app/views/email_rejection_mailer/rejection.text.haml2
-rw-r--r--changelogs/unreleased/gt-externalize-app-views-email_rejection_mailer.yml5
-rw-r--r--locale/gitlab.pot3
4 files changed, 10 insertions, 2 deletions
diff --git a/app/views/email_rejection_mailer/rejection.html.haml b/app/views/email_rejection_mailer/rejection.html.haml
index c4ae7befe4e..666dab61f40 100644
--- a/app/views/email_rejection_mailer/rejection.html.haml
+++ b/app/views/email_rejection_mailer/rejection.html.haml
@@ -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'
diff --git a/app/views/email_rejection_mailer/rejection.text.haml b/app/views/email_rejection_mailer/rejection.text.haml
index 0e13b2a6473..8d940ef1293 100644
--- a/app/views/email_rejection_mailer/rejection.text.haml
+++ b/app/views/email_rejection_mailer/rejection.text.haml
@@ -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'
diff --git a/changelogs/unreleased/gt-externalize-app-views-email_rejection_mailer.yml b/changelogs/unreleased/gt-externalize-app-views-email_rejection_mailer.yml
new file mode 100644
index 00000000000..8f6fbdceb54
--- /dev/null
+++ b/changelogs/unreleased/gt-externalize-app-views-email_rejection_mailer.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize strings from `/app/views/email_rejection_mailer`
+merge_request: 24869
+author: George Tsiolis
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 06caccae59f..3ef7779433b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7677,6 +7677,9 @@ msgstr ""
msgid "Undo"
msgstr ""
+msgid "Unfortunately, your email message to GitLab could not be processed."
+msgstr ""
+
msgid "Unlock"
msgstr ""