Changeset 11590

Timestamp:

02/22/2022 03:06:29 AM (3 years ago)

Author:

dd32

Message:

Openverse: Update the theme to use path-based localisation.

Props sarayourfriend.
Closes ​https://github.com/WordPress/wordpress.org/pull/61
Fixes #6195.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse

Files:

• .gitignore (modified) (1 diff)
• functions.php (modified) (3 diffs)
• js/iframe_nav.js (modified) (1 diff)
• js/message.js (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/.gitignore

@@ -4 +4 @@
 mu-plugins/
 vendor/
+wporg_locales.sql

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/functions.php

@@ -2 +2 @@
 
 namespace WordPressdotorg\Openverse\Theme;
+
+use function WordPressdotorg\Locales\get_locales;
 
 /**
@@ -84 +86 @@
         /* in_footer */ true
     );
+
+    $use_path_based_locale_forwarding = get_theme_mod( 'ov_path_based_i18n', false );
+    $wp_locale = get_locale();
+    $locale = get_locales()[ $wp_locale ];
+    $locale_slug = $use_path_based_locale_forwarding && $wp_locale !== 'en_US' ? $locale->slug : '';
+
     wp_add_inline_script(
         /* handle   */ 'openverse-message',
         /* JS       */ 'const openverseUrl = ' . wp_json_encode( get_theme_mod( 'ov_src_url', OPENVERSE_URL ) ) . ";\n" .
         /* JS       */ 'const openverseSubpath = ' . wp_json_encode( OPENVERSE_SUBPATH ) . ";\n" .
-        /* JS       */ 'const currentLocale = ' . wp_json_encode( get_locale() ) . ";\n",
+        /* JS       */ 'const currentLocale = ' . wp_json_encode( $wp_locale ) . ";\n" . /* Used for legacy cookie based locale forwarding */
+        /* JS       */ 'const localeSlug = ' . wp_json_encode( $locale_slug ) . ";\n",
         /* position */ 'before'
-    );  
+    );
 
     wp_enqueue_script(
@@ -161 +170 @@
         )
     ) );
+
+    $wp_customize->add_setting( 'ov_path_based_i18n', array(
+        'type' => 'theme_mod',
+        'capability' => 'edit_theme_options',
+        'default' => false
+    ) );
+
+    $wp_customize->add_control( 'ov_path_based_i18n', array(
+        'section' => 'ov_embed',
+        'type' => 'checkbox',
+        'id' => 'ov_path_based_i18n',
+        'label' => 'Use path based locale forwarding',
+        'priority' => 10
+    ) );
 }
 add_action( 'customize_register', __NAMESPACE__ . '\wporg_ov_customizer' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/js/iframe_nav.js

@@ -6 +6 @@
     .replace(openverseSubpath, '')
     .replace(/^\/$/, ''); // Remove Openverse site subpath
-  iframePath = `${openverseUrl}${iframePath}${query}`; // Add domain and query
+  const localePart = localeSlug
+    ? openverseUrl.endsWith('/')
+      ? localeSlug
+      : `/${localeSlug}`
+    : '';
+  iframePath = `${openverseUrl}${localePart}${iframePath}${query}`; // Add domain and query
 
   console.log(`Navigating iframe to ${iframePath}`);

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/js/message.js

@@ -12 +12 @@
 function updatePath(value) {
   const path = value.path;
-  const url = `${openverseSubpath}${path}`; // openverseSubpath defined in `index.php`
+  let url = `${openverseSubpath}${path}`; // openverseSubpath defined in `index.php`
+  if (localeSlug) {
+    url = url.replace(`openverse/${localeSlug}`, 'openverse');
+  }
 
   console.log(`Replacing state URL: ${url}`);