Skip to content
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

Jump to bottom

Remove overdue obsolete strings #14822

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Remove overdue obsolete strings #14822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97157a2
removed obsolete strings for may/june/july 2024
reemhamz Jul 15, 2024
c3a8bd7
PR review fixes
reemhamz Jul 18, 2024
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
2 changes: 1 addition & 1 deletion bedrock/base/templates/includes/banners/consent-banner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="moz-consent-banner-content">
<h2 class="moz-consent-banner-heading">{{ ftl('consent-banner-heading') }}</h2>
<div class="moz-consent-banner-copy">
<p>{{ ftl('consent-banner-body-v2', fallback='consent-banner-body') }}</p>
<p>{{ ftl('consent-banner-body-v2') }}</p>
<div class="moz-consent-banner-controls">
<button type="button" id="moz-consent-banner-button-accept" class="moz-consent-banner-button moz-consent-banner-button-accept" data-testid="consent-banner-accept-button">
{{ ftl('consent-banner-button-accept') }}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/base/templates/macros.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ <h2 class="mzp-c-form-title">{{ form_title }}</h2>
{% if intro_text %}
{{ intro_text }}
{% else %}
{{ ftl('fxa-form-enter-your-email-v2', fallback='fxa-form-enter-your-email') }}
{{ ftl('fxa-form-enter-your-email-v2') }}
{% endif %}
</p>
</header>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/all-unified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ <h2 class="c-help-title">{{ ftl('firefox-all-msi-installers') }}</h2>
<li>
<h2 class="c-help-title">{{ ftl('firefox-all-arm64-installers') }}</h2>
<p class="c-help-desc">
{{ ftl('firefox-all-arm64-installers-optimized-v2', fallback='firefox-all-arm64-installers-optimized') }}
{{ ftl('firefox-all-arm64-installers-optimized-v2') }}
</p>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/developer/firstrun.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<section class="mzp-l-content mzp-t-content-md t-center">
<div class="mzp-c-logo mzp-t-logo-xl mzp-t-product-developer mzp-l-logo-center"></div>
<h1>
{{ ftl('firefox-developer-welcome-to-firefox-developer-edition', fallback='firefox-developer-welcome-to-firefox-browser') }}
{{ ftl('firefox-developer-welcome-to-firefox-developer-edition') }}
</h1>
</section>

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/developer/whatsnew-mdnplus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<section class="c-mdn-header mzp-t-dark">
<div class="mzp-l-content mzp-t-content-md c-mdn-header-content">
<div class="mzp-c-notification-bar mzp-t-success">
<p>{{ ftl('developer-mdnplus-congrats-you-now-have-latest-v2', fallback='developer-mdnplus-congrats-you-now-have-latest') }}</p>
<p>{{ ftl('developer-mdnplus-congrats-you-now-have-latest-v2') }}</p>
</div>

<h1 class="c-mdn-header-title">{{ ftl('developer-mdnplus-more-mdn-your-mdn') }}</h1>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/developer/whatsnew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<main class="mzp-t-dark">
<div class="mzp-l-content mzp-t-content-md t-center">
<div class="mzp-c-logo mzp-t-logo-xl mzp-t-product-developer mzp-l-logo-center"></div>
<h1>{{ ftl('firefox-developer-congrats-you-now-have-latest-v2', fallback='firefox-developer-congrats-you-now-have-latest') }}</h1>
<h1>{{ ftl('firefox-developer-congrats-you-now-have-latest-v2') }}</h1>
{% set attrs = 'href="' ~ url('firefox.notes', channel='aurora') ~ '"' %}
{% if LANG.startswith('en-') %}
<p>View the <a {{ attrs|safe }}>release notes</a> to see what’s new.</p>
Expand Down
6 changes: 3 additions & 3 deletions bedrock/firefox/templates/firefox/features/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ <h3 class="c-feature-item-title">{{ title }}</h3>
<div class="mzp-l-content">
<div class="mzp-l-card-half">
{{ card (
title=ftl('features-index-firefox-keeps-getting-faster', fallback='features-index-is-firefox-a-fast-browser'),
title=ftl('features-index-firefox-keeps-getting-faster'),
ga_title="Firefox keeps getting faster",
aspect_ratio="mzp-has-aspect-16-9",
desc=ftl('features-index-the-latest-browser-speed-benchmarks', fallback='features-index-firefox-uses-less-memory-than'),
desc=ftl('features-index-the-latest-browser-speed-benchmarks'),
image=resp_img(
url="img/firefox/features/fast.png",
srcset={
Expand Down Expand Up @@ -164,7 +164,7 @@ <h3 class="c-feature-item-title">{{ title }}</h3>
link=url('firefox.features.translate'),
title=ftl('features-index-translate-the-web'),
ga_title="Translate the Web",
desc=ftl('features-index-translate-websites-to-your', fallback='features-index-translate-more-than'),
desc=ftl('features-index-translate-websites-to-your'),
) }}

{{ feature_item(
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/features/password-manager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p>{{ ftl('password-manager-firefox-securely-stores-your') }}</p>

{% set fxa = 'href="%s"'|safe|format(url('mozorg.account')) %}
<p>{{ ftl('password-manager-with-a-free-mozilla-account-v2', fallback='password-manager-with-a-free-firefox-account', fxa=fxa) }}</p>
<p>{{ ftl('password-manager-with-a-free-mozilla-account-v2', fxa=fxa) }}</p>

<h2>{{ ftl('password-manager-password-autofill-for-easy-logins') }}</h2>
<p>{{ ftl('password-manager-firefox-can-automatically-fill-in') }}</p>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/features/pdf-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% extends "firefox/features/base-article.html" %}

{% block article_title_short %}{{ ftl('pdf-editor-pdf-editor') }}{% endblock %}
{% block article_title %}{{ ftl('pdf-editor-add-text-to-pdfs-v2', fallback='pdf-editor-add-text-to-pdfs') }}{% endblock %}
{% block article_title %}{{ ftl('pdf-editor-add-text-to-pdfs-v2') }}{% endblock %}
{% block page_desc %}{{ ftl('pdf-editor-view-and-edit-pdf-files-right-in') }}{% endblock %}

{% block article_content %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/features/private-browsing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p>{{ ftl('features-private-browsing-if-you-share-a-computer') }}</p>

<h2>{{ ftl('features-private-browsing-what-does-private-browsing-do') }}</h2>
<p>{{ ftl('features-private-browsing-private-browsing-mode-opens-v2', fallback='features-private-browsing-private-browsing-mode-opens') }}</p>
<p>{{ ftl('features-private-browsing-private-browsing-mode-opens-v2') }}</p>

<figure class="c-article-figure">
{{ resp_img(
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/features/sync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p>{{ ftl('features-sync-with-firefox-you-can-pick-up-where') }}</p>

{% set fxa = 'href="%s"'|safe|format(url('mozorg.account')) %}
<p>{{ ftl('features-sync-sign-up-for-a-free-mozilla-account-v3', fallback='features-sync-sign-up-for-a-free-firefox-account', fxa=fxa) }}</p>
<p>{{ ftl('features-sync-sign-up-for-a-free-mozilla-account-v3', fxa=fxa) }}</p>

<figure class="c-article-figure">
{{ resp_img(
Expand Down
4 changes: 2 additions & 2 deletions bedrock/firefox/templates/firefox/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
{% if ftl_has_messages('firefox-browsers-main-heading') %}
<h1>{{ ftl('firefox-browsers-main-heading') }}</h1>
<h2 class="mzp-has-zap-11">
{{ ftl('firefox-browsers-get-the-browsers-strong-v2', fallback='firefox-browsers-get-the-browsers-strong') }}
{{ ftl('firefox-browsers-get-the-browsers-strong-v2') }}
</h2>
{% else %}
<h1 class="mzp-has-zap-11">
{{ ftl('firefox-browsers-get-the-browsers-strong-v2', fallback='firefox-browsers-get-the-browsers-strong') }}
{{ ftl('firefox-browsers-get-the-browsers-strong-v2') }}
</h1>
{% endif %}
</header>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/installer-help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h1 class="mzp-c-callout-title">{{ ftl('installer-help-page-title') }}</h1>
<img src="{{ static('protocol/img/logos/firefox/browser/logo-word-hor.svg') }}" alt="{{ ftl('installer-help-firefox-release-title') }}" width="347" height="64" class="mzp-c-card-image">
<div class="mzp-c-card-content">
<p class="mzp-c-card-desc">
{{ ftl('installer-help-firefox-release-desc-v2', fallback='installer-help-firefox-release-desc', trackers=2000) }}
{{ ftl('installer-help-firefox-release-desc-v2', trackers=2000) }}
</p>
{{ download_firefox(platform='desktop', force_direct=True, force_full_installer=True, locale=installer_lang, button_class='mzp-t-secondary mzp-t-md', alt_copy=ftl('download-button-download-now')) }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/desktop/download.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-facebook-container')
<h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-sync-your-devices') }}</h3>
{% set available_attrs = fxa_link_fragment(entrypoint='mozilla.org-firefox-desktop') %}

<p>{{ ftl('firefox-desktop-download-firefox-is-available-v2', fallback='firefox-desktop-download-firefox-is-available', attrs=available_attrs) }}</p>
<p>{{ ftl('firefox-desktop-download-firefox-is-available-v2', attrs=available_attrs) }}</p>
</div>

<div class="mzp-c-card js-animate">
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/nightly/whatsnew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h4 class="mzp-c-callout-title">¿Quieres ayudar en España?</h4>

<p>{{ ftl('nightly-whatsnew-this-is-a-good') }}</p>

<p>{{ ftl('nightly-whatsnew-if-you-want-to-v3', blog='href="https://blog.nightly.mozilla.org/"', twitter='href="https://twitter.com/FirefoxNightly"', mastodon='href="https://mozilla.social/@FirefoxNightly"', fallback='nightly-whatsnew-if-you-want-to-v2') }}</p>
<p>{{ ftl('nightly-whatsnew-if-you-want-to-v3', blog='href="https://blog.nightly.mozilla.org/"', twitter='href="https://twitter.com/FirefoxNightly"', mastodon='href="https://mozilla.social/@FirefoxNightly"') }}</p>

<p>
{% set attrs = 'href="#" class="nightly-experiments-link"' %}
Expand Down
4 changes: 2 additions & 2 deletions bedrock/firefox/templates/firefox/set-as-default/thanks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ <h2 class="thanks-extra-links-heading">

<section class="thanks-extra-links-item join">
<h2 class="thanks-extra-links-heading">
{{ ftl('set-as-default-create-an-account', fallback='set-as-default-thanks-join-firefox') }}
{{ ftl('set-as-default-create-an-account') }}
</h2>
<p>{{ ftl('set-as-default-thanks-sign-up-for-a-free-account-v2', fallback='set-as-default-thanks-sign-up-for-a-free-account') }}</p>
<p>{{ ftl('set-as-default-thanks-sign-up-for-a-free-account-v2') }}</p>
<a href="{{ url('mozorg.account') }}">{{ ftl('set-as-default-thanks-get-an-account') }}</a>
</section>

Expand Down
8 changes: 1 addition & 7 deletions bedrock/firefox/templates/firefox/whatsnew/includes/release-notes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,5 @@
<aside class="mzp-l-content c-utilities">
{% set releasenotes_url = url('firefox.releases.index') if not version else '/firefox/%s/releasenotes/'|format(version) %}
{% set releasenotes_link = 'href="%s" target="_blank"'|safe|format(releasenotes_url) %}

{% if ftl_has_messages('whatsnew-release-notes-v2') %}
<p>{{ ftl('whatsnew-release-notes-v2', url=releasenotes_link) }}</p>
{% else %}
<p>{{ ftl('whatsnew-release-notes', url=releasenotes_url) }}</p>
{% endif %}

<p>{{ ftl('whatsnew-release-notes-v2', url=releasenotes_link) }}</p>
</aside>
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/index-thanks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}
{% block page_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% from "macros-protocol.html" import split with context %}
{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% from "macros-protocol.html" import split with context %}
{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}
{% block page_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}

{% block page_css %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Comment on lines 9 to 14
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be easier to manage if all these titles + descriptions from all the wnp templates were moved to whatsnew/base?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw Craig's suggestion --
@craigcook is this still something you're hoping to work on?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly I forgot about that almost as soon as I posted it... but we've been talking about redoing the base WNP templates for some time and it just keeps getting put off for other work. I do think at the very least we can add the title string to the base file, that doesn't have to wait. If you want to do it as part of this PR that seems sensible.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will be doing some light housekeeping in wnps, welcomes and subnavs soon~ish, so you can leave it like this and i'll pick it up later, possibly together with the v1 nav obsoletes…

(Just wanted to confirm it'd be a welcome change…)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be a welcome change, thanks Jan!

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}
{% block page_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}

{% block page_css %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Expand Down
3 changes: 1 addition & 2 deletions bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Expand Down Expand Up @@ -112,4 +112,3 @@ <h1 class="wnp-main-title">{{ main_title }}</h1>
</section>

{% endblock %}

2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{% extends "firefox/whatsnew/base.html" %}

{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %}
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}

{#- This will appear as <meta property="og:description"> which can be used for social share -#}
{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/mozorg/templates/mozorg/about/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h1 class="c-page-title">{{ ftl('about-our-mission-in-action') }}</h1>
)}}
{{ card(
class='mzp-c-card-medium',
title=ftl('about-talking-tech-issues-irl', fallback='about-talking-internet-issues-irl'),
title=ftl('about-talking-tech-issues-irl'),
ga_title='Talking Internet Issues IRL',
desc=ftl('about-in-mozillas-multi-award-winning', fallback='about-in-mozillas-irl-podcast-host'),
reemhamz marked this conversation as resolved.
Show resolved Hide resolved
image=resp_img('img/mozorg/about/irl.png', srcset={"img/mozorg/about/irl-high-res.png": "2x"}, optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
Expand Down
4 changes: 2 additions & 2 deletions bedrock/mozorg/templates/mozorg/about/manifesto.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h2 class="addendum-subtitle">{{ ftl('manifesto-pledge-for-a-healthy-internet')
) %}
<p>
<a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-type="social share" data-link-text="X (formerly Twitter)" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">
{{ ftl('manifesto-share-on-x', fallback='manifesto-share-on-twitter') }}
{{ ftl('manifesto-share-on-x') }}
</a>
</p>
{% endcall %}
Expand Down Expand Up @@ -131,7 +131,7 @@ <h3 class="principle-number">{{ principle_number_10 }}</h3>
</li>
</ol>
<footer class="content principles-foot">
<p><a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-type="social share" data-link-text="Twitter" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">{{ ftl('manifesto-share-on-x', fallback='manifesto-share-on-twitter') }}</a></p>
<p><a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-type="social share" data-link-text="Twitter" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">{{ ftl('manifesto-share-on-x') }}</a></p>
<p><a class="mzp-c-cta-link" href="{{ url('mozorg.about.manifesto-details') }}">{{ ftl('manifesto-read-the-entire-manifesto') }}</a></p>
</footer>
</section>
Expand Down
8 changes: 4 additions & 4 deletions bedrock/mozorg/templates/mozorg/account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
{% set _entrypoint = 'mozilla.org-firefox-accounts' %}
{% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=account' %}

{% block page_title %}{{ ftl('mozilla-accounts-get-a-mozilla-account', fallback='firefox-accounts-get-a-firefox-account') }}{% endblock %}
{% block page_title %}{{ ftl('mozilla-accounts-get-a-mozilla-account') }}{% endblock %}

{% block page_desc %}{{ ftl('mozilla-accounts-securely-sync-your', fallback='firefox-accounts-securely-sync-your') }}{% endblock %}
{% block page_desc %}{{ ftl('mozilla-accounts-securely-sync-your') }}{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-emphasis-box') }}
Expand Down Expand Up @@ -53,15 +53,15 @@
</div>

<div class="c-manage">
<p>{{ ftl('mozilla-accounts-already', fallback='firefox-accounts-already') }}</p>
<p>{{ ftl('mozilla-accounts-already') }}</p>
<a href="https://accounts.firefox.com/settings" id="manage" data-testid="manage-account-link">{{ ftl('firefox-accounts-manage') }}</a>
</div>
</div>
</div>
<div class="mzp-c-split-body">
<h1 class="accounts-header">{{ ftl('mozilla-account-header') }}</h1>
<div class="accounts-products">
<h2>{{ ftl('mozilla-account-sign-in-to', fallback='firefox-accounts-sign-in-to') }}</h2>
<h2>{{ ftl('mozilla-account-sign-in-to') }}</h2>

<a href="{{ url('firefox') }}"><h4 class="mzp-c-wordmark mzp-t-wordmark-sm mzp-t-product-firefox">{{ ftl('firefox-accounts-firefox-browser') }}</h4></a>
<ul class="mzp-u-list-styled">
Expand Down
10 changes: 5 additions & 5 deletions bedrock/mozorg/templates/mozorg/home/home-new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h1>{{ ftl('home-mission-driven') }}</h1>
<blockquote>
<p>{{ ftl('home-the-health-of') }}
</p>
<cite>{{ ftl('home-mitchell-baker-v2', fallback="home-mitchell-baker") }}</cite>
<cite>{{ ftl('home-mitchell-baker-v2') }}</cite>
</blockquote>
</div>
</div>
Expand Down Expand Up @@ -182,7 +182,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
<!-- Relay -->
{% call picto(
base_el='li',
title=ftl('home-product-relay-hide-your', fallback='home-product-relay-masks'),
title=ftl('home-product-relay-hide-your'),
image=resp_img(
url='protocol/img/logos/firefox/relay/logo-white.svg',
optional_attributes={
Expand Down Expand Up @@ -218,7 +218,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
<!-- Monitor -->
{% call picto(
base_el='li',
title=ftl('home-product-monitor-protect-your', fallback='home-product-monitor-data'),
title=ftl('home-product-monitor-protect-your'),
image=resp_img(
url='protocol/img/logos/firefox/monitor/logo.svg',
optional_attributes={
Expand Down Expand Up @@ -289,8 +289,8 @@ <h2>{{ ftl('home-join-us-in-shaping') }}</h2>
),
media_after=False
) %}
<h2>{{ ftl('home-so-what-is-mozilla', fallback='home-is-mozilla-a-corporation')}}</h2>
<p>{{ ftl('home-at-its-core', fallback='home-mozilla-consists-of', ventures=moz_ventures, mozai=moz_ai) }}</p>
<h2>{{ ftl('home-so-what-is-mozilla') }}</h2>
<p>{{ ftl('home-at-its-core', ventures=moz_ventures, mozai=moz_ai) }}</p>
<a href="https://foundation.mozilla.org/{{ utm_params }}" rel="external noopener" class="mzp-c-button">
{{ ftl('home-learn-about-mofo') }}
</a>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/newsletter/templates/newsletter/includes/newsletter-strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
},
"mozilla-accounts": {
"description": "{{ ftl('newsletters-get-tips-from-mozilla')|striptags }}",
"title": "{{ ftl('newsletters-mozilla-accounts', fallback='newsletters-firefox-accounts')|striptags }}"
"title": "{{ ftl('newsletters-mozilla-accounts')|striptags }}"
},
"mozilla-and-you": {
"description": "{{ ftl('newsletters-get-how-tos')|striptags }}",
Expand Down
Loading