From fb8754dab6ae145550eb79c2519571d33b356395 Mon Sep 17 00:00:00 2001 From: Tao Wang Date: Thu, 14 Jun 2018 13:57:32 +1000 Subject: [PATCH] i18n: externalize strings from 'app/views/repository_check_mailer' Signed-off-by: Tao Wang --- app/views/repository_check_mailer/notify.html.haml | 4 ++-- app/views/repository_check_mailer/notify.text.haml | 5 ++--- locale/gitlab.pot | 9 +++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/views/repository_check_mailer/notify.html.haml b/app/views/repository_check_mailer/notify.html.haml index 67b292c308fa48..2493d00983cc44 100644 --- a/app/views/repository_check_mailer/notify.html.haml +++ b/app/views/repository_check_mailer/notify.html.haml @@ -2,10 +2,10 @@ #{@message}. %p - = link_to "See the affected projects in the GitLab admin panel", admin_projects_url(last_repository_check_failed: 1) + = link_to _("See the affected projects in the GitLab admin panel"), admin_projects_url(last_repository_check_failed: 1) %p - You are receiving this message because you are a GitLab administrator for #{Gitlab.config.gitlab.url}. + = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url } -# EE-specific start - if Gitlab::CurrentSettings.email_additional_text.present? diff --git a/app/views/repository_check_mailer/notify.text.haml b/app/views/repository_check_mailer/notify.text.haml index fdb6bf77fbb2f8..fbb261fa8149b5 100644 --- a/app/views/repository_check_mailer/notify.text.haml +++ b/app/views/repository_check_mailer/notify.text.haml @@ -1,9 +1,8 @@ #{@message}. \ -View details: #{admin_projects_url(last_repository_check_failed: 1)} +#{_("View details")}: #{admin_projects_url(last_repository_check_failed: 1)} -You are receiving this message because you are a GitLab administrator -for #{Gitlab.config.gitlab.url}. += _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url } -# EE-specific start - if Gitlab::CurrentSettings.email_additional_text.present? diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5..53cec17206a4a8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6124,6 +6124,9 @@ msgstr "" msgid "SecurityDashboard|Pipeline %{pipelineLink} triggered" msgstr "" +msgid "See the affected projects in the GitLab admin panel" +msgstr "" + msgid "Select" msgstr "" @@ -7461,6 +7464,9 @@ msgstr "" msgid "Verified" msgstr "" +msgid "View details" +msgstr "" + msgid "View epics list" msgstr "" @@ -7725,6 +7731,9 @@ msgstr "" msgid "You are on a secondary, read-only Geo node. If you want to make changes, you must visit this page on the %{primary_node}." msgstr "" +msgid "You are receiving this message because you are a GitLab administrator for %{url}." +msgstr "" + msgid "You can %{linkStart}view the blob%{linkEnd} instead." msgstr "" -- GitLab