Changeset 10829 for sites/trunk/wordpress.org/public_html/wp-content/plugins/locale-detection/class-detector.php

Timestamp:

03/18/2021 05:13:45 AM (6 years ago)

Author:

dd32

Message:

Locale Detection: Some language codes do not follow the xx_XX format, and xx_xxxxx is valid, likewise some locales have variants, allow for those too.

This affected locales such as art_xpirate which would revert to art_emoji or ca_valencia which reverted to ca.

This also affected de_CH_informal which would revert to de_DE, or de_CH_404 which reverted to de_DE instead of de_CH.

See #5662.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/locale-detection/class-detector.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/locale-detection/class-detector.php

@@ -174 +174 @@
         public function check_variants( $locale ) {
                 $locale   = str_replace( '-', '_', $locale );
-                $locale   = explode( '_', $locale, 2 );
+                $locale   = explode( '_', $locale, 3 );
                 $variants = [];
 
                 if ( 1 === count( $locale ) ) {
                         $lang = strtolower( $locale[0] );
+                } elseif ( 2 === count( $locale ) ) {
+                        list( $lang, $region ) = $locale;
+
+                        $lang       = strtolower( $lang );
+                        $variants[] = $lang . '_' . strtolower( $region );
+                        $variants[] = $lang . '_' . strtoupper( $region );
                 } else {
-                        list( $lang, $region ) = $locale;
+                        list( $lang, $region, $variant ) = $locale;
 
                         $lang       = strtolower( $lang );
+                        $variant    = strtolower( $variant );
+                        $variants[] = $lang . '_' . strtolower( $region ) . '_' . $variant;
+                        $variants[] = $lang . '_' . strtoupper( $region ) . '_' . $variant;
+                        $variants[] = $lang . '_' . strtolower( $region );
                         $variants[] = $lang . '_' . strtoupper( $region );
                 }