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

Timestamp:

02/01/2018 07:03:07 AM (7 years ago)

Author:

dd32

Message:

GlotPress Translation Bridge: When we can't find a translation, and the source text contains encoded entities, attempt to find the text unencoded.

Fixes #1628.

File:

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

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

@@ -127 +127 @@
         $sql_singular = isset( $strings['singular'] ) ? $wpdb->prepare( "o.singular = %s", $strings['singular'] ) : 'o.singular IS NULL';
         $sql_plural   = isset( $strings['plural'] )   ? $wpdb->prepare( "o.plural = %s",   $strings['plural']   ) : 'o.plural IS NULL';
-        $sql_context  = isset( $strings['context'] )  ? $wpdb->prepare( "o.contxt = %s",   $strings['context']  ) : 'o.context IS NULL';
+        $sql_context  = !empty( $strings['context'] ) ? $wpdb->prepare( "o.context = %s",  $strings['context']  ) : 'o.context IS NULL';
 
         $sql_locale = $wpdb->prepare( "s.locale = %s AND s.slug = %s", $locale['locale'], $locale['slug'] );
@@ -148 +148 @@
         );
 
+        if ( ! $translation ) {
+            $decoded_strings = array_map( 'html_entity_decode', $strings );
+            if ( $decoded_strings != $strings ) {
+                $translation = $this->find_translation( $decoded_strings, $project_path );
+            }
+        }
+
         if ( $translation ) {
             $translation = array_filter( $translation );