diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-05 23:27:00 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-05 23:27:00 +0000 |
| commit | 7128814160cadf2324a5e6af464c41f89f98dc68 (patch) | |
| tree | 78ae2c7b4a106b6e64650badf81f573aa60d4813 | |
| parent | 0975b9c4bba4913b9908bc3d28d7b5868d616fc6 (diff) | |
| parent | 34b7b27802b7f8ba43f902e867b39d6e6977c5ec (diff) | |
| download | gitlab-ce-7128814160cadf2324a5e6af464c41f89f98dc68.tar.gz | |
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
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 24ca8744414..6687cdd5feb 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7683,6 +7683,9 @@ msgstr "" msgid "Undo" msgstr "" +msgid "Unfortunately, your email message to GitLab could not be processed." +msgstr "" + msgid "Unlock" msgstr "" |