Changeset 12194

Timestamp:

11/04/2022 01:07:02 AM (2 years ago)

Author:

dd32

Message:

Translate: Update custom code to expect the possibility that GP_Locale::$wp_locale may be correct for locale variants at some point.

See [12176], #4367, ​#core56989.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli

Files:

• class-export.php (modified) (1 diff)
• class-language-pack.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-export.php

@@ -47 +47 @@
 
         // Change wp_locale until GlotPress returns the correct wp_locale for variants.
+        // https://meta.trac.wordpress.org/changeset/12176/
         $wp_locale = $gp_locale->wp_locale;
-        if ( 'default' !== $args['locale-slug'] ) {
+        if ( 'default' !== $args['locale-slug'] && ! str_contains( $wp_locale, $args['locale-slug'] ) ) {
             $wp_locale = $wp_locale . '_' . $args['locale-slug'];
         }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/cli/class-language-pack.php

@@ -600 +600 @@
 
             // Change wp_locale until GlotPress returns the correct wp_locale for variants.
+            // https://meta.trac.wordpress.org/changeset/12176/
             $wp_locale = $gp_locale->wp_locale;
-            if ( 'default' !== $set->slug ) {
+            if ( 'default' !== $set->slug && ! str_contains( $wp_locale, $set->slug ) ) {
                 $wp_locale = $wp_locale . '_' . $set->slug;
             }