Prepare version 1.2.1

- The core page links are localized using the `page_link` hook.
- The logout redirect URL is localized.

Author: umdevelopera

README.md

@@ -5,7 +5,8 @@ Integrates the **Ultimate Member** plugin with the **Polylang** plugin. Makes Ul
 ## Key features
 
 - Language switcher shortcode. Display the Polylang language switcher where you need it.
-- Localize permalinks for the Account and User (profile) pages.
+- Adds rewrite rules for localized Account and User (profile) pages.
+- Localize links for Ultimate Member pages in menu.
 - Ability to duplicate Ultimate Member pages for all languages in one click.
 - Ability to duplicate Ultimate Member forms for all languages in one click.
 - Ability to translate email templates.
@@ -27,7 +28,7 @@ Once the plugin is cloned, enter your site admin dashboard and go to _wp-admin >
 
 ### How to install from ZIP archive
 
-You can install this plugin from the [ZIP archive](https://drive.google.com/file/d/1rj0W6639PMrFQqLfeCZXhoYgRcnCac8d/view?usp=sharing) as any other plugin. Follow [this instruction](https://wordpress.org/support/article/managing-plugins/#upload-via-wordpress-admin).
+You can install this plugin from the [ZIP archive](https://drive.google.com/file/d/1K5DMJYQtof32NftqDat9ACc0wNqIbmNa/view?usp=sharing) as any other plugin. Follow [this instruction](https://wordpress.org/support/article/managing-plugins/#upload-via-wordpress-admin).
 
 ## How to use
 
@@ -114,12 +115,14 @@ Image - Translate profile tabs.
 This is a free extension created for the community. The Ultimate Member team does not provide support for this extension.
 Open new [issue](https://github.com/umdevelopera/um-polylang/issues) if you are facing a problem or have a suggestion.
 
-## Related links
+**Please give a star if you think this extension is useful. I wish to know how many people use it. Thanks.**
 
-Ultimate Member home page: https://ultimatemember.com/
+## Useful links
 
-Ultimate Member documentation: https://docs.ultimatemember.com/
+[Ultimate Member documentation](https://docs.ultimatemember.com)
 
-Ultimate Member download: https://wordpress.org/plugins/ultimate-member/
+[Ultimate Member core plugin info and download](https://wordpress.org/plugins/ultimate-member)
 
-Articles: [How to translate plugin](https://docs.ultimatemember.com/article/1449-how-to-translate-plugin#switch), [The language switcher](https://polylang.pro/doc/the-language-switcher/)
+[Free extensions for Ultimate Member](https://docs.google.com/document/d/1wp5oLOyuh5OUtI9ogcPy8NL428rZ8PVTu_0R-BuKKp8/edit?usp=sharing)
+
+[Code snippets for Ultimate Member](https://docs.google.com/document/d/1_bikh4JYlSjjQa0bX1HDGznpLtI0ur_Ma3XQfld2CKk/edit?usp=sharing)

includes/core/class-permalinks.php

@@ -34,6 +34,10 @@ public function __construct() {
 		// Pages.
 		add_filter( 'um_get_core_page_filter', array( &$this, 'localize_core_page_url' ), 10, 3 );
 		add_filter( 'um_localize_permalink_filter', array( &$this, 'localize_profile_permalink' ), 10, 2 );
+		add_filter( 'page_link', array( $this, 'localize_core_page_link' ), 10, 2 );
+
+		// Logout.
+		add_action( 'template_redirect', array( $this, 'localize_logout_page' ), 9990 );
 
 		// Buttons.
 		add_filter( 'um_login_form_button_two_url', array( &$this, 'localize_page_url' ), 10, 2 );
@@ -50,7 +54,7 @@ public function __construct() {
 	/**
 	 * Add rewrite rules for the Account and User page.
 	 *
-	 * @hook rewrite_rules_array
+	 * @hooked rewrite_rules_array
 	 *
 	 * @since 1.0.0
 	 *
@@ -210,7 +214,7 @@ public function get_page_url_for_language( $post_id, $language = '' ) {
 	/**
 	 * Check if the current page is a UM Core Page or not.
 	 *
-	 * @hook   um_is_core_page
+	 * @hooked um_is_core_page
 	 *
 	 * @since 1.0.0
 	 * @deprecated since version 1.0.1
@@ -236,26 +240,48 @@ public function is_core_page( $is_core_page, $page ) {
 	/**
 	 * Filter account activation link.
 	 *
-	 * @hook  um_activate_url
-	 * @see   um\core\Permalinks::activate_url()
+	 * @hooked um_activate_url
+	 *
+	 * @see um\core\Permalinks
 	 * @since 1.1.0
 	 *
 	 * @param string $url Account activation link.
-	 *
 	 * @return string Localized account activation link.
 	 */
 	public function localize_activate_url( $url ){
 		if ( ! UM()->Polylang()->is_default() ) {
 			$url = add_query_arg( 'lang', UM()->Polylang()->get_current(), $url );
-		}
+			}
 		return $url;
 	}
 
 
+	/**
+	 * Filter logout page URL.
+	 *
+	 * @hooked page_link
+	 *
+	 * @since version 1.2.1
+	 *
+	 * @param  string $link    The page's permalink.
+	 * @param  int    $post_id The ID of the page.
+	 * @return string The page permalink.
+	 */
+	public function localize_core_page_link( $link, $post_id ) {
+		if ( ! UM()->Polylang()->is_default() ) {
+			if ( is_array( UM()->config()->permalinks ) && in_array( $post_id, UM()->config()->permalinks, true ) ) {
+				$url  = $this->get_page_url_for_language( $post_id, UM()->Polylang()->get_current() );
+				$link = ( $link !== $url ) ? $url : add_query_arg( 'lang', pll_current_language(), $url );
+			}
+		}
+		return $link;
+	}
+
+
 	/**
 	 * Filter core page URL.
 	 *
-	 * @hook um_get_core_page_filter
+	 * @hooked um_get_core_page_filter
 	 *
 	 * @since 1.0.0
 	 *
@@ -276,11 +302,45 @@ public function localize_core_page_url( $url, $slug, $updated = '' ) {
 	}
 
 
+	/**
+	 * The logout redirect URL.
+	 *
+	 * @hooked template_redirect - 9990
+	 *
+	 * @see \um\core\Logout
+	 * @since version 1.2.1
+	 */
+	public function localize_logout_page() {
+		if ( is_user_logged_in() && um_is_core_page( 'logout' ) && empty( $_REQUEST['redirect_to'] ) ) {
+			$lang = UM()->Polylang()->get_current();
+
+			if ( 'redirect_home' === um_user( 'after_logout' ) ) {
+				// if "Action to be taken after logout" is set to "Go to Homepage".
+
+				$link = home_url();
+				$url  = PLL()->links->get_home_url( $lang );
+				$_REQUEST['redirect_to'] = ( $link !== $url ) ? $url : add_query_arg( 'lang', $lang, $url );
+
+			} elseif( 'redirect_url' === um_user( 'after_logout' ) ) {
+				// if "Action to be taken after logout" is set to "Go to Custom URL".
+
+				$redirect_url = apply_filters( 'um_logout_redirect_url', um_user( 'logout_redirect_url' ), um_user( 'ID' ) );
+				$page_path    = trim( str_replace( home_url(), '', $redirect_url ), " \t\n\r\0\x0B/\\" );
+				$page         = get_page_by_path( $page_path );
+				if ( is_object( $page ) ) {
+					$redirect_to = $this->get_page_url_for_language( $page->ID, $lang );
+					$_REQUEST['redirect_to'] = $redirect_to;
+				}
+			}
+		}
+	}
+
+
 	/**
 	 * Filter page URL on buttons.
 	 *
-	 * @hook um_login_form_button_two_url
-	 * @hook um_register_form_button_two_url
+	 * @hooked um_login_form_button_two_url
+	 * @hooked um_register_form_button_two_url
 	 *
 	 * @since 1.0.0
 	 *
@@ -300,7 +360,7 @@ public function localize_page_url( $url, $args = array() ) {
 	/**
 	 * Filter profile page URL.
 	 *
-	 * @hook um_localize_permalink_filter
+	 * @hooked um_localize_permalink_filter
 	 *
 	 * @since 1.0.0
 	 *

readme.txt

@@ -4,13 +4,14 @@ Author: umdevelopera
 Author URI: https://github.com/umdevelopera
 Plugin URI: https://github.com/umdevelopera/um-polylang
 Tags: ultimate member, polylang, multilingual
+License: GNU Version 2 or Any Later Version
+License URI: http://www.gnu.org/licenses/gpl-3.0.txt
+
 Requires at least: 6.5
-Tested up to: 6.7
+Tested up to: 6.7.1
 Requires UM core at least: 2.6.8
 Tested UM core up to: 2.9.1
-Stable tag: 1.2.0
-License: GNU Version 2 or Any Later Version
-License URI: http://www.gnu.org/licenses/gpl-3.0.txt
+Stable tag: 1.2.1
 
 == Description ==
 
@@ -19,7 +20,8 @@ Integrates the "Ultimate Member" plugin with the "Polylang" plugin. Makes UM mul
 = Key Features =
 
 * Language switcher shortcode. Displays the Polylang language switcher where you need it.
-* Localized permalinks for the Account and User (profile) pages.
+* Adds rewrite rules for localized Account and User (profile) pages.
+* Localize links for Ultimate Member pages in menu.
 * Ability to duplicate Ultimate Member pages for all languages in one click.
 * Ability to duplicate Ultimate Member forms for all languages in one click.
 * Ability to translate email templates.
@@ -41,6 +43,13 @@ Download ZIP file from GitHub or Google Drive. You can find download links here:
 
 == Changelog ==
 
+= 1.2.1: December 18, 2024 =
+
+* Enhancements:
+
+	- Tweak: The core page links are localized using the `page_link` hook.
+	- Tweak: The logout redirect URL is localized.
+
 = 1.2.0: November 10, 2024 =
 
 * Enhancements:

um-polylang.php

@@ -8,10 +8,11 @@
  * Text Domain: um-polylang
  * Domain Path: /languages
  *
+ * Requires Plugins: ultimate-member, polylang
  * Requires at least: 6.5
  * Requires PHP: 7.4
- * UM version: 2.8.9
- * Version: 1.2.0
+ * UM version: 2.9.1
+ * Version: 1.2.1
  *
  * @package um_ext\um_polylang
  */