Changeset 1925

Timestamp:

09/30/2015 02:08:58 PM (11 years ago)

Author:

ocean90

Message:

GlotPress Translate Bridge: Use GP_Locales to get the GlotPress slug of a locale.

The previous version (now used as a fallback) assumed that the GlotPress locale for the WordPress locale he_IL is he-il, but it's he.

Fixes #1275.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/glotpress-translate-bridge/glotpress-translate-bridge.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/glotpress-translate-bridge/glotpress-translate-bridge.php

@@ -138 +138 @@
                                 LEFT JOIN {$this->gp_prefix}translations t ON t.original_id = o.id AND t.translation_set_id = s.id
 
-                        WHERE 
+                        WHERE
                                 $sql_project AND $sql_singular AND $sql_plural AND $sql_context AND $sql_locale
                                 AND o.status = '+active'
@@ -161 +161 @@
          * Determines the GlotPress Locale for a given WordPress Locale
          *
-         * This makes assumptions about the format of a GlotPress slug, which may not reflect real-world use-cases.
+         * Uses `GP_Locales` if 'GLOTPRESS_LOCALES_PATH' is defined. Otherwise it makes assumptions about the format of a GlotPress slug,
+         * which may not reflect real-world use-cases.
          *
          * @access private
@@ -168 +169 @@
          */
         private function glotpress_locale() {
-                $gp_locale = strtolower( get_locale() );
-
-                if ( 'en_us' === $gp_locale ) {
+                $wp_locale = get_locale();
+
+                if ( 'en_US' === $wp_locale ) {
                         return false;
                 }
 
-                preg_match( '!^([a-z]{2,3})(_([a-z]{2}))?(_([a-z0-9]+))?$!', $gp_locale, $matches );
-
+                preg_match( '!^([a-z]{2,3})(_([A-Z]{2}))?(_([a-z0-9]+))?$!', $wp_locale, $matches );
+
+                $wp_locale = $matches[1] . $matches[2];
                 $locale = $matches[1];
                 $country = isset( $matches[3] ) ? $matches[3] : $matches[1];
                 $variant = isset( $matches[5] ) ? $matches[5] : false;
-        
-                if ( $locale !== $country ) {
-                        $locale .= '-' . $country;
+
+                if ( defined( 'GLOTPRESS_LOCALES_PATH' ) ) {
+                        require_once( GLOTPRESS_LOCALES_PATH );
+
+                        $gp_locale = GP_Locales::by_field( 'wp_locale', $wp_locale );
+                        if ( $gp_locale ) {
+                                $locale = $gp_locale->slug;
+                        }
+                } else {
+                        $country = strtolower( $country );
+                        if ( $locale !== $country ) {
+                                $locale .= '-' . $country;
+                        }
                 }