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.

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

More string fixes for Linux download buttons #14174

Merged
merged 1 commit into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
{% elif plat.os == 'ios' %}
{{ ftl('download-button-firefox-ios') }}
{% elif plat.os == 'linux' %}
{{ ftl('download-button-linux-32') }}
{{ ftl('download-button-linux-32-v2') }}
{% elif plat.os == 'linux64' %}
{{ ftl('download-button-linux-64') }}
{{ ftl('download-button-linux-64-v2') }}
{% else %}
{% if channel == 'beta' %}
{{ ftl('download-button-firefox-beta') }}
Expand Down
4 changes: 2 additions & 2 deletions bedrock/firefox/templates/firefox/includes/macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
<div class="firefox-platform-button">
<a class="download-link os_linux mzp-t-xl mzp-c-button mzp-t-product ga-product-download" id="{{ id }}" href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux&lang={{ LANG }}" data-link-type="download" data-display-name="Linux 32-bit" data-download-version="linux" data-download-os="Desktop" data-download-location="{{ position }}">
<strong class="download-title">
{{ ftl('download-button-linux-32') }}
{{ ftl('download-button-linux-32-v2') }}
</strong>
</a>

<a class="download-link os_linux64 mzp-t-xl mzp-c-button mzp-t-product ga-product-download" id="{{ id }}-64" href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux64&lang={{ LANG }}" data-link-type="download" data-display-name="Linux 64-bit" data-download-version="linux64" data-download-os="Desktop" data-download-location="{{ position }}">
<strong class="download-title">
{{ ftl('download-button-linux-64') }}
{{ ftl('download-button-linux-64-v2') }}
</strong>
</a>

Expand Down
4 changes: 2 additions & 2 deletions bedrock/firefox/templates/firefox/new/basic/thanks.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ <h1 class="mzp-c-call-out-title show-unknown">{{ ftl('firefox-new-download-inter
<div class="show-linux">
<div class="c-linux-button-group">
<a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux&lang={{ LANG }}"
class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-32') }}</a>
class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-32-v2') }}</a>
<a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux64&lang={{ LANG }}"
class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-64') }}</a>
class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-64-v2') }}</a>
</div>
{% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener"
data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}
Expand Down
4 changes: 2 additions & 2 deletions bedrock/firefox/templates/firefox/new/desktop/thanks.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ <h1 class="c-section-title show-unknown">{{ ftl('firefox-desktop-download-interr
</p>
<div class="show-linux">
<div class="c-linux-button-group">
<a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux&lang={{ LANG }}" class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-32') }}</a>
<a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux64&lang={{ LANG }}" class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-64') }}</a>
<a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux&lang={{ LANG }}" class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-32-v2') }}</a>
<a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux64&lang={{ LANG }}" class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-64-v2') }}</a>
</div>
{% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}
<p class="linux-deb-text">{{ ftl('download-button-using-debian', attrs=attrs) }}</p>
Expand Down
10 changes: 8 additions & 2 deletions l10n/en/download_button.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,14 @@ download-a-different-build = Download a different build

## Linux

download-button-linux-32 = Download for Linux 32-bit
download-button-linux-64 = Download for Linux 64-bit
# Obsolete string
download-button-linux-32 = Download { -brand-name-linux } 32-bit

# Obsolete string
download-button-linux-64 = Download { -brand-name-linux } 64-bit

download-button-linux-32-v2 = Download for Linux 32-bit
download-button-linux-64-v2 = Download for Linux 64-bit

# Variables
# $attrs (attrs) - link to https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions
Expand Down
Loading