revert fix (#3559)

MozillaFoundation · Aug 20, 2019 · 4998324 · 4998324
1 parent 85be600
commit 4998324
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 55 deletions.
diff --git a/network-api/networkapi/mozfest/templates/mozfest/404.html b/network-api/networkapi/mozfest/templates/mozfest/404.html
@@ -1,7 +1,8 @@
 {% extends "mozfest/mozfest-base.html" %}
 
 {% block socialMetadata %}
-{% include "fragments/og_metadata.html" %}
+<meta property='og:type' content='website'>
+<meta property='og:locale' content='en_US'>
 {% endblock %}
 
 {% block pageTitle %}

diff --git a/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html b/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html
@@ -1,5 +1,5 @@
 {% extends "pages/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags homepage_tags card_tags multi_image_tags %}
+{% load wagtailcore_tags wagtailimages_tags homepage_tags card_tags wagtailmetadata_tags multi_image_tags %}
 
 
 {% block ga_identifier %}
@@ -8,7 +8,9 @@
 {% endblock %}
 
 {% block socialMetadata %}
-{% include "fragments/og_metadata.html" %}
+    <meta property='og:type' content='website'>
+    <meta property='og:locale' content='en_US'>
+    {% meta_tags %}
 {% endblock %}
 
 {% block bodyclass %}mozfest{% endblock %}

diff --git a/network-api/networkapi/settings.py b/network-api/networkapi/settings.py
@@ -272,7 +272,6 @@
                 'card_tags': 'networkapi.wagtailpages.templatetags.card_tags',
                 'class_tags': 'networkapi.wagtailpages.templatetags.class_tags',
                 'homepage_tags': 'networkapi.wagtailpages.templatetags.homepage_tags',
-                'localization': 'networkapi.wagtailpages.templatetags.localization',
                 'mini_site_tags': 'networkapi.wagtailpages.templatetags.mini_site_tags',
                 'multi_image_tags': 'networkapi.wagtailpages.templatetags.multi_image_tags',
                 'nav_tags': 'networkapi.utility.templatetags.nav_tags',

diff --git a/network-api/networkapi/templates/fragments/og_metadata.html b/network-api/networkapi/templates/fragments/og_metadata.html
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/homepage.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/homepage.html
@@ -1,10 +1,12 @@
 {% extends "pages/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags homepage_tags card_tags multi_image_tags %}
+{% load wagtailcore_tags wagtailimages_tags homepage_tags card_tags wagtailmetadata_tags multi_image_tags %}
 
 {% block bodyID %}home{% endblock %}
 
 {% block socialMetadata %}
-  {% include "fragments/og_metadata.html" %}
+    <meta property='og:type' content='website'>
+    <meta property='og:locale' content='en_US'>
+    {% meta_tags %}
 {% endblock %}
 
 {% block org_schema %}

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html
@@ -1,9 +1,11 @@
 {% extends "pages/base.html" %}
 
-{% load wagtailcore_tags mini_site_tags %}
+{% load wagtailcore_tags mini_site_tags wagtailmetadata_tags %}
 
 {% block socialMetadata %}
-  {% include "fragments/og_metadata.html" %}
+    <meta property='og:type' content='website'>
+    <meta property='og:locale' content='en_US'>
+    {% meta_tags %}
 {% endblock %}
 
 {% block page_top_content %}

diff --git a/network-api/networkapi/wagtailpages/templatetags/localization.py b/network-api/networkapi/wagtailpages/templatetags/localization.py
diff --git a/source/js/main.js b/source/js/main.js
@@ -24,11 +24,6 @@ const SHOW_MEMBER_NOTICE = false;
 // To be populated via XHR and querySelector
 let env, networkSiteURL, csrfToken;
 
-// To be populated via querySelector
-const DEFAULT_LOCALE = `en_US`;
-const DEFAULT_WAGTAIL_LANGUAGE = `en`;
-let locale, wagtailLanguage;
-
 // Track all ReactDOM.render calls so we can use a Promise.all()
 // all the way at the end to make sure we don't report "we are done"
 // until all the React stuff is _actually_ done.
@@ -43,16 +38,6 @@ let main = {
       csrfToken = document.querySelector(`meta[name="csrf-token"]`);
       csrfToken = csrfToken ? csrfToken.getAttribute(`content`) : false;
 
-      locale = document.querySelector(`meta[property="og:locale"]`);
-      locale = locale ? locale.getAttribute(`content`) : DEFAULT_LOCALE;
-
-      wagtailLanguage = document.querySelector(
-        `meta[property="wagtail:language"]`
-      );
-      wagtailLanguage = wagtailLanguage
-        ? wagtailLanguage.getAttribute(`content`)
-        : DEFAULT_WAGTAIL_LANGUAGE;
-
       // HEROKU_APP_DOMAIN is used by review apps
       if (!networkSiteURL && env.HEROKU_APP_NAME) {
         networkSiteURL = `https://${env.HEROKU_APP_NAME}.herokuapp.com`;