From 34b7b27802b7f8ba43f902e867b39d6e6977c5ec Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Fri, 1 Feb 2019 16:52:38 +0200 Subject: [PATCH] Externalize strings from `/app/views/email_rejection_mailer` --- app/views/email_rejection_mailer/rejection.html.haml | 2 +- app/views/email_rejection_mailer/rejection.text.haml | 2 +- .../gt-externalize-app-views-email_rejection_mailer.yml | 5 +++++ locale/gitlab.pot | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/gt-externalize-app-views-email_rejection_mailer.yml 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 ""