From 9aaead6bf01a3d7e14ecfc7ffe23b4f85bcd53a9 Mon Sep 17 00:00:00 2001
From: Panos Kanellidis <pkanellidis@gitlab.com>
Date: Tue, 17 Dec 2024 14:16:46 +0000
Subject: [PATCH] Fix variable literal
Changelog: other
EE: true
---
ee/app/views/notify/pipl_compliance_notification.html.haml | 2 +-
ee/app/views/notify/pipl_compliance_notification.text.erb | 2 +-
ee/spec/mailers/ee/emails/profile_spec.rb | 4 ++++
locale/gitlab.pot | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ee/app/views/notify/pipl_compliance_notification.html.haml b/ee/app/views/notify/pipl_compliance_notification.html.haml
index 4e8b0be96381e..873fce714337b 100644
--- a/ee/app/views/notify/pipl_compliance_notification.html.haml
+++ b/ee/app/views/notify/pipl_compliance_notification.html.haml
@@ -1,5 +1,5 @@
%p
- = s_('PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact ${email}.').html_safe % { jihu_link: link_to('https://gitlab.cn/saasmigration/', 'https://gitlab.cn/saasmigration/', target: '_blank', rel: 'noopener noreferrer'), deadline: @deadline, email: link_to('saasmigration@gitlab.cn', 'mailto:saasmigration@gitlab.cn') }
+ = s_('PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact %{email}.').html_safe % { jihu_link: link_to('https://gitlab.cn/saasmigration/', 'https://gitlab.cn/saasmigration/', target: '_blank', rel: 'noopener noreferrer'), deadline: @deadline, email: link_to('saasmigration@gitlab.cn', 'mailto:saasmigration@gitlab.cn') }
= s_('Best Regards,')
= s_('GitLab Team')
diff --git a/ee/app/views/notify/pipl_compliance_notification.text.erb b/ee/app/views/notify/pipl_compliance_notification.text.erb
index a8a382fbb6d45..fc4730e002dfb 100644
--- a/ee/app/views/notify/pipl_compliance_notification.text.erb
+++ b/ee/app/views/notify/pipl_compliance_notification.text.erb
@@ -1,4 +1,4 @@
-<%= s_('PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact ${email}.').html_safe % { jihu_link: link_to('https://gitlab.cn/saasmigration/', 'https://gitlab.cn/saasmigration/', target: '_blank', rel: 'noopener noreferrer'), deadline: @deadline, email: link_to('saasmigration@gitlab.cn', 'mailto:saasmigration@gitlab.cn') } %>
+<%= s_('PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact %{email}.').html_safe % { jihu_link: link_to('https://gitlab.cn/saasmigration/', 'https://gitlab.cn/saasmigration/', target: '_blank', rel: 'noopener noreferrer'), deadline: @deadline, email: link_to('saasmigration@gitlab.cn', 'mailto:saasmigration@gitlab.cn') } %>
<%= s_('Best Regards,') %>
<%= s_('GitLab Team') %>
diff --git a/ee/spec/mailers/ee/emails/profile_spec.rb b/ee/spec/mailers/ee/emails/profile_spec.rb
index 46322742de367..ecc192c0da19c 100644
--- a/ee/spec/mailers/ee/emails/profile_spec.rb
+++ b/ee/spec/mailers/ee/emails/profile_spec.rb
@@ -49,6 +49,10 @@
is_expected.to have_body_text('https://gitlab.cn/saasmigration/')
end
+ it 'includes the contact email' do
+ is_expected.to have_body_text('saasmigration@gitlab.cn')
+ end
+
it 'includes the correctly formatted date' do
is_expected.to have_body_text(pipl_user.pipl_access_end_date.strftime('%d-%m-%Y').to_s)
end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4f36ec83756b4..cef772a66a82c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -39176,7 +39176,7 @@ msgstr ""
msgid "PIPL|Important Change to Your GitLab.com Account"
msgstr ""
-msgid "PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact ${email}."
+msgid "PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact %{email}."
msgstr ""
msgid "PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to transition your GitLab.com account from GitLab to %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has exclusive rights to provide GitLab to individuals and organizations located in this region. You have %{deadline} days to complete the transition, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact %{email}."
--
GitLab