diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-06 02:27:00 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-06 02:27:00 +0300 |
| commit | 7128814160cadf2324a5e6af464c41f89f98dc68 (patch) | |
| tree | 78ae2c7b4a106b6e64650badf81f573aa60d4813 /app | |
| parent | 0975b9c4bba4913b9908bc3d28d7b5868d616fc6 (diff) | |
| parent | 34b7b27802b7f8ba43f902e867b39d6e6977c5ec (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/email_rejection_mailer/rejection.html.haml | 2 | ||||
| -rw-r--r-- | app/views/email_rejection_mailer/rejection.text.haml | 2 |
2 files changed, 2 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' |