Skip to content

Fix: Outdated Links #5442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2025
Merged

Fix: Outdated Links #5442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions emails/templates/emails/first_forwarded_email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,12 +406,12 @@ <h1 style="margin-top: 0;text-align: left; word-wrap: break-word; font-size: 38p
<p
style="line-height: 140%;font-size: 14px; font-family: inter medium, system-ui, sans-serif; color: #0C0C0D;margin-top: 15px;">
<a style="color: #0C0C0D; text-decoration: none; font-weight: 600;"
href="https://www.mozilla.org/about/legal/terms/firefox-relay/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-legal-link"
href="https://www.mozilla.org/about/legal/terms/subscription-services/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-legal-link"
target="_blank" rel="noreferrer">{% ftlmsg 'first-time-user-email-footer-text-legal' %}
</a> •
<a
style="color: #0C0C0D; text-decoration: none; font-weight: 600;"
href="https://www.mozilla.org/privacy/firefox-relay/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-privacy-link"
href="https://www.mozilla.org/privacy/subscription-services/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-privacy-link"
target="_blank" rel="noreferrer">{% ftlmsg 'first-time-user-email-footer-text-privacy' %}</a>
</p>
</td>
Expand Down
2 changes: 1 addition & 1 deletion emails/templates/emails/first_time_user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ <h1 style="word-wrap: break-word; font-size: 22px;font-family: metropolis bold,
<img align="center" border="0" src="{{ SITE_ORIGIN }}/static/images/email-images/first-time-user/mozilla-logo.png" alt="" title="" style="height: auto; width: 100%;max-width: 146px; margin: 30px auto; display: block;" />
<p style="line-height: 140%;font-size: 14px; font-family: inter, system-ui, sans-serif; color: #0C0C0D;">149 New Montgomery St, 4th Floor, San Francisco, CA 94105</p>

<p style="line-height: 140%;font-size: 14px; font-family: inter medium, system-ui, sans-serif; color: #0C0C0D;margin-top: 15px;"><a style="color: #0C0C0D; text-decoration: none; font-weight: 600;" href="https://www.mozilla.org/about/legal/terms/firefox-relay/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-legal-link" target="_blank" rel="noreferrer">{% ftlmsg 'first-time-user-email-footer-text-legal' %}</a> • <a style="color: #0C0C0D; text-decoration: none; font-weight: 600;" href="https://www.mozilla.org/privacy/firefox-relay/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-privacy-link" target="_blank" rel="noreferrer">{% ftlmsg 'first-time-user-email-footer-text-privacy' %}</a></p>
<p style="line-height: 140%;font-size: 14px; font-family: inter medium, system-ui, sans-serif; color: #0C0C0D;margin-top: 15px;"><a style="color: #0C0C0D; text-decoration: none; font-weight: 600;" href="https://www.mozilla.org/about/legal/terms/subscription-services/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-legal-link" target="_blank" rel="noreferrer">{% ftlmsg 'first-time-user-email-footer-text-legal' %}</a> • <a style="color: #0C0C0D; text-decoration: none; font-weight: 600;" href="https://www.mozilla.org/privacy/subscription-services/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=footer-privacy-link" target="_blank" rel="noreferrer">{% ftlmsg 'first-time-user-email-footer-text-privacy' %}</a></p>
</td>
</tr>
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions emails/templates/emails/first_time_user.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ https://support.mozilla.org/products/relay
149 New Montgomery St, 4th Floor, San Francisco, CA 94105

{% ftlmsg 'first-time-user-email-footer-text-legal' %}
https://www.mozilla.org/about/legal/terms/firefox-relay/
https://www.mozilla.org/about/legal/terms/subscription-services/

{% ftlmsg 'first-time-user-email-footer-text-privacy' %}
https://www.mozilla.org/privacy/firefox-relay/{% endwithftl %}{% endcache %}
https://www.mozilla.org/privacy/subscription-services/{% endwithftl %}{% endcache %}
4 changes: 2 additions & 2 deletions frontend/src/components/layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export const Layout = (props: Props) => {
<ul className={styles.meta}>
<li>
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
>
Expand All @@ -259,7 +259,7 @@ export const Layout = (props: Props) => {
</li>
<li>
<a
href="https://www.mozilla.org/about/legal/terms/firefox-relay/"
href="https://www.mozilla.org/about/legal/terms/subscription-services/"
target="_blank"
rel="noopener noreferrer"
>
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/pages/faq.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ const Faq: NextPage = () => {
<Localized
id="phone-masking-faq-answer-data"
vars={{
url: "https://www.mozilla.org/privacy/firefox-relay/",
url: "https://www.mozilla.org/privacy/subscription-services/",
attrs: "",
}}
elems={{
a: (
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand Down Expand Up @@ -375,13 +375,13 @@ const Faq: NextPage = () => {
<Localized
id="faq-question-8-answer-3-html"
vars={{
url: "https://www.mozilla.org/privacy/firefox-relay/",
url: "https://www.mozilla.org/privacy/subscription-services/",
attrs: "",
}}
elems={{
a: (
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand All @@ -398,13 +398,13 @@ const Faq: NextPage = () => {
<Localized
id="faq-question-email-storage-answer"
vars={{
url: "https://www.mozilla.org/privacy/firefox-relay/",
url: "https://www.mozilla.org/privacy/subscription-services/",
attrs: "",
}}
elems={{
a: (
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand Down Expand Up @@ -458,13 +458,13 @@ const Faq: NextPage = () => {
<Localized
id="faq-question-acceptable-use-answer-b-html"
vars={{
url: "https://www.mozilla.org/about/legal/terms/firefox-relay/",
url: "https://www.mozilla.org/about/legal/terms/subscription-services/",
attrs: "",
}}
elems={{
a: (
<a
href="https://www.mozilla.org/about/legal/terms/firefox-relay/"
href="https://www.mozilla.org/about/legal/terms/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/phone/waitlist.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const PhoneWaitlist: NextPage = () => {
elems={{
a: (
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/premium/waitlist.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const PremiumWaitlist: NextPage = () => {
elems={{
a: (
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/vpn-relay/waitlist.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const BundleWaitlist: NextPage = () => {
elems={{
a: (
<a
href="https://www.mozilla.org/privacy/firefox-relay/"
href="https://www.mozilla.org/privacy/subscription-services/"
target="_blank"
rel="noopener noreferrer"
/>
Expand Down