Changeset 3420034

Timestamp:

12/15/2025 11:26:52 AM (2 months ago)

Author:

razvan.mo

Message:

tagging version 3.0.6

Location:

translatepress-multilingual

Files:

• tags/3.0.6 (copied) (copied from translatepress-multilingual/trunk)
• tags/3.0.6/assets/js/trp-frontend-compatibility.js (modified) (1 diff)
• tags/3.0.6/assets/js/trp-frontend-language-switcher.js (modified) (2 diffs)
• tags/3.0.6/assets/js/trp-translate-dom-changes.js (modified) (1 diff)
• tags/3.0.6/changelog.txt (modified) (1 diff)
• tags/3.0.6/class-translate-press.php (modified) (3 diffs)
• tags/3.0.6/includes/advanced-settings/do-not-translate-certain-paths.php (modified) (1 diff)
• tags/3.0.6/includes/class-language-switcher-v2.php (modified) (1 diff)
• tags/3.0.6/includes/class-languages.php (modified) (2 diffs)
• tags/3.0.6/includes/class-machine-translator.php (modified) (1 diff)
• tags/3.0.6/includes/class-settings.php (modified) (1 diff)
• tags/3.0.6/includes/class-translation-render.php (modified) (4 diffs)
• tags/3.0.6/includes/class-woocommerce-emails.php (modified) (6 diffs)
• tags/3.0.6/includes/compatibility-functions.php (modified) (1 diff)
• tags/3.0.6/includes/external-functions.php (modified) (1 diff)
• tags/3.0.6/includes/functions.php (modified) (2 diffs)
• tags/3.0.6/includes/gettext/class-gettext-manager.php (modified) (2 diffs)
• tags/3.0.6/includes/queries/class-query.php (modified) (2 diffs)
• tags/3.0.6/index.php (modified) (2 diffs)
• tags/3.0.6/languages/translatepress-multilingual.pot (modified) (4 diffs)
• tags/3.0.6/readme.txt (modified) (2 diffs)
• trunk/assets/js/trp-frontend-compatibility.js (modified) (1 diff)
• trunk/assets/js/trp-frontend-language-switcher.js (modified) (2 diffs)
• trunk/assets/js/trp-translate-dom-changes.js (modified) (1 diff)
• trunk/changelog.txt (modified) (1 diff)
• trunk/class-translate-press.php (modified) (3 diffs)
• trunk/includes/advanced-settings/do-not-translate-certain-paths.php (modified) (1 diff)
• trunk/includes/class-language-switcher-v2.php (modified) (1 diff)
• trunk/includes/class-languages.php (modified) (2 diffs)
• trunk/includes/class-machine-translator.php (modified) (1 diff)
• trunk/includes/class-settings.php (modified) (1 diff)
• trunk/includes/class-translation-render.php (modified) (4 diffs)
• trunk/includes/class-woocommerce-emails.php (modified) (6 diffs)
• trunk/includes/compatibility-functions.php (modified) (1 diff)
• trunk/includes/external-functions.php (modified) (1 diff)
• trunk/includes/functions.php (modified) (2 diffs)
• trunk/includes/gettext/class-gettext-manager.php (modified) (2 diffs)
• trunk/includes/queries/class-query.php (modified) (2 diffs)
• trunk/index.php (modified) (2 diffs)
• trunk/languages/translatepress-multilingual.pot (modified) (4 diffs)
• trunk/readme.txt (modified) (2 diffs)

translatepress-multilingual/tags/3.0.6/assets/js/trp-frontend-compatibility.js

@@ -3 +3 @@
 
         // clear WooCommerce cart fragments when switching language
-        var trp_language_switcher_urls = document.querySelectorAll(".trp-language-switcher-container a:not(.trp-ls-disabled-language)");
+        var trp_language_switcher_urls = document.querySelectorAll(".trp-language-switcher-container a:not(.trp-ls-disabled-language), .trp-language-item:not(.trp-language-item__current)");
 
         for (i = 0; i < trp_language_switcher_urls.length; i++) {

translatepress-multilingual/tags/3.0.6/assets/js/trp-frontend-language-switcher.js

@@ -35 +35 @@
     }
 
+    /**
+     * Returns true if the list has a non-zero transition duration (for any property).
+     * We use this to decide whether to rely on `transitionend` or fall back to sync behavior.
+     */
+    _hasAnimatedTransition() {
+        if (!this.list) return false;
+
+        const cs = getComputedStyle(this.list);
+        const durationsRaw = cs.transitionDuration || '';
+
+        if (!durationsRaw) return false;
+
+        const durations = durationsRaw
+            .split(',')
+            .map(str => parseFloat(str) || 0);
+
+        return durations.some(d => d > 0);
+    }
+
     collapse() {
         this.list.hidden = true;
@@ -66 +85 @@
     }
 
-    setOpen(open, { source = null } = {}) {
-        if (!this.root || !this.list || open === this.isOpen) return;
-
-        // Honor reduced motion: skip the transition entirely (still class-driven)
+    setOpen( open, { source = null } = {} ) {
+        if ( !this.root || !this.list || open === this.isOpen ) return;
+
         const prefersReduced = window.matchMedia?.('(prefers-reduced-motion: reduce)')?.matches;
+        const hasTransition  = !prefersReduced && this._hasAnimatedTransition();
 
         this.isOpen = open;
 
-        if (open) {
-            // Prepare: must be visible for CSS transition to run
+        // No transitions (0s duration) OR reduced motion: do everything synchronously,
+        if ( !hasTransition ) {
+            if ( open ) {
+                this.list.hidden = false;
+                this.list.removeAttribute( 'inert' );
+                this.setExpanded( true );
+
+                this._pendingFocusOnOpen = ( source?.type === 'keydown' );
+                if ( this._pendingFocusOnOpen ) {
+                    this._pendingFocusOnOpen = false;
+                    const first = this.list.querySelector(
+                        '[role="option"], a, button, [tabindex]:not([tabindex="-1"])'
+                    );
+                    first?.focus?.({ preventScroll: true });
+                }
+            } else {
+                this.setExpanded( false );
+                this.list.hidden = true;
+                this.list.setAttribute( 'inert', '' );
+                this._pendingFocusOnOpen = false;
+            }
+            return;
+        }
+
+        // Animated path: rely on transitionend to remove .is-transitioning
+        if ( open ) {
+            // Must be visible for CSS transition to run
             this.list.hidden = false;
-            this.list.removeAttribute('inert');
-
-            if (prefersReduced) {
-                this.root.classList.remove('is-transitioning');
-                this.setExpanded(true);
-            } else {
-                this.root.classList.add('is-transitioning');
-                // Next frame so the browser registers the pre-open (max-height:0) state
-                requestAnimationFrame(() => this.setExpanded(true));
-            }
-
-            // keyboard open should move focus after transition completes
-            this._pendingFocusOnOpen = (source?.type === 'keydown');
-
+            this.list.removeAttribute( 'inert' );
+
+            this._pendingFocusOnOpen = ( source?.type === 'keydown' );
+
+            this.root.classList.add( 'is-transitioning' );
+            // Next frame so browser registers pre-open (max-height: 0) state
+            requestAnimationFrame( () => this.setExpanded( true ) );
         } else {
-            if (prefersReduced){
-                this.root.classList.add( 'is-transitioning' );
-            }
-
-            this.setExpanded(false);
+            this.root.classList.add( 'is-transitioning' );
+            this.setExpanded( false );
         }
     }

translatepress-multilingual/tags/3.0.6/assets/js/trp-translate-dom-changes.js

@@ -468 +468 @@
 
         // create an observer instance
-        observer = new MutationObserver( _this.detect_new_strings_callback );
+        if ( trp_data['showdynamiccontentbeforetranslation'] === true ){
+            observer = new MutationObserver(mutations => {
+                setTimeout(() => _this.detect_new_strings_callback(mutations), 0);
+            });
+        }
+
+        else {
+            observer = observer = new MutationObserver(_this.detect_new_strings_callback)
+        }
 
         _this.resume_observer();

translatepress-multilingual/tags/3.0.6/changelog.txt

@@ +1 @@
+= 3.0.5 =
+* Fixed CSS for Black Friday offer from admin notice
+
+= 3.0.4 =
+* Added 39 more languages including Irish, Maltese and Sicilian
+* Added support for Latin American Spanish automatic translation in TranslatePress AI
+* Added support for Divi search in secondary language
+* Added support for exact match search in String Translation by placing the string in quotes: "example"
+* Allow schema.org data to be translated
+* Fixed Regular String Translation search so filtered languages also match terms appearing in the middle of translated strings, not only at the start
+* Prevent automatic translation of strings that are 0 or 1 characters long or strings that are punctuation only
+* Change background hover color for transparent preset in order to improve contrast of language switcher
+* Fixed two missing spaces in floating switcher HTML markup
+* Fix PHP warning with empty domain for gettext with context
+* Fixed edge case error "call to a member function is_available() on null"
+* Moved the "Automatically Translate Slug" setting to be first in line
+* Extended the license message for item_name_mismatch to provide more context
+* Improved text information next to the default language
+
 = 3.0.3 =
 * Fixed an issue introduced in the previous update that occurred when using Google Translate as the translation engine

translatepress-multilingual/tags/3.0.6/class-translate-press.php

@@ -68 +68 @@
      */
     public function __construct() {
+        // Early bind to break recursion loop caused by calling get_trp_instance during construction
+        if ( self::$translate_press === null ) {
+            self::$translate_press = $this;
+        }
+
         define( 'TRP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
         define( 'TRP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
         define( 'TRP_PLUGIN_BASE', plugin_basename( __DIR__ . '/index.php' ) );
         define( 'TRP_PLUGIN_SLUG', 'translatepress-multilingual' );
-        define( 'TRP_PLUGIN_VERSION', '3.0.5' );
+        define( 'TRP_PLUGIN_VERSION', '3.0.6' );
 
         wp_cache_add_non_persistent_groups(array('trp'));
@@ -103 +108 @@
         require_once TRP_PLUGIN_DIR . 'includes/class-editor-api-regular-strings.php';
         require_once TRP_PLUGIN_DIR . 'includes/class-editor-api-gettext-strings.php';
-        require_once TRP_PLUGIN_DIR . 'includes/class-translation-manager.php';
         require_once TRP_PLUGIN_DIR . 'includes/class-hooks-loader.php';
         require_once TRP_PLUGIN_DIR . 'includes/class-languages.php';
@@ -180 +184 @@
         $this->query                      = new TRP_Query( $this->settings->get_settings() );
         $this->machine_translator_logger  = new TRP_Machine_Translator_Logger( $this->settings->get_settings() );
+        $this->machine_translator         = new TRP_Machine_Translator( $this->settings->get_settings() ); // Will be overwritten in init_machine_translation with the actual machine translator class. Use this as replacement until then.
         $this->translation_manager        = new TRP_Translation_Manager( $this->settings->get_settings() );
         $this->editor_api_regular_strings = new TRP_Editor_Api_Regular_Strings( $this->settings->get_settings() );

translatepress-multilingual/tags/3.0.6/includes/advanced-settings/do-not-translate-certain-paths.php

@@ -490 +490 @@
     return $excluded;
 }
+
+/**
+ * Check if the current URL is excluded from translation based on the
+ * "Do not translate certain paths" / "Translate only certain paths" setting.
+ *
+ * Takes into account:
+ *  - site installed in subdirectory
+ *  - "Use a subdirectory for the default language"
+ *  - {{home}} mapping
+ *  - both "exclude" and "include" modes
+ *
+ * @return bool True if the current URL should be treated as excluded from translation.
+ */
+function trp_dntcp_is_current_url_excluded() {
+    if ( is_admin() ) {
+        return false;
+    }
+
+    $settings          = get_option( 'trp_settings', false );
+    $advanced_settings = get_option( 'trp_advanced_settings', false );
+
+    // No configuration -> nothing is excluded.
+    if ( empty( $advanced_settings )
+        || ! isset( $advanced_settings['translateable_content'] )
+        || empty( $advanced_settings['translateable_content']['paths'] )
+        || empty( $advanced_settings['translateable_content']['option'] ) ) {
+        return false;
+    }
+
+    $mode  = $advanced_settings['translateable_content']['option']; // 'exclude' or 'include'
+    $paths = trp_dntcp_get_paths();
+
+    // Build current slug in the same way as trp_exclude_include_paths_to_run_on()
+    $trp           = TRP_Translate_Press::get_trp_instance();
+    $url_converter = $trp->get_component( 'url_converter' );
+
+    $current_lang = $url_converter->get_lang_from_url_string( $url_converter->cur_page_url() );
+    if ( empty( $current_lang ) && isset( $settings['default-language'] ) ) {
+        $current_lang = $settings['default-language'];
+    }
+
+    $site_url_components = parse_url( get_home_url() );
+    $current_slug        = isset( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( $_SERVER['REQUEST_URI'] ) : '';
+
+    // Remove site_url path for installs in subdirectories (e.g. http://localhost/wordpress)
+    if ( isset( $site_url_components['path'] ) && $site_url_components['path'] !== '' ) {
+        $current_slug = str_replace( trim( $site_url_components['path'] ), '', $current_slug );
+    }
+
+    // Take into account subdirectory for the default language or other languages.
+    // This mirrors the logic used in trp_exclude_include_paths_to_run_on().
+    if ( isset( $settings['add-subdirectory-to-default-language'] )
+        && $settings['add-subdirectory-to-default-language'] === 'yes'
+        && ! empty( $current_lang )
+        && isset( $settings['url-slugs'][ $current_lang ] ) ) {
+
+        $replace      = '\/' . $settings['url-slugs'][ $current_lang ];
+        $current_slug = preg_replace( "/$replace/i", '', ltrim( $current_slug, '/' ), 1 );
+    }
+
+    $array_slugs = array();
+    trp_test_current_slug( $current_slug, $array_slugs );
+
+    $matched = trp_return_exclude_include_url( $paths, $current_slug, $array_slugs );
+
+    // In "exclude" mode: listed paths are excluded.
+    if ( $mode === 'exclude' )
+        return (bool) $matched;
+
+    // In "include" mode: ONLY listed paths are translatable; all others are excluded
+    if ( $mode === 'include' )
+        return !$matched;
+
+    return false;
+}

translatepress-multilingual/tags/3.0.6/includes/class-language-switcher-v2.php

@@ -130 +130 @@
 
         $allow = apply_filters('trp_allow_language_redirect', true, $needed_lang, $this->url_converter->cur_page_url());
-        if (!$allow) return;
+
+        if ( !$allow || trp_dntcp_is_current_url_excluded() )
+            return;
 
         $missing_in_url = ($lang_from_url === null);

translatepress-multilingual/tags/3.0.6/includes/class-languages.php

@@ -41 +41 @@
      */
     public function change_locale( $locale ){
-
-        if ( $this->is_string_translation_request_for_different_language() ){
-            $trp_ajax_language = (isset($_POST['trp_ajax_language']) ) ? sanitize_text_field( $_POST['trp_ajax_language'] ) : '';
-            if ( !$this->settings ){
-                $trp = TRP_Translate_Press::get_trp_instance();
-                $trp_settings = $trp->get_component( 'settings' );
-                $this->settings = $trp_settings->get_settings();
-            }
-            if ( $trp_ajax_language && in_array( $trp_ajax_language, $this->settings['translation-languages'] ) ){
-                return $trp_ajax_language;
-            }
-        }
-
         if ( $this->is_admin_request === null ){
             $trp = TRP_Translate_Press::get_trp_instance();
@@ -70 +57 @@
         return $locale;
     }
-
-    public function is_string_translation_request_for_different_language(){
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-            $action = 'trp_string_translation_get_missing_gettext_strings';
-            if ( isset( $_POST['action'] ) && $_POST['action'] === $action ) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     /**

translatepress-multilingual/tags/3.0.6/includes/class-machine-translator.php

@@ -48 +48 @@
      * @return bool
      */
-    public function is_available( $languages = array() ){
-        if( !empty( $this->settings['trp_machine_translation_settings']['machine-translation'] ) &&
-            $this->settings['trp_machine_translation_settings']['machine-translation'] == 'yes'
-        ) {
-            if ( empty( $languages ) ){
-                // can be used to simply know if machine translation is available
+    public function is_available( $languages = array() ) {
+        /**
+         * Return false in case it was directly called from parent and not from a derived class (DeepL / Google / TPAI)
+         * Calling this method on the parent class means it was called too early and machine translation is not available at this point
+         */
+        if ( get_class( $this ) === __CLASS__ )
+            return false;
+
+        $settings = $this->settings['trp_machine_translation_settings'] ?? array();
+        $enabled  = ( $settings['machine-translation'] ?? '' ) === 'yes';
+        $is_available = false;
+
+        if ( $enabled ) {
+            $engine = $settings['translation-engine'] ?? null;
+
+            if ( $engine === 'deepl' && get_option( 'trp_license_status' ) !== 'valid' ) {
+                $is_available = false;
+            } elseif ( empty( $languages ) ) {
                 $is_available = true;
-            }
-
-            // If the license is invalid and the translation engine is DeepL,return false
-            $license_status = get_option( 'trp_license_status' );
-            if ( $license_status !== 'valid' && isset( $this->settings['trp_machine_translation_settings']['translation-engine'] ) && $this->settings['trp_machine_translation_settings']['translation-engine'] === 'deepl' ) {
-                $is_available = false;
-            }
-
-            $is_available = $this->check_languages_availability($languages);
-
-        }else {
-            $is_available = false;
-        }
-
-        return apply_filters('trp_machine_translator_is_available', $is_available);
+            } else {
+                $is_available = $this->check_languages_availability( $languages );
+            }
+        }
+
+        return apply_filters( 'trp_machine_translator_is_available', $is_available, $languages, $settings );
     }
 

translatepress-multilingual/tags/3.0.6/includes/class-settings.php

@@ -329 +329 @@
 
         unset($settings['translation-languages-formality']);
+
+        $trp = TRP_Translate_Press::get_trp_instance();
+        $language_switcher_tab = $trp->get_component('language_switcher_tab');
+
+        if ( !$language_switcher_tab->is_legacy_enabled() && count( $settings['publish-languages'] ) > 2 ) {
+            $ls_settings     = $language_switcher_tab->get_initial_config();
+            $new_ls_settings = $ls_settings;
+
+            $new_ls_settings['floater']['oppositeLanguage']   = false;
+            $new_ls_settings['shortcode']['oppositeLanguage'] = false;
+
+            if ( $new_ls_settings !== $ls_settings ){
+                update_option( 'trp_language_switcher_settings', $new_ls_settings );
+            }
+        }
 
         // check for duplicates in url slugs

translatepress-multilingual/tags/3.0.6/includes/class-translation-render.php

@@ -1020 +1020 @@
             $translated_strings_manual = array();
             foreach ( $translateable_strings_manual as $i => $string_manual ) {
-                if ( isset( $translated_strings_manual_dictionary[ $string_manual ]->translated ) ) {
+                if ( isset( $translated_strings_manual_dictionary[ $string_manual ]->translated ) && !empty( $translated_strings_manual_dictionary[ $string_manual ]->translated )) {
                     $translated_strings_manual[$i] = $translated_strings_manual_dictionary[ $string_manual ]->translated;
                 }
@@ -1686 +1686 @@
 
         foreach ( $translateable_strings as $i => $string ) {
-
+            if ( isset( $dictionary[ $string ]->translated ) && empty( $dictionary[ $string ]->translated ) ) {
+                /* If we have an empty string with a status != NOT TRANSLATED, it's possible we are dealing with
+                 * an intentional thing. After Automatic translation, a text can be translated with unallowed html
+                 * thus being stored in DB as empty string with status = MACHINE TRANSLATED. By doing continue; we avoid
+                 * re-autotranslating over and over again.
+                 */
+                continue;
+            }
             // prevent accidentally machine translated strings from db such as for src to be displayed
             $skip_string = in_array( $string, $skip_machine_translating_strings );
@@ -1763 +1770 @@
 
             if ( !isset($translated_strings[$i]) && isset( $machine_strings[$string] ) ) {
-                $translated_strings[$i] = $machine_strings[$string];
+                $sanitized_machine_string = trp_sanitize_string( $machine_strings[$string] );
+                if ( !empty( $sanitized_machine_string ) ){
+                    // Unallowed HTML can be turned into empty string. Show original text instead
+                    $translated_strings[$i] = $sanitized_machine_string;
+                }
             }
 
@@ -2080 +2091 @@
      * @return array
      */
-    public function wp_mail_filter( $args ){
-        if ( !is_array( $args ) ){
+    public function wp_mail_filter( $args ) {
+        if ( ! is_array( $args ) ) {
             return $args;
         }
 
-        $whitelisted_shortcodes = apply_filters( 'trp_whitelisted_shortcodes_for_wp_mail', [ 'trp_language', 'language-include', 'language-exclude' ] );
-
-        if ( array_key_exists( 'subject', $args ) ){
-            $args['subject'] = $this->translate_page( trp_do_these_shortcodes( $args['subject'], $whitelisted_shortcodes ) );
-        }
-
-        if ( array_key_exists( 'message', $args ) ){
-            $args['message'] = $this->translate_page( trp_do_these_shortcodes( $args['message'], $whitelisted_shortcodes ) );
-        }
+        if ( empty( $args['to'] ) ) {
+            return $args;
+        }
+
+        global $TRP_LANGUAGE;
+
+        $initial_language = $TRP_LANGUAGE;
+
+        $recipient = $args['to'];
+
+        // Normalize $recipient to a single email string (first recipient only - that's the main one)
+        if ( is_array( $recipient ) ) {
+            $first = reset( $recipient );
+            $recipient = is_string( $first ) ? $first : '';
+        }
+
+        $recipient = (string) $recipient;
+
+        // Keep only the first comma-separated entry if multiple are present in the string
+        $recipient = trim( strtok( $recipient, ',' ) );
+
+        if ( $recipient !== '' ) {
+            trp_switch_to_preffered_language( $recipient );
+        }
+
+        $whitelisted_shortcodes = apply_filters(
+            'trp_whitelisted_shortcodes_for_wp_mail',
+            array( 'trp_language', 'language-include', 'language-exclude' )
+        );
+
+        if ( array_key_exists( 'subject', $args ) ) {
+            $args['subject'] = $this->translate_page(
+                trp_do_these_shortcodes( $args['subject'], $whitelisted_shortcodes )
+            );
+        }
+
+        if ( array_key_exists( 'message', $args ) ) {
+            $args['message'] = $this->translate_page(
+                trp_do_these_shortcodes( $args['message'], $whitelisted_shortcodes )
+            );
+        }
+
+        // Switch back to the language used initially
+        $TRP_LANGUAGE = $initial_language;
 
         return $args;

translatepress-multilingual/tags/3.0.6/includes/class-woocommerce-emails.php

@@ -187 +187 @@
         }
 
+        $trp_settings = TRP_Translate_Press::get_trp_instance()->get_component( 'settings' );
+        $settings     = $trp_settings->get_settings();
+
+        $default_language = $settings["default-language"];
+
         /**
          * At this point in the execution, $wc_email->get_recipient() returns null and throws a PHP warning inside WooCommerce /woocommerce/includes/emails/class-wc-email.php
@@ -224 +229 @@
                 $registered_user = get_user_by( 'email', $recipients[0] );
                 if( $registered_user ){
-                    // If language is set to site default, user object won't have a locale set. Fallback to WPLANG. In case WPLANG is not set either, fallback to trp_language
+                    // If language is set to site default, user object won't have a locale set. Fallback to WPLANG. In case WPLANG is not set either, fallback to default language
                     if ( !empty( $registered_user->locale ) ){
                         $language = $registered_user->locale;
                     } else {
-                        $language = get_option( 'WPLANG' ) ?? get_user_meta( $registered_user->ID, 'trp_language', true );
+                        $wplang = get_option( 'WPLANG' );
+                        $language = !empty( $wplang ) ? $wplang : $default_language;
                     }
                 } else {
@@ -243 +249 @@
         trp_switch_language( $language );
 
-        WC()->load_plugin_textdomain();
-
-        $this->bootstrap_trp_gettext_for_email_language( $language );
+        add_filter( 'trp_allow_gettext_write', '__return_true' );
+
+        $this->reload_woocommerce_textdomain();
+
+        $this->bootstrap_trp_gettext_for_emails();
 
         // calls necessary because the default additional_content field of an email is localized before this point and stored in a variable in the previous locale
@@ -264 +272 @@
 
         trp_restore_language();
-        WC()->load_plugin_textdomain();
+        $this->reload_woocommerce_textdomain();
 
         return false;
@@ -289 +297 @@
      * gettext translations stored in TranslatePress are applied correctly.
      */
-    private function bootstrap_trp_gettext_for_email_language( $language ) {
+    private function bootstrap_trp_gettext_for_emails() {
         $trp             = TRP_Translate_Press::get_trp_instance();
         $gettext_manager = $trp->get_component( 'gettext_manager' );
@@ -308 +316 @@
     }
 
+    function reload_woocommerce_textdomain() {
+        $domain = 'woocommerce';
+
+        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+
+        $custom_translation_path  = WP_LANG_DIR . '/woocommerce/woocommerce-' . $locale . '.mo';
+        $global_translation_path  = WP_LANG_DIR . '/plugins/woocommerce-' . $locale . '.mo';
+        $bundled_translation_path = trailingslashit( WC()->plugin_path() ) . 'i18n/languages/woocommerce-' . $locale . '.mo';
+
+        unload_textdomain( $domain );
+
+        // Custom file present: mimic WC
+        if ( is_readable( $custom_translation_path ) ) {
+            load_textdomain( $domain, $custom_translation_path );
+
+            if ( is_readable( $global_translation_path ) ) {
+                load_textdomain( $domain, $global_translation_path );
+            }
+
+            return true;
+        }
+
+        if ( is_readable( $global_translation_path ) ) {
+            load_textdomain( $domain, $global_translation_path );
+            return true;
+        }
+
+        if ( is_readable( $bundled_translation_path ) ) {
+            load_textdomain( $domain, $bundled_translation_path );
+            return true;
+        }
+
+        return false;
+    }
+
 }

translatepress-multilingual/tags/3.0.6/includes/compatibility-functions.php

@@ -2709 +2709 @@
 
 /**
- * Override the wrap_with_post_id condition for Divi
- *
- * Divi doesn't use the main loop in the traditional way, so we need to override
- * the condition that checks for in_the_loop and is_main_query.
- *
- * @param bool $return Whether to bypass the wrap condition
- * @return bool
- */
-add_filter('trp_wrap_with_post_id_overrule', 'trp_divi_override_wrap_condition', 10);
-function trp_divi_override_wrap_condition($return) {
-    // Check if Divi is the active theme
-    if (function_exists('et_setup_theme')) {
-        // Return false to bypass the in_the_loop check
-        return false;
-    }
-    return $return;
-}
+ * Add trp-post-container wrapper to Divi module outputs
+ * TP is not adding any trp-post-container except here.
+ *
+ * @param string $output The module HTML output
+ * @param string $render_slug The module slug (e.g., 'et_pb_text', 'et_pb_post_title')
+ * @param object $module The module object
+ * @return string Modified output with trp-post-container wrapper
+ */
+add_filter('et_module_shortcode_output', 'trp_divi_wrap_module_with_post_id', 10, 3);
+
+function trp_divi_wrap_module_with_post_id($output, $render_slug, $module) {
+    global $post, $TRP_LANGUAGE;
+
+    // Check if we have a valid post ID
+    if (empty($post->ID)) {
+        return $output;
+    }
+
+    // Get TranslatePress settings
+    $trp = TRP_Translate_Press::get_trp_instance();
+    $trp_settings = $trp->get_component('settings');
+    $settings = $trp_settings->get_settings();
+
+    // Only wrap on non-default language
+    if ($TRP_LANGUAGE !== $settings['default-language']) {
+        // Only wrap modules that typically contain translatable text content
+        $modules_to_wrap = apply_filters('trp_divi_modules_to_wrap', array(
+            'et_pb_text',
+            'et_pb_post_title',
+            'et_pb_post_content',
+            'et_pb_blurb',
+            'et_pb_cta',
+            'et_pb_accordion',
+            'et_pb_toggle',
+            'et_pb_tabs',
+            'et_pb_testimonial',
+            'et_pb_pricing_tables',
+            'et_pb_number_counter',
+            'et_pb_countdown_timer'
+        ));
+
+        if (in_array($render_slug, $modules_to_wrap)) {
+            $output = "<trp-post-container data-trp-post-id='" . $post->ID . "'>" . $output . "</trp-post-container>";
+        }
+    }
+
+    return $output;
+}

translatepress-multilingual/tags/3.0.6/includes/external-functions.php

@@ -64 +64 @@
     }
 
-    if ( strip_tags( $string ) === '' || trim ($string, $filter_string) === '' ){
-        $string = '';
-    }
+    if ( strip_tags( $string ) === '' || trim( $string, $filter_string ) === '' ) {
+        // Needs decoding otherwise some strings with special characters won't get detected.
+        // Example in Hebrew: אוכל ותרבות
+        // Placed inside the "if" to avoid calling html_entity_decode so often as this is a very used function
+        $decoded_string = html_entity_decode( $string );
+        if ( trim( $decoded_string, $filter_string ) === '' ) {
+            $string = '';
+        }
+    }
     return $string;
 }

translatepress-multilingual/tags/3.0.6/includes/functions.php

@@ -274 +274 @@
         return $string;
 
-    if (seems_utf8($string)) {
+    $seems_utf = ( function_exists( 'wp_is_valid_utf8' ) ) ? wp_is_valid_utf8( $string ) : seems_utf8( $string );
+
+    if ( $seems_utf ) {
         $chars = array(
             // Decompositions for Latin-1 Supplement
@@ -821 +823 @@
 
 /**
+ * Switch to a user's preferred language based on the recipient email.
+ *
+ * For managerial users (admin-like roles), prefer user->locale with fallback
+ * to WPLANG, then trp_language.
+ *
+ * For non-managerial users, prefer trp_language, with fallback to locale, then WPLANG.
+ *
+ * @param string $email
+ * @return void
+ */
+function trp_switch_to_preffered_language( $email ) {
+    $email = trim( (string) $email );
+
+    if ( $email === '' )
+        return;
+
+    $user = get_user_by( 'email', $email );
+
+    if ( ! ( $user instanceof WP_User ) )
+        return;
+
+    $user_roles = is_array( $user->roles ) ? $user->roles : array();
+
+    $trp_settings = TRP_Translate_Press::get_trp_instance()->get_component( 'settings' );
+    $settings     = $trp_settings->get_settings();
+
+    $default_language = $settings["default-language"];
+
+    /**
+     * Roles considered "managerial" for email language purposes.
+     *
+     * @param string[] $roles
+     */
+    $managerial_roles = apply_filters(
+        'trp_managerial_roles_for_email_language',
+        [ 'administrator', 'editor', 'shop_manager' ]
+    );
+
+    $is_managerial = !empty( array_intersect( $managerial_roles, $user_roles ) );
+
+    if ( $is_managerial ) {
+        // Managerial: prefer locale, then WPLANG, then default_language
+        if ( !empty( $user->locale ) ) {
+            $language = $user->locale;
+        } else {
+            $wplang = get_option( 'WPLANG' );
+            $language = !empty( $wplang ) ? $wplang : $default_language;
+        }
+    } else {
+        // Non-managerial: prefer trp_language.
+        $language = get_user_meta( $user->ID, 'trp_language', true );
+
+        if ( empty( $language ) ) {
+            if ( !empty( $user->locale ) ) {
+                $language = $user->locale;
+            } else {
+                $wplang = get_option( 'WPLANG' );
+                $language = !empty( $wplang ) ? $wplang : $default_language;
+            }
+        }
+    }
+
+    if ( empty( $language ) )
+        return;
+
+    trp_switch_language( $language );
+}
+
+/**
  * Return $TRP_LANGUAGE as plugin locale
  *

translatepress-multilingual/tags/3.0.6/includes/gettext/class-gettext-manager.php

@@ -488 +488 @@
      */
     public function add_missing_language_file_translations( $dictionary, $language ) {
-
-        $trp_plural_forms    = $this->get_gettext_component( 'plural_forms' );
+        // Ensure translation files are loaded with the correct locale
+        $locale   = determine_locale();
+        $switched = switch_to_locale( $language );
+
+        // This means that the language is not supported by WordPress. Either a custom language or a language that we support but WordPress does not.
+        if ( !$switched && $language !== $locale )
+            return;
+
+        $trp_plural_forms    = $this->get_gettext_component( 'plural_forms' );
         if ( ! $this->trp_query ) {
             $trp             = TRP_Translate_Press::get_trp_instance();
@@ -611 +618 @@
             $gettext_insert_update->insert_gettext_strings($insert_gettext_strings, $language);
             $gettext_insert_update->update_gettext_strings($update_gettext_strings, $language, array('translated', 'id', 'status'));
+
+            if ( $switched )
+                restore_previous_locale();
         }
     }

translatepress-multilingual/tags/3.0.6/includes/queries/class-query.php

@@ -97 +97 @@
             $and_block_type = " AND block_type = " . $block_type;
         }
-        $query = "SELECT original,translated, status FROM `" . sanitize_text_field( $this->get_table_name( $language_code ) ) . "` WHERE status != " . self::NOT_TRANSLATED . $and_block_type . " AND translated <>'' AND original IN ";
+
+        /* Do not add a condition for "translated <> '' because this would cause re-autotranslating. */
+        $query = "SELECT original,translated, status FROM `" . sanitize_text_field( $this->get_table_name( $language_code ) ) . "` WHERE status != " . self::NOT_TRANSLATED . $and_block_type . " AND original IN ";
 
         $placeholders = array();
@@ -108 +110 @@
         $query .= "( " . implode ( ", ", $placeholders ) . " )";
         $prepared_query = $this->db->prepare( $query, $values );
-        $dictionary = $this->db->get_results( $prepared_query, OBJECT_K  );
-
+        $results = $this->db->get_results( $prepared_query, OBJECT  );
+
+        if ( !empty( $results ) && is_array( $results ) ) {
+            // There are edge cases where we have 2 results for the same original:
+            // one with translated as empty string, one with non-empty translation. Keep the one with translation.
+            $dictionary = [];
+            foreach ( $results as $row ) {
+                $key = $row->original;
+
+                // If this key has never been added, simply add it
+                if ( !isset( $dictionary[ $key ] ) ) {
+                    $dictionary[ $key ] = $row;
+                    continue;
+                }
+
+                // If current stored entry has empty 'translated'
+                // and this new row has non-empty 'translated', replace it
+                if (
+                    empty( $dictionary[ $key ]->translated ) &&
+                    !empty( $row->translated )
+                ) {
+                    $dictionary[ $key ] = $row;
+                }
+
+                // Otherwise do nothing — we keep the existing "better" record
+            }
+        } else {
+            $dictionary = $results;
+        }
 
 

translatepress-multilingual/tags/3.0.6/index.php

@@ -4 +4 @@
 Plugin URI: https://translatepress.com/
 Description: Experience a better way of translating your WordPress site using a visual front-end translation editor, with full support for WooCommerce and site builders.
-Version: 3.0.5
+Version: 3.0.6
 Author: Cozmoslabs, Razvan Mocanu, Madalin Ungureanu, Cristophor Hurduban
 Author URI: https://cozmoslabs.com/
@@ -11 +11 @@
 License: GPL2
 WC requires at least: 2.5.0
-WC tested up to: 10.3.5
+WC tested up to: 10.4.2
 
 == Copyright ==

translatepress-multilingual/tags/3.0.6/languages/translatepress-multilingual.pot

@@ -7 +7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-11-26 15:19+0000\n"
+"POT-Creation-Date: 2025-12-15 11:13+0000\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
@@ -319 +319 @@
 msgstr ""
 
-#: includes/class-language-switcher-v2.php:718
+#: includes/class-language-switcher-v2.php:720
 msgid "Change language to %s"
 msgstr ""
@@ -347 +347 @@
 msgstr ""
 
-#: includes/class-machine-translator.php:154, includes/google-translate/class-google-translate-v2-machine-translator.php:200
+#: includes/class-machine-translator.php:157, includes/google-translate/class-google-translate-v2-machine-translator.php:200
 msgid "Please enter your Google Translate key."
 msgstr ""
 
-#: includes/class-machine-translator.php:169, add-ons-pro/deepl/includes/class-deepl-machine-translator.php:365
+#: includes/class-machine-translator.php:172, add-ons-pro/deepl/includes/class-deepl-machine-translator.php:365
 msgid "Please enter your DeepL API key."
 msgstr ""
@@ -567 +567 @@
 msgstr ""
 
-#: includes/class-settings.php:471
+#: includes/class-settings.php:486
 msgid "Language codes can contain only A-Z a-z 0-9 - _ characters. Check your language codes in TranslatePress General Settings."
 msgstr ""
 
-#: includes/class-settings.php:534
+#: includes/class-settings.php:549
 msgid "Error! Duplicate URL slug values."
 msgstr ""
 
-#: includes/class-settings.php:535
+#: includes/class-settings.php:550
 msgid "You cannot select two languages that have the same <a href=\"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes\" target=\"_blank\">iso code</a> but different formalities because doing so will lead to duplicate <a href=\"https://developers.google.com/search/docs/specialty/international/localized-versions\" target=\"_blank\">hreflang tags</a>."
 msgstr ""
 
-#: includes/class-settings.php:536
+#: includes/class-settings.php:551
 msgid "Duplicate language detected.<br>Each language can only be added once to ensure accurate translation management.<br> Please change the duplicate language entry and try again. "
 msgstr ""
 
-#: includes/class-settings.php:593
+#: includes/class-settings.php:608
 msgid "Current Language"
 msgstr ""
 
-#: includes/class-settings.php:599
+#: includes/class-settings.php:614
 msgid "Opposite Language"
 msgstr ""
 
-#: includes/class-settings.php:639
+#: includes/class-settings.php:654
 msgid "General"
 msgstr ""
 
-#: includes/class-settings.php:644, includes/class-translation-manager.php:540, add-ons-pro/translator-accounts/includes/class-translator-accounts.php:156
+#: includes/class-settings.php:659, includes/class-translation-manager.php:540, add-ons-pro/translator-accounts/includes/class-translator-accounts.php:156
 msgid "Translate Site"
 msgstr ""
 
-#: includes/class-settings.php:649
+#: includes/class-settings.php:664
 msgid "Addons"
 msgstr ""
 
-#: includes/class-settings.php:657
+#: includes/class-settings.php:672
 msgid "License"
 msgstr ""
 
-#: includes/class-settings.php:701, includes/class-translation-manager.php:572
+#: includes/class-settings.php:716, includes/class-translation-manager.php:572
 msgid "Settings"
 msgstr ""
 
-#: includes/class-settings.php:715, partials/license-settings-page.php:29, includes/onboarding/class-autotranslation.php:169, includes/onboarding/class-license.php:131
+#: includes/class-settings.php:730, partials/license-settings-page.php:29, includes/onboarding/class-autotranslation.php:169, includes/onboarding/class-license.php:131
 msgid "Activate License"
 msgstr ""
 
-#: includes/class-settings.php:707
+#: includes/class-settings.php:722
 msgid "Pro Features"
 msgstr ""

translatepress-multilingual/tags/3.0.6/readme.txt

@@ -4 +4 @@
 Tags: translate, translation, multilingual, automatic translation, bilingual, front-end translation, google translate, language
 Requires at least: 3.1.0
-Tested up to: 6.8.3
+Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 3.0.5
+Stable tag: 3.0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -143 +143 @@
 
 == Changelog ==
-= 3.0.5 =
-* Fixed CSS for Black Friday offer from admin notice
-
-= 3.0.4 =
-* Added 39 more languages including Irish, Maltese and Sicilian
-* Added support for Latin American Spanish automatic translation in TranslatePress AI
-* Added support for Divi search in secondary language
-* Added support for exact match search in String Translation by placing the string in quotes: "example"
-* Allow schema.org data to be translated
-* Fixed Regular String Translation search so filtered languages also match terms appearing in the middle of translated strings, not only at the start
-* Prevent automatic translation of strings that are 0 or 1 characters long or strings that are punctuation only
-* Change background hover color for transparent preset in order to improve contrast of language switcher
-* Fixed two missing spaces in floating switcher HTML markup
-* Fix PHP warning with empty domain for gettext with context
-* Fixed edge case error "call to a member function is_available() on null"
-* Moved the "Automatically Translate Slug" setting to be first in line
-* Extended the license message for item_name_mismatch to provide more context
-* Improved text information next to the default language
-
+= 3.0.6 =
+* Extended support for Divi search in secondary languages
+* Fixed redirect loop bug with excluded paths from translation
+* Fixed incorrect gettext resolution in string translation when the site locale differed from the default TranslatePress language, which caused untranslated gettext entries to be populated using translations from the wrong locale
+* Fixed edge case of retranslating the same text multiple times
+* Fixed not detecting texts containing only certain special characters
+* Fixed bug where mini cart menu widget doesn't respect language change
+* Fixed edge case error "Call to a member function is_available() on null"
+* Send emails in recipient's preferred language, in case the recipient is a user
+* Improved INP by deferring dynamic translation detection when original content can be shown first
+* Fixed a bug where the floating language switcher was not displaying all languages (if more than 10 were added and animations disabled)
+* Disable language switcher show opposite language settings in case more than 2 languages are active
+* Fixed deprecated notice for seems_utf8 function on WP 6.9
 
 = Older versions =

translatepress-multilingual/trunk/assets/js/trp-frontend-compatibility.js

@@ -3 +3 @@
 
         // clear WooCommerce cart fragments when switching language
-        var trp_language_switcher_urls = document.querySelectorAll(".trp-language-switcher-container a:not(.trp-ls-disabled-language)");
+        var trp_language_switcher_urls = document.querySelectorAll(".trp-language-switcher-container a:not(.trp-ls-disabled-language), .trp-language-item:not(.trp-language-item__current)");
 
         for (i = 0; i < trp_language_switcher_urls.length; i++) {

translatepress-multilingual/trunk/assets/js/trp-frontend-language-switcher.js

@@ -35 +35 @@
     }
 
+    /**
+     * Returns true if the list has a non-zero transition duration (for any property).
+     * We use this to decide whether to rely on `transitionend` or fall back to sync behavior.
+     */
+    _hasAnimatedTransition() {
+        if (!this.list) return false;
+
+        const cs = getComputedStyle(this.list);
+        const durationsRaw = cs.transitionDuration || '';
+
+        if (!durationsRaw) return false;
+
+        const durations = durationsRaw
+            .split(',')
+            .map(str => parseFloat(str) || 0);
+
+        return durations.some(d => d > 0);
+    }
+
     collapse() {
         this.list.hidden = true;
@@ -66 +85 @@
     }
 
-    setOpen(open, { source = null } = {}) {
-        if (!this.root || !this.list || open === this.isOpen) return;
-
-        // Honor reduced motion: skip the transition entirely (still class-driven)
+    setOpen( open, { source = null } = {} ) {
+        if ( !this.root || !this.list || open === this.isOpen ) return;
+
         const prefersReduced = window.matchMedia?.('(prefers-reduced-motion: reduce)')?.matches;
+        const hasTransition  = !prefersReduced && this._hasAnimatedTransition();
 
         this.isOpen = open;
 
-        if (open) {
-            // Prepare: must be visible for CSS transition to run
+        // No transitions (0s duration) OR reduced motion: do everything synchronously,
+        if ( !hasTransition ) {
+            if ( open ) {
+                this.list.hidden = false;
+                this.list.removeAttribute( 'inert' );
+                this.setExpanded( true );
+
+                this._pendingFocusOnOpen = ( source?.type === 'keydown' );
+                if ( this._pendingFocusOnOpen ) {
+                    this._pendingFocusOnOpen = false;
+                    const first = this.list.querySelector(
+                        '[role="option"], a, button, [tabindex]:not([tabindex="-1"])'
+                    );
+                    first?.focus?.({ preventScroll: true });
+                }
+            } else {
+                this.setExpanded( false );
+                this.list.hidden = true;
+                this.list.setAttribute( 'inert', '' );
+                this._pendingFocusOnOpen = false;
+            }
+            return;
+        }
+
+        // Animated path: rely on transitionend to remove .is-transitioning
+        if ( open ) {
+            // Must be visible for CSS transition to run
             this.list.hidden = false;
-            this.list.removeAttribute('inert');
-
-            if (prefersReduced) {
-                this.root.classList.remove('is-transitioning');
-                this.setExpanded(true);
-            } else {
-                this.root.classList.add('is-transitioning');
-                // Next frame so the browser registers the pre-open (max-height:0) state
-                requestAnimationFrame(() => this.setExpanded(true));
-            }
-
-            // keyboard open should move focus after transition completes
-            this._pendingFocusOnOpen = (source?.type === 'keydown');
-
+            this.list.removeAttribute( 'inert' );
+
+            this._pendingFocusOnOpen = ( source?.type === 'keydown' );
+
+            this.root.classList.add( 'is-transitioning' );
+            // Next frame so browser registers pre-open (max-height: 0) state
+            requestAnimationFrame( () => this.setExpanded( true ) );
         } else {
-            if (prefersReduced){
-                this.root.classList.add( 'is-transitioning' );
-            }
-
-            this.setExpanded(false);
+            this.root.classList.add( 'is-transitioning' );
+            this.setExpanded( false );
         }
     }

translatepress-multilingual/trunk/assets/js/trp-translate-dom-changes.js

@@ -468 +468 @@
 
         // create an observer instance
-        observer = new MutationObserver( _this.detect_new_strings_callback );
+        if ( trp_data['showdynamiccontentbeforetranslation'] === true ){
+            observer = new MutationObserver(mutations => {
+                setTimeout(() => _this.detect_new_strings_callback(mutations), 0);
+            });
+        }
+
+        else {
+            observer = observer = new MutationObserver(_this.detect_new_strings_callback)
+        }
 
         _this.resume_observer();

translatepress-multilingual/trunk/changelog.txt

@@ +1 @@
+= 3.0.5 =
+* Fixed CSS for Black Friday offer from admin notice
+
+= 3.0.4 =
+* Added 39 more languages including Irish, Maltese and Sicilian
+* Added support for Latin American Spanish automatic translation in TranslatePress AI
+* Added support for Divi search in secondary language
+* Added support for exact match search in String Translation by placing the string in quotes: "example"
+* Allow schema.org data to be translated
+* Fixed Regular String Translation search so filtered languages also match terms appearing in the middle of translated strings, not only at the start
+* Prevent automatic translation of strings that are 0 or 1 characters long or strings that are punctuation only
+* Change background hover color for transparent preset in order to improve contrast of language switcher
+* Fixed two missing spaces in floating switcher HTML markup
+* Fix PHP warning with empty domain for gettext with context
+* Fixed edge case error "call to a member function is_available() on null"
+* Moved the "Automatically Translate Slug" setting to be first in line
+* Extended the license message for item_name_mismatch to provide more context
+* Improved text information next to the default language
+
 = 3.0.3 =
 * Fixed an issue introduced in the previous update that occurred when using Google Translate as the translation engine

translatepress-multilingual/trunk/class-translate-press.php

@@ -68 +68 @@
      */
     public function __construct() {
+        // Early bind to break recursion loop caused by calling get_trp_instance during construction
+        if ( self::$translate_press === null ) {
+            self::$translate_press = $this;
+        }
+
         define( 'TRP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
         define( 'TRP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
         define( 'TRP_PLUGIN_BASE', plugin_basename( __DIR__ . '/index.php' ) );
         define( 'TRP_PLUGIN_SLUG', 'translatepress-multilingual' );
-        define( 'TRP_PLUGIN_VERSION', '3.0.5' );
+        define( 'TRP_PLUGIN_VERSION', '3.0.6' );
 
         wp_cache_add_non_persistent_groups(array('trp'));
@@ -103 +108 @@
         require_once TRP_PLUGIN_DIR . 'includes/class-editor-api-regular-strings.php';
         require_once TRP_PLUGIN_DIR . 'includes/class-editor-api-gettext-strings.php';
-        require_once TRP_PLUGIN_DIR . 'includes/class-translation-manager.php';
         require_once TRP_PLUGIN_DIR . 'includes/class-hooks-loader.php';
         require_once TRP_PLUGIN_DIR . 'includes/class-languages.php';
@@ -180 +184 @@
         $this->query                      = new TRP_Query( $this->settings->get_settings() );
         $this->machine_translator_logger  = new TRP_Machine_Translator_Logger( $this->settings->get_settings() );
+        $this->machine_translator         = new TRP_Machine_Translator( $this->settings->get_settings() ); // Will be overwritten in init_machine_translation with the actual machine translator class. Use this as replacement until then.
         $this->translation_manager        = new TRP_Translation_Manager( $this->settings->get_settings() );
         $this->editor_api_regular_strings = new TRP_Editor_Api_Regular_Strings( $this->settings->get_settings() );

translatepress-multilingual/trunk/includes/advanced-settings/do-not-translate-certain-paths.php

@@ -490 +490 @@
     return $excluded;
 }
+
+/**
+ * Check if the current URL is excluded from translation based on the
+ * "Do not translate certain paths" / "Translate only certain paths" setting.
+ *
+ * Takes into account:
+ *  - site installed in subdirectory
+ *  - "Use a subdirectory for the default language"
+ *  - {{home}} mapping
+ *  - both "exclude" and "include" modes
+ *
+ * @return bool True if the current URL should be treated as excluded from translation.
+ */
+function trp_dntcp_is_current_url_excluded() {
+    if ( is_admin() ) {
+        return false;
+    }
+
+    $settings          = get_option( 'trp_settings', false );
+    $advanced_settings = get_option( 'trp_advanced_settings', false );
+
+    // No configuration -> nothing is excluded.
+    if ( empty( $advanced_settings )
+        || ! isset( $advanced_settings['translateable_content'] )
+        || empty( $advanced_settings['translateable_content']['paths'] )
+        || empty( $advanced_settings['translateable_content']['option'] ) ) {
+        return false;
+    }
+
+    $mode  = $advanced_settings['translateable_content']['option']; // 'exclude' or 'include'
+    $paths = trp_dntcp_get_paths();
+
+    // Build current slug in the same way as trp_exclude_include_paths_to_run_on()
+    $trp           = TRP_Translate_Press::get_trp_instance();
+    $url_converter = $trp->get_component( 'url_converter' );
+
+    $current_lang = $url_converter->get_lang_from_url_string( $url_converter->cur_page_url() );
+    if ( empty( $current_lang ) && isset( $settings['default-language'] ) ) {
+        $current_lang = $settings['default-language'];
+    }
+
+    $site_url_components = parse_url( get_home_url() );
+    $current_slug        = isset( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( $_SERVER['REQUEST_URI'] ) : '';
+
+    // Remove site_url path for installs in subdirectories (e.g. http://localhost/wordpress)
+    if ( isset( $site_url_components['path'] ) && $site_url_components['path'] !== '' ) {
+        $current_slug = str_replace( trim( $site_url_components['path'] ), '', $current_slug );
+    }
+
+    // Take into account subdirectory for the default language or other languages.
+    // This mirrors the logic used in trp_exclude_include_paths_to_run_on().
+    if ( isset( $settings['add-subdirectory-to-default-language'] )
+        && $settings['add-subdirectory-to-default-language'] === 'yes'
+        && ! empty( $current_lang )
+        && isset( $settings['url-slugs'][ $current_lang ] ) ) {
+
+        $replace      = '\/' . $settings['url-slugs'][ $current_lang ];
+        $current_slug = preg_replace( "/$replace/i", '', ltrim( $current_slug, '/' ), 1 );
+    }
+
+    $array_slugs = array();
+    trp_test_current_slug( $current_slug, $array_slugs );
+
+    $matched = trp_return_exclude_include_url( $paths, $current_slug, $array_slugs );
+
+    // In "exclude" mode: listed paths are excluded.
+    if ( $mode === 'exclude' )
+        return (bool) $matched;
+
+    // In "include" mode: ONLY listed paths are translatable; all others are excluded
+    if ( $mode === 'include' )
+        return !$matched;
+
+    return false;
+}

translatepress-multilingual/trunk/includes/class-language-switcher-v2.php

@@ -130 +130 @@
 
         $allow = apply_filters('trp_allow_language_redirect', true, $needed_lang, $this->url_converter->cur_page_url());
-        if (!$allow) return;
+
+        if ( !$allow || trp_dntcp_is_current_url_excluded() )
+            return;
 
         $missing_in_url = ($lang_from_url === null);

translatepress-multilingual/trunk/includes/class-languages.php

@@ -41 +41 @@
      */
     public function change_locale( $locale ){
-
-        if ( $this->is_string_translation_request_for_different_language() ){
-            $trp_ajax_language = (isset($_POST['trp_ajax_language']) ) ? sanitize_text_field( $_POST['trp_ajax_language'] ) : '';
-            if ( !$this->settings ){
-                $trp = TRP_Translate_Press::get_trp_instance();
-                $trp_settings = $trp->get_component( 'settings' );
-                $this->settings = $trp_settings->get_settings();
-            }
-            if ( $trp_ajax_language && in_array( $trp_ajax_language, $this->settings['translation-languages'] ) ){
-                return $trp_ajax_language;
-            }
-        }
-
         if ( $this->is_admin_request === null ){
             $trp = TRP_Translate_Press::get_trp_instance();
@@ -70 +57 @@
         return $locale;
     }
-
-    public function is_string_translation_request_for_different_language(){
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-            $action = 'trp_string_translation_get_missing_gettext_strings';
-            if ( isset( $_POST['action'] ) && $_POST['action'] === $action ) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     /**

translatepress-multilingual/trunk/includes/class-machine-translator.php

@@ -48 +48 @@
      * @return bool
      */
-    public function is_available( $languages = array() ){
-        if( !empty( $this->settings['trp_machine_translation_settings']['machine-translation'] ) &&
-            $this->settings['trp_machine_translation_settings']['machine-translation'] == 'yes'
-        ) {
-            if ( empty( $languages ) ){
-                // can be used to simply know if machine translation is available
+    public function is_available( $languages = array() ) {
+        /**
+         * Return false in case it was directly called from parent and not from a derived class (DeepL / Google / TPAI)
+         * Calling this method on the parent class means it was called too early and machine translation is not available at this point
+         */
+        if ( get_class( $this ) === __CLASS__ )
+            return false;
+
+        $settings = $this->settings['trp_machine_translation_settings'] ?? array();
+        $enabled  = ( $settings['machine-translation'] ?? '' ) === 'yes';
+        $is_available = false;
+
+        if ( $enabled ) {
+            $engine = $settings['translation-engine'] ?? null;
+
+            if ( $engine === 'deepl' && get_option( 'trp_license_status' ) !== 'valid' ) {
+                $is_available = false;
+            } elseif ( empty( $languages ) ) {
                 $is_available = true;
-            }
-
-            // If the license is invalid and the translation engine is DeepL,return false
-            $license_status = get_option( 'trp_license_status' );
-            if ( $license_status !== 'valid' && isset( $this->settings['trp_machine_translation_settings']['translation-engine'] ) && $this->settings['trp_machine_translation_settings']['translation-engine'] === 'deepl' ) {
-                $is_available = false;
-            }
-
-            $is_available = $this->check_languages_availability($languages);
-
-        }else {
-            $is_available = false;
-        }
-
-        return apply_filters('trp_machine_translator_is_available', $is_available);
+            } else {
+                $is_available = $this->check_languages_availability( $languages );
+            }
+        }
+
+        return apply_filters( 'trp_machine_translator_is_available', $is_available, $languages, $settings );
     }
 

translatepress-multilingual/trunk/includes/class-settings.php

@@ -329 +329 @@
 
         unset($settings['translation-languages-formality']);
+
+        $trp = TRP_Translate_Press::get_trp_instance();
+        $language_switcher_tab = $trp->get_component('language_switcher_tab');
+
+        if ( !$language_switcher_tab->is_legacy_enabled() && count( $settings['publish-languages'] ) > 2 ) {
+            $ls_settings     = $language_switcher_tab->get_initial_config();
+            $new_ls_settings = $ls_settings;
+
+            $new_ls_settings['floater']['oppositeLanguage']   = false;
+            $new_ls_settings['shortcode']['oppositeLanguage'] = false;
+
+            if ( $new_ls_settings !== $ls_settings ){
+                update_option( 'trp_language_switcher_settings', $new_ls_settings );
+            }
+        }
 
         // check for duplicates in url slugs

translatepress-multilingual/trunk/includes/class-translation-render.php

@@ -1020 +1020 @@
             $translated_strings_manual = array();
             foreach ( $translateable_strings_manual as $i => $string_manual ) {
-                if ( isset( $translated_strings_manual_dictionary[ $string_manual ]->translated ) ) {
+                if ( isset( $translated_strings_manual_dictionary[ $string_manual ]->translated ) && !empty( $translated_strings_manual_dictionary[ $string_manual ]->translated )) {
                     $translated_strings_manual[$i] = $translated_strings_manual_dictionary[ $string_manual ]->translated;
                 }
@@ -1686 +1686 @@
 
         foreach ( $translateable_strings as $i => $string ) {
-
+            if ( isset( $dictionary[ $string ]->translated ) && empty( $dictionary[ $string ]->translated ) ) {
+                /* If we have an empty string with a status != NOT TRANSLATED, it's possible we are dealing with
+                 * an intentional thing. After Automatic translation, a text can be translated with unallowed html
+                 * thus being stored in DB as empty string with status = MACHINE TRANSLATED. By doing continue; we avoid
+                 * re-autotranslating over and over again.
+                 */
+                continue;
+            }
             // prevent accidentally machine translated strings from db such as for src to be displayed
             $skip_string = in_array( $string, $skip_machine_translating_strings );
@@ -1763 +1770 @@
 
             if ( !isset($translated_strings[$i]) && isset( $machine_strings[$string] ) ) {
-                $translated_strings[$i] = $machine_strings[$string];
+                $sanitized_machine_string = trp_sanitize_string( $machine_strings[$string] );
+                if ( !empty( $sanitized_machine_string ) ){
+                    // Unallowed HTML can be turned into empty string. Show original text instead
+                    $translated_strings[$i] = $sanitized_machine_string;
+                }
             }
 
@@ -2080 +2091 @@
      * @return array
      */
-    public function wp_mail_filter( $args ){
-        if ( !is_array( $args ) ){
+    public function wp_mail_filter( $args ) {
+        if ( ! is_array( $args ) ) {
             return $args;
         }
 
-        $whitelisted_shortcodes = apply_filters( 'trp_whitelisted_shortcodes_for_wp_mail', [ 'trp_language', 'language-include', 'language-exclude' ] );
-
-        if ( array_key_exists( 'subject', $args ) ){
-            $args['subject'] = $this->translate_page( trp_do_these_shortcodes( $args['subject'], $whitelisted_shortcodes ) );
-        }
-
-        if ( array_key_exists( 'message', $args ) ){
-            $args['message'] = $this->translate_page( trp_do_these_shortcodes( $args['message'], $whitelisted_shortcodes ) );
-        }
+        if ( empty( $args['to'] ) ) {
+            return $args;
+        }
+
+        global $TRP_LANGUAGE;
+
+        $initial_language = $TRP_LANGUAGE;
+
+        $recipient = $args['to'];
+
+        // Normalize $recipient to a single email string (first recipient only - that's the main one)
+        if ( is_array( $recipient ) ) {
+            $first = reset( $recipient );
+            $recipient = is_string( $first ) ? $first : '';
+        }
+
+        $recipient = (string) $recipient;
+
+        // Keep only the first comma-separated entry if multiple are present in the string
+        $recipient = trim( strtok( $recipient, ',' ) );
+
+        if ( $recipient !== '' ) {
+            trp_switch_to_preffered_language( $recipient );
+        }
+
+        $whitelisted_shortcodes = apply_filters(
+            'trp_whitelisted_shortcodes_for_wp_mail',
+            array( 'trp_language', 'language-include', 'language-exclude' )
+        );
+
+        if ( array_key_exists( 'subject', $args ) ) {
+            $args['subject'] = $this->translate_page(
+                trp_do_these_shortcodes( $args['subject'], $whitelisted_shortcodes )
+            );
+        }
+
+        if ( array_key_exists( 'message', $args ) ) {
+            $args['message'] = $this->translate_page(
+                trp_do_these_shortcodes( $args['message'], $whitelisted_shortcodes )
+            );
+        }
+
+        // Switch back to the language used initially
+        $TRP_LANGUAGE = $initial_language;
 
         return $args;

translatepress-multilingual/trunk/includes/class-woocommerce-emails.php

@@ -187 +187 @@
         }
 
+        $trp_settings = TRP_Translate_Press::get_trp_instance()->get_component( 'settings' );
+        $settings     = $trp_settings->get_settings();
+
+        $default_language = $settings["default-language"];
+
         /**
          * At this point in the execution, $wc_email->get_recipient() returns null and throws a PHP warning inside WooCommerce /woocommerce/includes/emails/class-wc-email.php
@@ -224 +229 @@
                 $registered_user = get_user_by( 'email', $recipients[0] );
                 if( $registered_user ){
-                    // If language is set to site default, user object won't have a locale set. Fallback to WPLANG. In case WPLANG is not set either, fallback to trp_language
+                    // If language is set to site default, user object won't have a locale set. Fallback to WPLANG. In case WPLANG is not set either, fallback to default language
                     if ( !empty( $registered_user->locale ) ){
                         $language = $registered_user->locale;
                     } else {
-                        $language = get_option( 'WPLANG' ) ?? get_user_meta( $registered_user->ID, 'trp_language', true );
+                        $wplang = get_option( 'WPLANG' );
+                        $language = !empty( $wplang ) ? $wplang : $default_language;
                     }
                 } else {
@@ -243 +249 @@
         trp_switch_language( $language );
 
-        WC()->load_plugin_textdomain();
-
-        $this->bootstrap_trp_gettext_for_email_language( $language );
+        add_filter( 'trp_allow_gettext_write', '__return_true' );
+
+        $this->reload_woocommerce_textdomain();
+
+        $this->bootstrap_trp_gettext_for_emails();
 
         // calls necessary because the default additional_content field of an email is localized before this point and stored in a variable in the previous locale
@@ -264 +272 @@
 
         trp_restore_language();
-        WC()->load_plugin_textdomain();
+        $this->reload_woocommerce_textdomain();
 
         return false;
@@ -289 +297 @@
      * gettext translations stored in TranslatePress are applied correctly.
      */
-    private function bootstrap_trp_gettext_for_email_language( $language ) {
+    private function bootstrap_trp_gettext_for_emails() {
         $trp             = TRP_Translate_Press::get_trp_instance();
         $gettext_manager = $trp->get_component( 'gettext_manager' );
@@ -308 +316 @@
     }
 
+    function reload_woocommerce_textdomain() {
+        $domain = 'woocommerce';
+
+        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+
+        $custom_translation_path  = WP_LANG_DIR . '/woocommerce/woocommerce-' . $locale . '.mo';
+        $global_translation_path  = WP_LANG_DIR . '/plugins/woocommerce-' . $locale . '.mo';
+        $bundled_translation_path = trailingslashit( WC()->plugin_path() ) . 'i18n/languages/woocommerce-' . $locale . '.mo';
+
+        unload_textdomain( $domain );
+
+        // Custom file present: mimic WC
+        if ( is_readable( $custom_translation_path ) ) {
+            load_textdomain( $domain, $custom_translation_path );
+
+            if ( is_readable( $global_translation_path ) ) {
+                load_textdomain( $domain, $global_translation_path );
+            }
+
+            return true;
+        }
+
+        if ( is_readable( $global_translation_path ) ) {
+            load_textdomain( $domain, $global_translation_path );
+            return true;
+        }
+
+        if ( is_readable( $bundled_translation_path ) ) {
+            load_textdomain( $domain, $bundled_translation_path );
+            return true;
+        }
+
+        return false;
+    }
+
 }

translatepress-multilingual/trunk/includes/compatibility-functions.php

@@ -2709 +2709 @@
 
 /**
- * Override the wrap_with_post_id condition for Divi
- *
- * Divi doesn't use the main loop in the traditional way, so we need to override
- * the condition that checks for in_the_loop and is_main_query.
- *
- * @param bool $return Whether to bypass the wrap condition
- * @return bool
- */
-add_filter('trp_wrap_with_post_id_overrule', 'trp_divi_override_wrap_condition', 10);
-function trp_divi_override_wrap_condition($return) {
-    // Check if Divi is the active theme
-    if (function_exists('et_setup_theme')) {
-        // Return false to bypass the in_the_loop check
-        return false;
-    }
-    return $return;
-}
+ * Add trp-post-container wrapper to Divi module outputs
+ * TP is not adding any trp-post-container except here.
+ *
+ * @param string $output The module HTML output
+ * @param string $render_slug The module slug (e.g., 'et_pb_text', 'et_pb_post_title')
+ * @param object $module The module object
+ * @return string Modified output with trp-post-container wrapper
+ */
+add_filter('et_module_shortcode_output', 'trp_divi_wrap_module_with_post_id', 10, 3);
+
+function trp_divi_wrap_module_with_post_id($output, $render_slug, $module) {
+    global $post, $TRP_LANGUAGE;
+
+    // Check if we have a valid post ID
+    if (empty($post->ID)) {
+        return $output;
+    }
+
+    // Get TranslatePress settings
+    $trp = TRP_Translate_Press::get_trp_instance();
+    $trp_settings = $trp->get_component('settings');
+    $settings = $trp_settings->get_settings();
+
+    // Only wrap on non-default language
+    if ($TRP_LANGUAGE !== $settings['default-language']) {
+        // Only wrap modules that typically contain translatable text content
+        $modules_to_wrap = apply_filters('trp_divi_modules_to_wrap', array(
+            'et_pb_text',
+            'et_pb_post_title',
+            'et_pb_post_content',
+            'et_pb_blurb',
+            'et_pb_cta',
+            'et_pb_accordion',
+            'et_pb_toggle',
+            'et_pb_tabs',
+            'et_pb_testimonial',
+            'et_pb_pricing_tables',
+            'et_pb_number_counter',
+            'et_pb_countdown_timer'
+        ));
+
+        if (in_array($render_slug, $modules_to_wrap)) {
+            $output = "<trp-post-container data-trp-post-id='" . $post->ID . "'>" . $output . "</trp-post-container>";
+        }
+    }
+
+    return $output;
+}

translatepress-multilingual/trunk/includes/external-functions.php

@@ -64 +64 @@
     }
 
-    if ( strip_tags( $string ) === '' || trim ($string, $filter_string) === '' ){
-        $string = '';
-    }
+    if ( strip_tags( $string ) === '' || trim( $string, $filter_string ) === '' ) {
+        // Needs decoding otherwise some strings with special characters won't get detected.
+        // Example in Hebrew: אוכל ותרבות
+        // Placed inside the "if" to avoid calling html_entity_decode so often as this is a very used function
+        $decoded_string = html_entity_decode( $string );
+        if ( trim( $decoded_string, $filter_string ) === '' ) {
+            $string = '';
+        }
+    }
     return $string;
 }

translatepress-multilingual/trunk/includes/functions.php

@@ -274 +274 @@
         return $string;
 
-    if (seems_utf8($string)) {
+    $seems_utf = ( function_exists( 'wp_is_valid_utf8' ) ) ? wp_is_valid_utf8( $string ) : seems_utf8( $string );
+
+    if ( $seems_utf ) {
         $chars = array(
             // Decompositions for Latin-1 Supplement
@@ -821 +823 @@
 
 /**
+ * Switch to a user's preferred language based on the recipient email.
+ *
+ * For managerial users (admin-like roles), prefer user->locale with fallback
+ * to WPLANG, then trp_language.
+ *
+ * For non-managerial users, prefer trp_language, with fallback to locale, then WPLANG.
+ *
+ * @param string $email
+ * @return void
+ */
+function trp_switch_to_preffered_language( $email ) {
+    $email = trim( (string) $email );
+
+    if ( $email === '' )
+        return;
+
+    $user = get_user_by( 'email', $email );
+
+    if ( ! ( $user instanceof WP_User ) )
+        return;
+
+    $user_roles = is_array( $user->roles ) ? $user->roles : array();
+
+    $trp_settings = TRP_Translate_Press::get_trp_instance()->get_component( 'settings' );
+    $settings     = $trp_settings->get_settings();
+
+    $default_language = $settings["default-language"];
+
+    /**
+     * Roles considered "managerial" for email language purposes.
+     *
+     * @param string[] $roles
+     */
+    $managerial_roles = apply_filters(
+        'trp_managerial_roles_for_email_language',
+        [ 'administrator', 'editor', 'shop_manager' ]
+    );
+
+    $is_managerial = !empty( array_intersect( $managerial_roles, $user_roles ) );
+
+    if ( $is_managerial ) {
+        // Managerial: prefer locale, then WPLANG, then default_language
+        if ( !empty( $user->locale ) ) {
+            $language = $user->locale;
+        } else {
+            $wplang = get_option( 'WPLANG' );
+            $language = !empty( $wplang ) ? $wplang : $default_language;
+        }
+    } else {
+        // Non-managerial: prefer trp_language.
+        $language = get_user_meta( $user->ID, 'trp_language', true );
+
+        if ( empty( $language ) ) {
+            if ( !empty( $user->locale ) ) {
+                $language = $user->locale;
+            } else {
+                $wplang = get_option( 'WPLANG' );
+                $language = !empty( $wplang ) ? $wplang : $default_language;
+            }
+        }
+    }
+
+    if ( empty( $language ) )
+        return;
+
+    trp_switch_language( $language );
+}
+
+/**
  * Return $TRP_LANGUAGE as plugin locale
  *

translatepress-multilingual/trunk/includes/gettext/class-gettext-manager.php

@@ -488 +488 @@
      */
     public function add_missing_language_file_translations( $dictionary, $language ) {
-
-        $trp_plural_forms    = $this->get_gettext_component( 'plural_forms' );
+        // Ensure translation files are loaded with the correct locale
+        $locale   = determine_locale();
+        $switched = switch_to_locale( $language );
+
+        // This means that the language is not supported by WordPress. Either a custom language or a language that we support but WordPress does not.
+        if ( !$switched && $language !== $locale )
+            return;
+
+        $trp_plural_forms    = $this->get_gettext_component( 'plural_forms' );
         if ( ! $this->trp_query ) {
             $trp             = TRP_Translate_Press::get_trp_instance();
@@ -611 +618 @@
             $gettext_insert_update->insert_gettext_strings($insert_gettext_strings, $language);
             $gettext_insert_update->update_gettext_strings($update_gettext_strings, $language, array('translated', 'id', 'status'));
+
+            if ( $switched )
+                restore_previous_locale();
         }
     }

translatepress-multilingual/trunk/includes/queries/class-query.php

@@ -97 +97 @@
             $and_block_type = " AND block_type = " . $block_type;
         }
-        $query = "SELECT original,translated, status FROM `" . sanitize_text_field( $this->get_table_name( $language_code ) ) . "` WHERE status != " . self::NOT_TRANSLATED . $and_block_type . " AND translated <>'' AND original IN ";
+
+        /* Do not add a condition for "translated <> '' because this would cause re-autotranslating. */
+        $query = "SELECT original,translated, status FROM `" . sanitize_text_field( $this->get_table_name( $language_code ) ) . "` WHERE status != " . self::NOT_TRANSLATED . $and_block_type . " AND original IN ";
 
         $placeholders = array();
@@ -108 +110 @@
         $query .= "( " . implode ( ", ", $placeholders ) . " )";
         $prepared_query = $this->db->prepare( $query, $values );
-        $dictionary = $this->db->get_results( $prepared_query, OBJECT_K  );
-
+        $results = $this->db->get_results( $prepared_query, OBJECT  );
+
+        if ( !empty( $results ) && is_array( $results ) ) {
+            // There are edge cases where we have 2 results for the same original:
+            // one with translated as empty string, one with non-empty translation. Keep the one with translation.
+            $dictionary = [];
+            foreach ( $results as $row ) {
+                $key = $row->original;
+
+                // If this key has never been added, simply add it
+                if ( !isset( $dictionary[ $key ] ) ) {
+                    $dictionary[ $key ] = $row;
+                    continue;
+                }
+
+                // If current stored entry has empty 'translated'
+                // and this new row has non-empty 'translated', replace it
+                if (
+                    empty( $dictionary[ $key ]->translated ) &&
+                    !empty( $row->translated )
+                ) {
+                    $dictionary[ $key ] = $row;
+                }
+
+                // Otherwise do nothing — we keep the existing "better" record
+            }
+        } else {
+            $dictionary = $results;
+        }
 
 

translatepress-multilingual/trunk/index.php

@@ -4 +4 @@
 Plugin URI: https://translatepress.com/
 Description: Experience a better way of translating your WordPress site using a visual front-end translation editor, with full support for WooCommerce and site builders.
-Version: 3.0.5
+Version: 3.0.6
 Author: Cozmoslabs, Razvan Mocanu, Madalin Ungureanu, Cristophor Hurduban
 Author URI: https://cozmoslabs.com/
@@ -11 +11 @@
 License: GPL2
 WC requires at least: 2.5.0
-WC tested up to: 10.3.5
+WC tested up to: 10.4.2
 
 == Copyright ==

translatepress-multilingual/trunk/languages/translatepress-multilingual.pot

@@ -7 +7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-11-26 15:19+0000\n"
+"POT-Creation-Date: 2025-12-15 11:13+0000\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
@@ -319 +319 @@
 msgstr ""
 
-#: includes/class-language-switcher-v2.php:718
+#: includes/class-language-switcher-v2.php:720
 msgid "Change language to %s"
 msgstr ""
@@ -347 +347 @@
 msgstr ""
 
-#: includes/class-machine-translator.php:154, includes/google-translate/class-google-translate-v2-machine-translator.php:200
+#: includes/class-machine-translator.php:157, includes/google-translate/class-google-translate-v2-machine-translator.php:200
 msgid "Please enter your Google Translate key."
 msgstr ""
 
-#: includes/class-machine-translator.php:169, add-ons-pro/deepl/includes/class-deepl-machine-translator.php:365
+#: includes/class-machine-translator.php:172, add-ons-pro/deepl/includes/class-deepl-machine-translator.php:365
 msgid "Please enter your DeepL API key."
 msgstr ""
@@ -567 +567 @@
 msgstr ""
 
-#: includes/class-settings.php:471
+#: includes/class-settings.php:486
 msgid "Language codes can contain only A-Z a-z 0-9 - _ characters. Check your language codes in TranslatePress General Settings."
 msgstr ""
 
-#: includes/class-settings.php:534
+#: includes/class-settings.php:549
 msgid "Error! Duplicate URL slug values."
 msgstr ""
 
-#: includes/class-settings.php:535
+#: includes/class-settings.php:550
 msgid "You cannot select two languages that have the same <a href=\"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes\" target=\"_blank\">iso code</a> but different formalities because doing so will lead to duplicate <a href=\"https://developers.google.com/search/docs/specialty/international/localized-versions\" target=\"_blank\">hreflang tags</a>."
 msgstr ""
 
-#: includes/class-settings.php:536
+#: includes/class-settings.php:551
 msgid "Duplicate language detected.<br>Each language can only be added once to ensure accurate translation management.<br> Please change the duplicate language entry and try again. "
 msgstr ""
 
-#: includes/class-settings.php:593
+#: includes/class-settings.php:608
 msgid "Current Language"
 msgstr ""
 
-#: includes/class-settings.php:599
+#: includes/class-settings.php:614
 msgid "Opposite Language"
 msgstr ""
 
-#: includes/class-settings.php:639
+#: includes/class-settings.php:654
 msgid "General"
 msgstr ""
 
-#: includes/class-settings.php:644, includes/class-translation-manager.php:540, add-ons-pro/translator-accounts/includes/class-translator-accounts.php:156
+#: includes/class-settings.php:659, includes/class-translation-manager.php:540, add-ons-pro/translator-accounts/includes/class-translator-accounts.php:156
 msgid "Translate Site"
 msgstr ""
 
-#: includes/class-settings.php:649
+#: includes/class-settings.php:664
 msgid "Addons"
 msgstr ""
 
-#: includes/class-settings.php:657
+#: includes/class-settings.php:672
 msgid "License"
 msgstr ""
 
-#: includes/class-settings.php:701, includes/class-translation-manager.php:572
+#: includes/class-settings.php:716, includes/class-translation-manager.php:572
 msgid "Settings"
 msgstr ""
 
-#: includes/class-settings.php:715, partials/license-settings-page.php:29, includes/onboarding/class-autotranslation.php:169, includes/onboarding/class-license.php:131
+#: includes/class-settings.php:730, partials/license-settings-page.php:29, includes/onboarding/class-autotranslation.php:169, includes/onboarding/class-license.php:131
 msgid "Activate License"
 msgstr ""
 
-#: includes/class-settings.php:707
+#: includes/class-settings.php:722
 msgid "Pro Features"
 msgstr ""

translatepress-multilingual/trunk/readme.txt

@@ -4 +4 @@
 Tags: translate, translation, multilingual, automatic translation, bilingual, front-end translation, google translate, language
 Requires at least: 3.1.0
-Tested up to: 6.8.3
+Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 3.0.5
+Stable tag: 3.0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -143 +143 @@
 
 == Changelog ==
-= 3.0.5 =
-* Fixed CSS for Black Friday offer from admin notice
-
-= 3.0.4 =
-* Added 39 more languages including Irish, Maltese and Sicilian
-* Added support for Latin American Spanish automatic translation in TranslatePress AI
-* Added support for Divi search in secondary language
-* Added support for exact match search in String Translation by placing the string in quotes: "example"
-* Allow schema.org data to be translated
-* Fixed Regular String Translation search so filtered languages also match terms appearing in the middle of translated strings, not only at the start
-* Prevent automatic translation of strings that are 0 or 1 characters long or strings that are punctuation only
-* Change background hover color for transparent preset in order to improve contrast of language switcher
-* Fixed two missing spaces in floating switcher HTML markup
-* Fix PHP warning with empty domain for gettext with context
-* Fixed edge case error "call to a member function is_available() on null"
-* Moved the "Automatically Translate Slug" setting to be first in line
-* Extended the license message for item_name_mismatch to provide more context
-* Improved text information next to the default language
-
+= 3.0.6 =
+* Extended support for Divi search in secondary languages
+* Fixed redirect loop bug with excluded paths from translation
+* Fixed incorrect gettext resolution in string translation when the site locale differed from the default TranslatePress language, which caused untranslated gettext entries to be populated using translations from the wrong locale
+* Fixed edge case of retranslating the same text multiple times
+* Fixed not detecting texts containing only certain special characters
+* Fixed bug where mini cart menu widget doesn't respect language change
+* Fixed edge case error "Call to a member function is_available() on null"
+* Send emails in recipient's preferred language, in case the recipient is a user
+* Improved INP by deferring dynamic translation detection when original content can be shown first
+* Fixed a bug where the floating language switcher was not displaying all languages (if more than 10 were added and animations disabled)
+* Disable language switcher show opposite language settings in case more than 2 languages are active
+* Fixed deprecated notice for seems_utf8 function on WP 6.9
 
 = Older versions =