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

Bug 1330000 - Rename 'OS X' to 'macOS' on download pages / buttons #4603

Merged
merged 1 commit into from Feb 6, 2017
Merged

Bug 1330000 - Rename 'OS X' to 'macOS' on download pages / buttons #4603

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bedrock/firefox/firefox_details.py
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ class FirefoxDesktop(_ProductDetails):
('winsha1', 'Windows (XP/Vista)'),
('win', 'Windows'),
('win64', 'Windows 64-bit'),
('osx', 'OS X'),
('osx', 'macOS'),
('linux', 'Linux'),
('linux64', 'Linux 64-bit'),
])
Expand Down
8 changes: 5 additions & 3 deletions bedrock/firefox/templates/firefox/dnt.html
View file
Open in desktop
Expand Up @@ -151,9 +151,11 @@ <h3 data-accordion-role="tab">{{ _('How do I enable Do Not Track in Firefox?') }
</p>
<noscript>
<p>
{% trans %}
On Mac OS X, go to Firefox &gt; Preferences… &gt; Privacy. On Linux, go to Edit &gt; Preferences &gt; Privacy.
{% endtrans %}
{% if l10n_has_tag('macos_branding') %}
{{ _('On macOS, go to Firefox &gt; Preferences… &gt; Privacy. On Linux, go to Edit &gt; Preferences &gt; Privacy.') }}
{% else %}
{{ _('On OS X, go to Firefox &gt; Preferences… &gt; Privacy. On Linux, go to Edit &gt; Preferences &gt; Privacy.') }}
{% endif %}
</p>
</noscript>
<p>
Expand Down
8 changes: 7 additions & 1 deletion bedrock/firefox/templates/firefox/new/base.html
View file
Open in desktop
Expand Up @@ -10,7 +10,13 @@

{% block page_title_prefix %}{{_('Download Firefox')}} — {% endblock %}
{% block page_title %}{{_('Free Web Browser')}}{% endblock %}
{% block page_desc %}{{_('Download Mozilla Firefox, a free Web browser. Firefox is created by a global non-profit dedicated to putting individuals in control online. Get Firefox for Windows, Mac OS X, Linux, Android and iOS today!')}}{% endblock %}
{% block page_desc %}
{% if l10n_has_tag('macos_branding') %}
{{ _('Download Mozilla Firefox, a free Web browser. Firefox is created by a global non-profit dedicated to putting individuals in control online. Get Firefox for Windows, macOS, Linux, Android and iOS today!') }}
{% else %}
{{ _('Download Mozilla Firefox, a free Web browser. Firefox is created by a global non-profit dedicated to putting individuals in control online. Get Firefox for Windows, OS X, Linux, Android and iOS today!') }}
{% endif %}
{% endblock %}

{#- This will appear as <meta property="og:title"> which can be used for social share -#}
{% block page_og_title %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/onboarding/scene1.html
View file
Open in desktop
Expand Up @@ -134,7 +134,7 @@ <h4>{{_('Firefox for other platforms') }}</h4>
<section class="section-current-platform">
{# L10n: span's below are for visual formatting and line break. #}
<h4 class="heading-windows">{{_('Download Firefox <span>for Windows</span>') }}</h4>
<h4 class="heading-osx">{{_('Download Firefox <span>for OSX</span>') }}</h4>
<h4 class="heading-osx">{{_('Download Firefox <span>for macOS</span>') }}</h4>
<h4 class="heading-linux">{{_('Download Firefox <span>for Linux</span>') }}</h4>

{{ download_firefox(dom_id='download-other-platforms-modal', alt_copy=_('Free Download')) }}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/scene1.html
View file
Open in desktop
Expand Up @@ -141,7 +141,7 @@ <h4>{{_('Firefox for other platforms') }}</h4>
<section class="section-current-platform">
{# L10n: span's below are for visual formatting and line break. #}
<h4 class="heading-windows">{{_('Download Firefox <span>for Windows</span>') }}</h4>
<h4 class="heading-osx">{{_('Download Firefox <span>for OS X</span>') }}</h4>
<h4 class="heading-osx">{{_('Download Firefox <span>for macOS</span>') }}</h4>
<h4 class="heading-linux">{{_('Download Firefox <span>for Linux</span>') }}</h4>

{{ download_firefox(dom_id='download-other-platforms-modal', alt_copy=_('Free Download')) }}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/thunderbird/details.py
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ class ThunderbirdDesktop(ProductDetails):
platform_labels = OrderedDict([
('winsha1', 'Windows (XP/Vista)'),
('win', 'Windows'),
('osx', 'OS X'),
('osx', 'macOS'),
('linux', 'Linux'),
('linux64', 'Linux 64-bit'),
])
Expand Down
8 changes: 7 additions & 1 deletion bedrock/thunderbird/templates/thunderbird/features.html
View file
Open in desktop
Expand Up @@ -223,7 +223,13 @@ <h3>{{ _('Phishing Protection') }}</h3>
<div class="col">
<section>
<h3>{{ _('Automated Update') }}</h3>
<p>{{ _('Thunderbird’s update system checks to see if you’re running the latest version, and notifies you when a security update is available. These security updates are small (usually 200KB - 700KB), giving you only what you need and making the security update quick to download and install. The automated update system provides updates for Thunderbird on Windows, Mac OS X, and Linux in over 40 different languages.') }}</p>
<p>
{% if l10n_has_tag('macos_branding') %}
{{ _('Thunderbird’s update system checks to see if you’re running the latest version, and notifies you when a security update is available. These security updates are small (usually 200KB - 700KB), giving you only what you need and making the security update quick to download and install. The automated update system provides updates for Thunderbird on Windows, macOS, and Linux in over 40 different languages.') }}
{% else %}
{{ _('Thunderbird’s update system checks to see if you’re running the latest version, and notifies you when a security update is available. These security updates are small (usually 200KB - 700KB), giving you only what you need and making the security update quick to download and install. The automated update system provides updates for Thunderbird on Windows, OS X, and Linux in over 40 different languages.') }}
{% endif %}
</p>
<img src="{{ static('img/thunderbird/features/automated-update.png') }}" alt="">
</section>
</div>
Expand Down