diff --git a/springfield/base/templates/base-protocol.html b/springfield/base/templates/base-protocol.html index b14a77efe..1c221dd4d 100644 --- a/springfield/base/templates/base-protocol.html +++ b/springfield/base/templates/base-protocol.html @@ -28,7 +28,7 @@ {% block extra_meta %}{% endblock %} {% block shared_meta %} - {% filter striptags %}{% block page_title_full %}{% block page_title_prefix %}{% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Firefox{% endblock %}{% endfilter %} + {% filter striptags %}{% block page_title_full %}{% block page_title_prefix %}{% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Firefox.com{% endblock %}{% block page_title_region %}{% endblock %}{% endfilter %} diff --git a/springfield/firefox/templates/firefox/browsers/desktop/index.html b/springfield/firefox/templates/firefox/browsers/desktop/index.html index da0842dc1..07c24ccec 100644 --- a/springfield/firefox/templates/firefox/browsers/desktop/index.html +++ b/springfield/firefox/templates/firefox/browsers/desktop/index.html @@ -8,13 +8,16 @@ {% from "macros.html" import google_play_button, apple_app_store_button, fxa_email_form with context %} {# Issue 13019: Avoid duplicate content for English pages. #} +{%- block page_title_region -%} + {% if LANG == 'en-US' %} (US){%- endif -%} + {% if LANG == 'en-GB' %} (UK){%- endif -%} +{%- endblock -%} + {%- block page_title -%} - {%- if LANG == 'en-US' -%} - Firefox for Desktop — Firefox (US) - {%- elif LANG == 'en-GB' -%} - Firefox for Desktop — Firefox (UK) + {%- if LANG == 'en-US' or LANG == 'en-GB' -%} + Firefox for Desktop available for Windows, Mac and Linux {%- else -%} - {{ ftl('firefox-browsers-page-title-v2') }} - Firefox + {{ ftl('firefox-browsers-page-title-v2') }} {%- endif -%} {%- endblock -%} diff --git a/springfield/firefox/templates/firefox/browsers/mobile/index.html b/springfield/firefox/templates/firefox/browsers/mobile/index.html index 07dc38d19..32f9db7d0 100644 --- a/springfield/firefox/templates/firefox/browsers/mobile/index.html +++ b/springfield/firefox/templates/firefox/browsers/mobile/index.html @@ -16,6 +16,13 @@ {% set _entrypoint = 'www.firefox.com-firefox-mobile' %} {% block page_title %}{{ ftl('browsers-mobile-firefox-mobile-browsers-put') }}{% endblock %} + +{# Issue 13019: Avoid duplicate content for English pages. #} +{%- block page_title_region -%} + {% if LANG == 'en-US' %} (US){%- endif -%} + {% if LANG == 'en-GB' %} (UK){%- endif -%} +{%- endblock -%} + {% block page_desc %}{{ ftl('browsers-mobile-overview-of-all-mobile') }}{% endblock %} {% block body_class %}{{ super() }} mobile-overview{% endblock %} diff --git a/springfield/firefox/templates/firefox/browsers/mobile/ios.html b/springfield/firefox/templates/firefox/browsers/mobile/ios.html index ed2ad4eae..3055cd77b 100644 --- a/springfield/firefox/templates/firefox/browsers/mobile/ios.html +++ b/springfield/firefox/templates/firefox/browsers/mobile/ios.html @@ -22,17 +22,20 @@ {% endif %} {% endblock %} -{# Issue 13019: Avoid duplicate content for English pages. #} {%- block page_title_full -%} - {%- if LANG == 'en-US' -%} - Get Firefox for iOS (iPhone and iPad) — Mozilla (US) - {%- elif LANG == 'en-GB' -%} - Download Firefox for iOS (iPhone and iPad) — Mozilla (UK) + {%- if LANG == 'en-US' or LANG == 'en-GB' -%} + Get Firefox for iOS (iPhone and iPad) from Mozilla {%- else -%} {{ ftl('mobile-ios-firefox-browser-ios') }} - Mozilla {%- endif -%} {%- endblock -%} +{# Issue 13019: Avoid duplicate content for English pages. #} +{%- block page_title_region -%} + {% if LANG == 'en-US' %} (US){%- endif -%} + {% if LANG == 'en-GB' %} (UK){%- endif -%} +{%- endblock -%} + {% block page_desc %}{{ ftl('mobile-ios-see-your-open-tabs') }}{% endblock %} {% block body_class %}{{ super() }} mobile-ios{% endblock %}