Changeset 9180

Timestamp:

10/15/2019 06:53:44 AM (5 years ago)

Author:

dd32

Message:

WordPress.org, Plugin Directory, and Theme Directory: Sync the hreflang tag implementations. This prevents linking to non-existent sites.

Fixes #4713.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/plugin-directory/class-template.php (modified) (2 diffs)
• plugins/theme-directory/theme-directory.php (modified) (3 diffs)
• themes/pub/wporg/functions.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -836 +836 @@
         wp_cache_add_global_groups( array( 'locale-associations' ) );
 
+        // Google doesn't have support for a whole lot of languages and throws errors about it,
+        // so we exclude them, as we're otherwise outputting data that isn't used at all.
+        $unsupported_languages = array(
+            'arq',
+            'art',
+            'art-xemoji',
+            'ary',
+            'ast',
+            'az-ir',
+            'azb',
+            'bcc',
+            'ff-sn',
+            'frp',
+            'fuc',
+            'fur',
+            'haz',
+            'ido',
+            'io',
+            'kab',
+            'li',
+            'li-nl',
+            'lmo',
+            'me',
+            'me-me',
+            'rhg',
+            'rup',
+            'sah',
+            'sc-it',
+            'scn',
+            'skr',
+            'srd',
+            'szl',
+            'tah',
+            'twd',
+            'ty-tj',
+            'tzm',
+        );
+
         // WARNING: for any changes below, check other uses of the `locale-assosciations` group as there's shared cache keys in use.
         $cache_key = $post ? 'local-sites-' . $post->post_name : 'local-sites';
@@ -863 +901 @@
                 }
 
+                // Skip unsupported locales.
+                if ( in_array( $gp_locale->slug, $unsupported_languages ) ) {
+                    unset( $sites[ $key ] );
+                    continue;
+                }
+
                 $sites[ $key ]->subdomain = $subdomains[ $site->wp_locale ]->subdomain;
+
+                // Skip non-existing subdomains, e.g. 'de_CH_informal'.
+                if ( false !== strpos( $site->subdomain, '_' ) ) {
+                    unset( $sites[ $key ] );
+                    continue;
+                }
 
                 // Note that Google only supports ISO 639-1 codes.

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -1105 +1105 @@
     wp_cache_add_global_groups( array( 'locale-associations' ) );
 
+    // Google doesn't have support for a whole lot of languages and throws errors about it,
+    // so we exclude them, as we're otherwise outputting data that isn't used at all.
+    $unsupported_languages = array(
+        'arq',
+        'art',
+        'art-xemoji',
+        'ary',
+        'ast',
+        'az-ir',
+        'azb',
+        'bcc',
+        'ff-sn',
+        'frp',
+        'fuc',
+        'fur',
+        'haz',
+        'ido',
+        'io',
+        'kab',
+        'li',
+        'li-nl',
+        'lmo',
+        'me',
+        'me-me',
+        'rhg',
+        'rup',
+        'sah',
+        'sc-it',
+        'scn',
+        'skr',
+        'srd',
+        'szl',
+        'tah',
+        'twd',
+        'ty-tj',
+        'tzm',
+    );
+
+    // WARNING: for any changes below, check other uses of the `locale-assosciations` group as there's shared cache keys in use.
     if ( false === ( $sites = wp_cache_get( 'local-sites', 'locale-associations' ) ) ) {
         global $wpdb;
@@ -1115 +1154 @@
         require_once GLOTPRESS_LOCALES_PATH;
 
-        foreach ( $sites as $site ) {
+        foreach ( $sites as $key => $site ) {
             $gp_locale = GP_Locales::by_field( 'wp_locale', $site->locale );
             if ( ! $gp_locale ) {
-                unset( $sites[ $site->locale ] );
+                unset( $sites[ $key ] );
+                continue;
+            }
+
+            // Skip non-existing subdomains, e.g. 'de_CH_informal'.
+            if ( false !== strpos( $site->subdomain, '_' ) ) {
+                unset( $sites[ $key ] );
+                continue;
+            }
+
+            // Skip unsupported locales.
+            if ( in_array( $gp_locale->slug, $unsupported_languages ) ) {
+                unset( $sites[ $key ] );
                 continue;
             }
@@ -1135 +1186 @@
             }
 
-            if ( $hreflang && 'art' !== $hreflang ) {
-                $sites[ $site->locale ]->hreflang = strtolower( $hreflang );
+            if ( $hreflang ) {
+                $sites[ $key ]->hreflang = strtolower( $hreflang );
             } else {
-                unset( $sites[ $site->locale ] );
+                unset( $sites[ $key ] );
             }
         }

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

@@ -238 +238 @@
     $sites = wp_cache_get( 'local-sites', 'locale-associations' );
 
+    // WARNING: for any changes below, check other uses of the `locale-assosciations` group as there's shared cache keys in use.
     if ( false === $sites ) {
         global $wpdb;
@@ -249 +250 @@
         require_once GLOTPRESS_LOCALES_PATH;
 
-        foreach ( $sites as $site ) {
+        foreach ( $sites as $key => $site ) {
             $gp_locale = \GP_Locales::by_field( 'wp_locale', $site->locale );
             if ( ! $gp_locale ) {
-                unset( $sites[ $site->locale ] );
+                unset( $sites[ $key ] );
                 continue;
             }
@@ -258 +259 @@
             // Skip non-existing subdomains, e.g. 'de_CH_informal'.
             if ( false !== strpos( $site->subdomain, '_' ) ) {
-                unset( $sites[ $site->locale ] );
+                unset( $sites[ $key ] );
                 continue;
             }
 
-            if ( isset( $gp_locale->slug ) && ! in_array( $gp_locale->slug, $unsupported_languages ) ) {
-                $sites[ $site->locale ]->hreflang = $gp_locale->slug;
+            // Skip unsupported locales.
+            if ( in_array( $gp_locale->slug, $unsupported_languages ) ) {
+                unset( $sites[ $key ] );
+                continue;
+            }
+
+            $hreflang = false;
+
+            // Note that Google only supports ISO 639-1 codes.
+            if ( isset( $gp_locale->lang_code_iso_639_1 ) && isset( $gp_locale->country_code ) ) {
+                $hreflang = $gp_locale->lang_code_iso_639_1 . '-' . $gp_locale->country_code;
+            } elseif ( isset( $gp_locale->lang_code_iso_639_1 ) ) {
+                $hreflang = $gp_locale->lang_code_iso_639_1;
+            } elseif ( isset( $gp_locale->lang_code_iso_639_2 ) ) {
+                $hreflang = $gp_locale->lang_code_iso_639_2;
+            } elseif ( isset( $gp_locale->lang_code_iso_639_3 ) ) {
+                $hreflang = $gp_locale->lang_code_iso_639_3;
+            }
+
+            if ( $hreflang ) {
+                $sites[ $key ]->hreflang = strtolower( $hreflang );
             } else {
-                unset( $sites[ $site->locale ] );
+                unset( $sites[ $key ] );
             }
         }