Changeset 3028672

Timestamp:

01/30/2024 10:24:45 AM (2 years ago)

Author:

BinaryMoon

Message:

• Tweak replacements to only replace whole words and not the middle of words.

Location:

translate-words/trunk

Files:

• includes/frontend.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• translate-wp-words.php (modified) (1 diff)

translate-words/trunk/includes/frontend.php

@@ -23 +23 @@
     $replace = array_column( $overrides, 'overwrite' );
 
+    if ( empty( $keys ) || empty( $replace ) ) {
+        return $translated_string;
+    }
+
+    /**
+     * We perform two replacements here: first case-sensitive, then case-insensitive.
+     *
+     * The reason for this two-step process is to handle scenarios where we have
+     * translations that are identical except for their case. By doing a case-sensitive
+     * replacement first, we ensure that these translations are correctly replaced
+     * with their exact matches.
+     *
+     * After the case-sensitive replacement, we perform a case-insensitive replacement
+     * to catch any remaining translations that were not matched in the first step due
+     * to case differences.
+     *
+     * This process ensures that we prioritize exact matches while still providing
+     * a fallback for any remaining matches, regardless of case.
+     *
+     * It's important to maintain this two-step process to handle all possible
+     * translation scenarios correctly. Therefore, do not remove or alter this
+     * replacement strategy without a thorough understanding of its implications.
+     */
+
     /**
      * Do a case sensitive replacement.
@@ -28 +52 @@
      * but with different cases.
      */
-    $translated_string = str_replace( $keys, $replace, $translated_string );
+    $search_keys = array_map(
+        function( $key ) {
+            return '/\b' . preg_quote( $key, '/' ) . '\b/';
+        },
+        $keys
+    );
+
+    $translated_string = preg_replace( $search_keys, $replace, $translated_string );
 
     /**
@@ -35 +66 @@
      * backwards compatability.
      */
-    $translated_string = str_ireplace( $keys, $replace, $translated_string );
+    $search_keys = array_map(
+        function( $key ) {
+            return '/\b' . preg_quote( $key, '/' ) . '\b/i';
+        },
+        $keys
+    );
+
+    $translated_string = preg_replace( $search_keys, $replace, $translated_string );
 
     return $translated_string;

translate-words/trunk/readme.txt

@@ -3 +3 @@
 Tags: gettext, ngettext, string translations, translate
 Requires at least: 4.9.0
-Tested up to: 6.2.0
+Tested up to: 6.5.0
 Stable tag: trunk
 Requires PHP: 7.0
@@ -44 +44 @@
 == Changelog ==
 
+= 1.2.5 - 30th January 2024 =
+* Tweak replacements to only replace whole words and not the middle of words.
+
 = 1.2.4 - 4th March 2023 =
 * Fix PHP 8.2 error.

translate-words/trunk/translate-wp-words.php

@@ -3 +3 @@
  * Plugin Name: Translate Words
  * Description: Thanks to this plugin you can translate all the strings of your portal through the admin panel.
- * Version: 1.2.4
+ * Version: 1.2.5
  * Author: Ben Gillbanks
  * Author URI: https://www.binarymoon.co.uk/