Changeset 3444552

Timestamp:

01/22/2026 05:55:32 AM (4 weeks ago)

Author:

aaron13100

Message:

• Improvement: Add WPML and Polylang-aware redirect translation based on the request language.

Location:

404-solution

Files:

• tags/3.1.10 (copied) (copied from 404-solution/trunk)
• tags/3.1.10/404-solution.php (modified) (1 diff)
• tags/3.1.10/CHANGELOG.md (modified) (1 diff)
• tags/3.1.10/README.md (modified) (1 diff)
• tags/3.1.10/includes/PluginLogic.php (modified) (2 diffs)
• tags/3.1.10/readme.txt (modified) (4 diffs)
• trunk/404-solution.php (modified) (1 diff)
• trunk/CHANGELOG.md (modified) (1 diff)
• trunk/README.md (modified) (1 diff)
• trunk/includes/PluginLogic.php (modified) (2 diffs)
• trunk/readme.txt (modified) (4 diffs)

404-solution/tags/3.1.10/404-solution.php

@@ -8 +8 @@
     Author URI:  https://www.ajexperience.com/404-solution/
 
-    Version: 3.1.9
+    Version: 3.1.10
     Requires at least: 5.0
     Requires PHP: 7.4

404-solution/tags/3.1.10/CHANGELOG.md

@@ -1 +1 @@
 # Changelog #
+
+## Version 3.1.10 (Jan 21, 2026) ##
+* Improvement: Add WPML and Polylang-aware redirect translation based on the request language.
 
 ## Version 3.1.9 (Jan 20, 2026) ##

404-solution/tags/3.1.10/README.md

@@ -81 +81 @@
 ## Changelog ##
 
+## Version 3.1.10 (Jan 21, 2026) ##
+* Improvement: Add WPML and Polylang-aware redirect translation based on the request language.
+
 ## Version 3.1.9 (Jan 20, 2026) ##
 * FIX: Manual and external redirects now store and match Unicode paths consistently.

404-solution/tags/3.1.10/includes/PluginLogic.php

@@ -421 +421 @@
         }
 
+        if ($translated === null || $translated === '') {
+            $translated = $this->wpmlRedirectUrl($location, $requestedURL);
+            if ($translated !== null && $translated !== '') {
+                $location = $translated;
+            }
+        }
+
+        if ($translated === null || $translated === '') {
+            $translated = $this->polylangRedirectUrl($location, $requestedURL);
+            if ($translated !== null && $translated !== '') {
+                $location = $translated;
+            }
+        }
+
         // Allow other multilingual plugins/themes to override redirect destinations.
         return apply_filters('abj404_translate_redirect_url', $location, $requestedURL);
@@ -483 +497 @@
         if (function_exists('trp_get_current_language')) {
             $language = trp_get_current_language();
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        return '';
+    }
+
+    private function wpmlRedirectUrl($location, $requestedURL) {
+        if (!$this->wpmlIntegrationAvailable()) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($location)) {
+            return null;
+        }
+
+        $language = $this->getWpmlLanguageFromRequest($requestedURL);
+        if ($language === '') {
+            return null;
+        }
+
+        $translated = $this->wpmlTranslateUrl($location, $language);
+        if (!is_string($translated) || $translated === '' || $translated === $location) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($translated)) {
+            return null;
+        }
+
+        return $translated;
+    }
+
+    private function wpmlIntegrationAvailable() {
+        return function_exists('wpml_current_language') ||
+            has_filter('wpml_current_language') ||
+            has_filter('wpml_language_from_url') ||
+            has_filter('wpml_permalink');
+    }
+
+    private function wpmlTranslateUrl($url, $language) {
+        if (has_filter('wpml_permalink')) {
+            return apply_filters('wpml_permalink', $url, $language);
+        }
+
+        return null;
+    }
+
+    private function getWpmlLanguageFromRequest($requestedURL) {
+        $fullRequestedUrl = $this->buildFullUrlFromRequest($requestedURL);
+
+        if (has_filter('wpml_language_from_url')) {
+            $language = apply_filters('wpml_language_from_url', '', $fullRequestedUrl);
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        if (function_exists('wpml_current_language')) {
+            $language = wpml_current_language();
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        if (has_filter('wpml_current_language')) {
+            $language = apply_filters('wpml_current_language', null);
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        return '';
+    }
+
+    private function polylangRedirectUrl($location, $requestedURL) {
+        if (!$this->polylangIntegrationAvailable()) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($location)) {
+            return null;
+        }
+
+        $language = $this->getPolylangLanguageFromRequest($requestedURL);
+        if ($language === '') {
+            return null;
+        }
+
+        $translated = $this->polylangTranslateUrl($location, $language);
+        if (!is_string($translated) || $translated === '' || $translated === $location) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($translated)) {
+            return null;
+        }
+
+        return $translated;
+    }
+
+    private function polylangIntegrationAvailable() {
+        return function_exists('pll_current_language') ||
+            function_exists('pll_translate_url');
+    }
+
+    private function polylangTranslateUrl($url, $language) {
+        if (function_exists('pll_translate_url')) {
+            return pll_translate_url($url, $language);
+        }
+
+        return null;
+    }
+
+    private function getPolylangLanguageFromRequest($requestedURL) {
+        if (function_exists('pll_current_language')) {
+            $language = pll_current_language();
             if (is_string($language) && $language !== '') {
                 return $language;

404-solution/tags/3.1.10/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.4
 Tested up to: 6.9
-Stable tag: 3.1.9
+Stable tag: 3.1.10
 License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -38 +38 @@
 * **Debug logging** to troubleshoot redirect behavior
 * **Performance optimized** for sites with 10,000+ pages
+* **Multilingual-friendly redirects** (TranslatePress, WPML, Polylang) to keep redirects in the request language
 
 = How It Works =
@@ -111 +112 @@
 **Important:** For very high-traffic sites with thousands of simultaneous users, disable "Create automatic redirects" and don't use the shortcode to ensure optimal performance.
 
+= Does it work with WPML or Polylang? =
+
+Yes. 404 Solution keeps redirects in the same language as the request when WPML or Polylang is active. TranslatePress is also supported. Language is detected using the multilingual plugin’s URL/language APIs, and the matched redirect destination is translated to that language without changing the matching logic.
+
 = Does it work with WooCommerce? =
 
@@ -237 +242 @@
 
 == Changelog ==
+
+= Version 3.1.10 (Jan 21, 2026) =
+* Improvement: Add WPML and Polylang-aware redirect translation based on the request language.
 
 = Version 3.1.9 (Jan 20, 2026) =

404-solution/trunk/404-solution.php

@@ -8 +8 @@
     Author URI:  https://www.ajexperience.com/404-solution/
 
-    Version: 3.1.9
+    Version: 3.1.10
     Requires at least: 5.0
     Requires PHP: 7.4

404-solution/trunk/CHANGELOG.md

@@ -1 +1 @@
 # Changelog #
+
+## Version 3.1.10 (Jan 21, 2026) ##
+* Improvement: Add WPML and Polylang-aware redirect translation based on the request language.
 
 ## Version 3.1.9 (Jan 20, 2026) ##

404-solution/trunk/README.md

@@ -81 +81 @@
 ## Changelog ##
 
+## Version 3.1.10 (Jan 21, 2026) ##
+* Improvement: Add WPML and Polylang-aware redirect translation based on the request language.
+
 ## Version 3.1.9 (Jan 20, 2026) ##
 * FIX: Manual and external redirects now store and match Unicode paths consistently.

404-solution/trunk/includes/PluginLogic.php

@@ -421 +421 @@
         }
 
+        if ($translated === null || $translated === '') {
+            $translated = $this->wpmlRedirectUrl($location, $requestedURL);
+            if ($translated !== null && $translated !== '') {
+                $location = $translated;
+            }
+        }
+
+        if ($translated === null || $translated === '') {
+            $translated = $this->polylangRedirectUrl($location, $requestedURL);
+            if ($translated !== null && $translated !== '') {
+                $location = $translated;
+            }
+        }
+
         // Allow other multilingual plugins/themes to override redirect destinations.
         return apply_filters('abj404_translate_redirect_url', $location, $requestedURL);
@@ -483 +497 @@
         if (function_exists('trp_get_current_language')) {
             $language = trp_get_current_language();
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        return '';
+    }
+
+    private function wpmlRedirectUrl($location, $requestedURL) {
+        if (!$this->wpmlIntegrationAvailable()) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($location)) {
+            return null;
+        }
+
+        $language = $this->getWpmlLanguageFromRequest($requestedURL);
+        if ($language === '') {
+            return null;
+        }
+
+        $translated = $this->wpmlTranslateUrl($location, $language);
+        if (!is_string($translated) || $translated === '' || $translated === $location) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($translated)) {
+            return null;
+        }
+
+        return $translated;
+    }
+
+    private function wpmlIntegrationAvailable() {
+        return function_exists('wpml_current_language') ||
+            has_filter('wpml_current_language') ||
+            has_filter('wpml_language_from_url') ||
+            has_filter('wpml_permalink');
+    }
+
+    private function wpmlTranslateUrl($url, $language) {
+        if (has_filter('wpml_permalink')) {
+            return apply_filters('wpml_permalink', $url, $language);
+        }
+
+        return null;
+    }
+
+    private function getWpmlLanguageFromRequest($requestedURL) {
+        $fullRequestedUrl = $this->buildFullUrlFromRequest($requestedURL);
+
+        if (has_filter('wpml_language_from_url')) {
+            $language = apply_filters('wpml_language_from_url', '', $fullRequestedUrl);
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        if (function_exists('wpml_current_language')) {
+            $language = wpml_current_language();
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        if (has_filter('wpml_current_language')) {
+            $language = apply_filters('wpml_current_language', null);
+            if (is_string($language) && $language !== '') {
+                return $language;
+            }
+        }
+
+        return '';
+    }
+
+    private function polylangRedirectUrl($location, $requestedURL) {
+        if (!$this->polylangIntegrationAvailable()) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($location)) {
+            return null;
+        }
+
+        $language = $this->getPolylangLanguageFromRequest($requestedURL);
+        if ($language === '') {
+            return null;
+        }
+
+        $translated = $this->polylangTranslateUrl($location, $language);
+        if (!is_string($translated) || $translated === '' || $translated === $location) {
+            return null;
+        }
+
+        if (!$this->isLocalUrl($translated)) {
+            return null;
+        }
+
+        return $translated;
+    }
+
+    private function polylangIntegrationAvailable() {
+        return function_exists('pll_current_language') ||
+            function_exists('pll_translate_url');
+    }
+
+    private function polylangTranslateUrl($url, $language) {
+        if (function_exists('pll_translate_url')) {
+            return pll_translate_url($url, $language);
+        }
+
+        return null;
+    }
+
+    private function getPolylangLanguageFromRequest($requestedURL) {
+        if (function_exists('pll_current_language')) {
+            $language = pll_current_language();
             if (is_string($language) && $language !== '') {
                 return $language;

404-solution/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.4
 Tested up to: 6.9
-Stable tag: 3.1.9
+Stable tag: 3.1.10
 License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -38 +38 @@
 * **Debug logging** to troubleshoot redirect behavior
 * **Performance optimized** for sites with 10,000+ pages
+* **Multilingual-friendly redirects** (TranslatePress, WPML, Polylang) to keep redirects in the request language
 
 = How It Works =
@@ -111 +112 @@
 **Important:** For very high-traffic sites with thousands of simultaneous users, disable "Create automatic redirects" and don't use the shortcode to ensure optimal performance.
 
+= Does it work with WPML or Polylang? =
+
+Yes. 404 Solution keeps redirects in the same language as the request when WPML or Polylang is active. TranslatePress is also supported. Language is detected using the multilingual plugin’s URL/language APIs, and the matched redirect destination is translated to that language without changing the matching logic.
+
 = Does it work with WooCommerce? =
 
@@ -237 +242 @@
 
 == Changelog ==
+
+= Version 3.1.10 (Jan 21, 2026) =
+* Improvement: Add WPML and Polylang-aware redirect translation based on the request language.
 
 = Version 3.1.9 (Jan 20, 2026) =