Redirect /pt to /pt-BR (#6854)

MozillaFoundation · Jul 27, 2021 · e8018fa · e8018fa
1 parent c75240a
commit e8018fa
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/network-api/networkapi/campaign/views.py b/network-api/networkapi/campaign/views.py
@@ -12,6 +12,13 @@
 import json
 from networkapi.wagtailpages.models import Petition, Signup
 
+def process_lang_code(lang):
+    # Salesforce expects "pt" instead of "pt-BR".
+    # See https://github.com/mozilla/foundation.mozilla.org/issues/5993
+    if lang == 'pt-BR':
+        return 'pt'
+    return lang
+
 
 class SQSProxy:
     """
@@ -128,7 +135,7 @@ def signup_submission(request, signup):
         "format": "html",
         "source_url": source,
         "newsletters": signup.newsletter,
-        "lang": rq.get('lang', 'en'),
+        "lang": process_lang_code(rq.get('lang', 'en')),
         "country": rq.get('country', ''),
         # Empty string instead of None due to Basket issues
         "first_name": rq.get('givenNames', ''),
@@ -178,7 +185,7 @@ def petition_submission(request, petition):
         "email": request.data['email'],
         "email_subscription": request.data['newsletterSignup'],
         "source_url": request.data['source'],
-        "lang": request.data['lang'],
+        "lang": process_lang_code(request.data['lang']),
     }
 
     if petition:

diff --git a/network-api/networkapi/settings.py b/network-api/networkapi/settings.py
@@ -440,7 +440,7 @@
 WAGTAIL_CONTENT_LANGUAGES = LANGUAGES = (
     ('en', gettext_lazy('English')),
     ('de', gettext_lazy('German')),
-    ('pt', gettext_lazy('Portuguese')),
+    ('pt-BR', gettext_lazy('Portuguese (Brazil)')),
     ('es', gettext_lazy('Spanish')),
     ('fr', gettext_lazy('French')),
     ('fy-NL', gettext_lazy('Frisian')),

diff --git a/network-api/networkapi/templates/fragments/canonical_url.html b/network-api/networkapi/templates/fragments/canonical_url.html
@@ -28,7 +28,7 @@
   {% elif CODE == 'pa-IN' %}
   <link rel="alternate" hreflang="pa" href="{{ CANONICAL_SITE_URL }}/{{ CODE }}{{ CANONICAL_PATH }}" title="{{ lang.name_local|safe }}">
   <link rel="alternate" hreflang="pa-IN" href="{{ CANONICAL_SITE_URL }}/{{ CODE }}{{ CANONICAL_PATH }}" title="{{ lang.name_local|safe }}">
-  {% elif CODE == 'pt' %}
+  {% elif CODE == 'pt-BR' %}
   <link rel="alternate" hreflang="pt" href="{{ CANONICAL_SITE_URL }}/{{ CODE }}{{ CANONICAL_PATH }}" title="{{ lang.name_local|safe }}">
   <link rel="alternate" hreflang="pt-PT" href="{{ CANONICAL_SITE_URL }}/{{ CODE }}{{ CANONICAL_PATH }}" title="{{ lang.name_local|safe }}">
   <link rel="alternate" hreflang="pt-BR" href="{{ CANONICAL_SITE_URL }}/{{ CODE }}{{ CANONICAL_PATH }}" title="{{ lang.name_local|safe }}">

diff --git a/network-api/networkapi/urls.py b/network-api/networkapi/urls.py
@@ -80,6 +80,9 @@
 
     # Wagtail Footnotes package
     path("footnotes/", include(footnotes_urls)),
+
+    # redirect /pt to /pt-BR. See https://github.com/mozilla/foundation.mozilla.org/issues/5993
+    re_path(r'^pt/(?P<rest>.*)', RedirectView.as_view(url='/pt-BR/%(rest)s', query_string=True)),
 ]))
 
 # Anything that needs to respect the localised

diff --git a/network-api/networkapi/wagtailpages/templatetags/localization.py b/network-api/networkapi/wagtailpages/templatetags/localization.py
@@ -17,7 +17,7 @@
     'fy-NL': 'fy_NL',
     'nl': 'nl_NL',
     'pl': 'pl_PL',
-    'pt': 'pt_BR',  # our main focus is Brazilian Portuguese
+    'pt-BR': 'pt_BR',
 }
 
 

diff --git a/source/js/components/join/language-select.jsx b/source/js/components/join/language-select.jsx
@@ -20,7 +20,7 @@ class JoinUsLanguageSelect extends Component {
       es: `Español`,
       fr: `Français`,
       pl: `Polski`,
-      pt: `Português`,
+      "pt-BR": `Português`,
     };
 
     let lang_codes = Object.keys(languages);

diff --git a/source/js/components/petition/locale-strings.jsx b/source/js/components/petition/locale-strings.jsx
@@ -290,7 +290,7 @@ export default {
   },
 
   // Portuguese
-  pt: {
+  "pt-BR": {
     "First name": `Nome`,
     "Please enter your given name(s)": `Insira seu nome`,
     "Last name": `Sobrenome`,

diff --git a/source/sass/buyers-guide/views/product.scss b/source/sass/buyers-guide/views/product.scss
@@ -82,7 +82,7 @@
         }
       }
 
-      @at-root html[lang="pt"] & {
+      @at-root html[lang="pt-BR"] & {
         background-image: url(../_images/buyers-guide/icon-privacy-ding-pt.svg);
         width: 53px;