Merge branch 'release/1.0.3'

Author: alamgircsebd

changelog.txt

@@ -1,3 +1,10 @@
+v1.0.3 -> December 03, 2020
+---------------------------
+ - [fix] Vendor dashboard page all links coming 404 error fixed
+ - [fix] Vendor dashboard all url slug missing on url issue fixed
+ - [fix] Fatal error when dokan plugin deactivated
+ - [fix] Improve coding structure
+
 v1.0.2 -> November 23, 2019
 ---------------------------
  - [Fix]   Color customizer and order page is not loading

dokan-wpml.php

@@ -3,12 +3,12 @@
 Plugin Name: Dokan - WPML Integration
 Plugin URI: https://wedevs.com/
 Description: WPML and Dokan compitable package
-Version: 1.0.2
+Version: 1.0.3
 Author: weDevs
 Author URI: https://wedevs.com/
 Text Domain: dokan-wpml
 WC requires at least: 3.0
-WC tested up to: 3.8.0
+WC tested up to: 4.7.1
 Domain Path: /languages/
 License: GPL2
 */
@@ -48,6 +48,13 @@
  */
 class Dokan_WPML {
 
+    /*
+     * WordPress Endpoints text domain
+     * 
+     * @var string
+     */
+    public $wp_endpoints = 'WP Endpoints';
+
     /**
      * Constructor for the Dokan_WPML class
      *
@@ -60,24 +67,26 @@ class Dokan_WPML {
      * @uses add_action()
      */
     public function __construct() {
-        register_activation_hook( __FILE__, array( $this, 'dependency_missing_notice' ) );
+        register_activation_hook( __FILE__, [ $this, 'dependency_missing_notice' ] );
 
         // Localize our plugin
-        add_action( 'init', array( $this, 'localization_setup' ) );
+        add_action( 'init', [ $this, 'localization_setup' ] );
 
         // Load all actions hook
-        add_filter( 'dokan_forced_load_scripts', array( $this, 'load_scripts_and_style') );
-        add_filter( 'dokan_force_load_extra_args', array( $this, 'load_scripts_and_style') );
-        add_filter( 'dokan_seller_setup_wizard_url', array( $this, 'render_wmpl_home_url' ), 70 );
-        add_filter( 'dokan_get_page_url', array( $this, 'reflect_page_url' ), 10, 3 );
-        add_filter( 'dokan_get_terms_condition_url', array( $this, 'get_terms_condition_url' ), 10, 2 );
-        add_filter( 'dokan_redirect_login', array( $this, 'redirect_if_not_login' ), 90 );
-        add_filter( 'dokan_force_page_redirect', array( $this, 'force_redirect_page' ), 90, 2 );
+        add_filter( 'dokan_forced_load_scripts', [ $this, 'load_scripts_and_style' ] );
+        add_filter( 'dokan_force_load_extra_args', [ $this, 'load_scripts_and_style' ] );
+        add_filter( 'dokan_seller_setup_wizard_url', [ $this, 'render_wmpl_home_url' ], 70 );
+        add_filter( 'dokan_get_page_url', [ $this, 'reflect_page_url' ], 10, 3 );
+        add_filter( 'dokan_get_terms_condition_url', [ $this, 'get_terms_condition_url' ], 10, 2 );
+        add_filter( 'dokan_redirect_login', [ $this, 'redirect_if_not_login' ], 90 );
+        add_filter( 'dokan_force_page_redirect', [ $this, 'force_redirect_page' ], 90, 2 );
 
         // Load all filters hook
-        add_filter( 'dokan_get_navigation_url', array( $this, 'load_translated_url' ), 10 ,2 );
-        add_filter( 'body_class', array( $this, 'add_dashboard_template_class_if_wpml' ), 99 );
+        add_filter( 'dokan_get_navigation_url', [ $this, 'load_translated_url' ], 10 ,2 );
+        add_filter( 'body_class', [ $this, 'add_dashboard_template_class_if_wpml' ], 99 );
         add_filter( 'dokan_get_current_page_id', [ $this, 'dokan_set_current_page_id' ] );
+        add_filter( 'dokan_get_dashboard_nav', [ $this, 'replace_dokan_dashboard_nav_key' ] );
+        add_action( 'wp_head', [ $this, 'dokan_wpml_remove_fix_fallback_links' ] );
     }
 
     /**
@@ -129,12 +138,12 @@ public function localization_setup() {
     }
 
     /**
-    * Redirect seller setup wizerd into translated url
-    *
-    * @since 1.0.0
-    *
-    * @return void
-    **/
+     * Redirect seller setup wizerd into translated url
+     *
+     * @since 1.0.0
+     *
+     * @return void
+     */
     public function render_wmpl_home_url( $url ) {
         $translated_url = apply_filters( 'wpml_home_url', $url );
         return add_query_arg( array( 'page' => 'dokan-seller-setup' ), $translated_url );
@@ -151,12 +160,27 @@ public function render_wmpl_home_url( $url ) {
      * @return string
      */
     function load_translated_url( $url, $name ) {
+        $current_lang = apply_filters( 'wpml_current_language', NULL );
+
         if ( ! function_exists( 'wpml_object_id_filter' ) ) {
             return $url;
         }
 
         if ( ! empty( $name ) ) {
+
+            if ( $current_lang ) {
+                $name_arr = explode( '/', $name );
+
+                if ( isset( $name_arr[1] ) ) {
+                    $name = apply_filters( 'wpml_translate_single_string', $name_arr[0], $this->wp_endpoints, $name_arr[0], $current_lang ).'/'.$name_arr[1];
+                } else {
+                    $get_name = ( ! empty( $name_arr[0] ) ) ? $name_arr[0] : $name;
+                    $name     = apply_filters( 'wpml_translate_single_string', $get_name, $this->wp_endpoints, $get_name, $current_lang );
+                }
+            }
+
             $url = $this->get_dokan_url_for_language( ICL_LANGUAGE_CODE ).$name.'/';
+
         } else {
             $url = $this->get_dokan_url_for_language( ICL_LANGUAGE_CODE );
         }
@@ -165,12 +189,36 @@ function load_translated_url( $url, $name ) {
     }
 
     /**
-    * Reflect page url
-    *
-    * @since 1.0.1
-    *
-    * @return void
-    **/
+     * Replace dashboard key language wise
+     *
+     * @param array $urls
+     *
+     * @since 2.4
+     *
+     * @return array $urls
+     */
+    public function replace_dokan_dashboard_nav_key( $urls ) {
+        $current_lang = apply_filters( 'wpml_current_language', NULL );
+        $new_urls     = $urls;
+        
+        foreach ( $urls as $get_key => $item ) {
+            $new_key       = apply_filters( 'wpml_translate_single_string', $get_key, $this->wp_endpoints, $get_key, $current_lang );
+            if ( $get_key != $new_key ) {
+                $new_urls[$new_key] = $new_urls[$get_key];
+                unset($new_urls[$get_key]);
+            }
+        }
+
+        return $new_urls;
+    }
+
+    /**
+     * Reflect page url
+     *
+     * @since 1.0.1
+     *
+     * @return void
+     */
     public function reflect_page_url( $url, $page_id, $context ) {
         if ( ! function_exists( 'wpml_object_id_filter' ) ) {
             return $url;
@@ -182,12 +230,12 @@ public function reflect_page_url( $url, $page_id, $context ) {
     }
 
     /**
-    * Get terms and condition page url
-    *
-    * @since 1.0.1
-    *
-    * @return url
-    **/
+     * Get terms and condition page url
+     *
+     * @since 1.0.1
+     *
+     * @return url
+     */
     public function get_terms_condition_url( $url, $page_id ) {
         if ( ! function_exists( 'wpml_object_id_filter' ) ) {
             return $url;
@@ -199,12 +247,12 @@ public function get_terms_condition_url( $url, $page_id ) {
     }
 
     /**
-    * Redirect if not login
-    *
-    * @since 1.0.1
-    *
-    * @return void
-    **/
+     * Redirect if not login
+     *
+     * @since 1.0.1
+     *
+     * @return void
+     */
     public function redirect_if_not_login( $url ) {
         if ( ! function_exists( 'wpml_object_id_filter' ) ) {
             return $url;
@@ -217,12 +265,12 @@ public function redirect_if_not_login( $url ) {
     }
 
     /**
-    * undocumented function
-    *
-    * @since 1.0.1
-    *
-    * @return void
-    **/
+     * Undocumented function
+     *
+     * @since 1.0.1
+     *
+     * @return void
+     */
     public function force_redirect_page( $flag, $page_id ) {
         if ( ! function_exists( 'wpml_object_id_filter' ) ) {
             return false;
@@ -339,7 +387,7 @@ public function dokan_set_current_page_id( $page_id ) {
     /**
      * Get raw value from database
      *
-     * @since  DOKAN_WPML_SINCE
+     * @since  1.0.3
      *
      * @param  string $option
      * @param  string $section
@@ -360,6 +408,23 @@ public function get_raw_option( $option, $section, $default = '' ) {
         return isset( $options[ $option ] ) ? $options[ $option ] : $default;
     }
 
+    /**
+     * Remove callback links with WPML on vendor dashboard
+     *
+     * @since 1.0.3
+     */
+    public function dokan_wpml_remove_fix_fallback_links() {
+        if ( function_exists( 'dokan_is_seller_dashboard' ) && ! dokan_is_seller_dashboard() ) {
+            return;
+        }
+
+        if ( ! class_exists( 'WPML_Fix_Links_In_Display_As_Translated_Content' ) || ! function_exists( 'dokan_remove_hook_for_anonymous_class' ) ) {
+            return;
+        }
+
+        dokan_remove_hook_for_anonymous_class( 'the_content', 'WPML_Fix_Links_In_Display_As_Translated_Content', 'fix_fallback_links', 99 );
+    }
+
 } // Dokan_WPML
 
 function dokan_load_wpml() {

languages/dokan-wpml.pot

@@ -1,25 +1,25 @@
-# Copyright (C) 2019 weDevs
+# Copyright (C) 2020 weDevs
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan - WPML Integration 1.0.2\n"
+"Project-Id-Version: Dokan - WPML Integration 1.0.3\n"
 "Report-Msgid-Bugs-To: http://wedevs.com/support/\n"
-"POT-Creation-Date: 2019-11-23 09:12:29+00:00\n"
+"POT-Creation-Date: 2020-12-03 09:37:59+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2020-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
 "X-Generator: grunt-wp-i18n 0.4.9\n"
 
-#: dokan-wpml.php:110
+#: dokan-wpml.php:119
 msgid ""
 "<b>Dokan - WPML Integration</b> requires %sDokan plugin%s to be installed & "
 "activated!"
 msgstr ""
 
-#: dokan-wpml.php:116
+#: dokan-wpml.php:125
 msgid ""
 "<b>Dokan - WPML Integration</b> requires %sWPML Multilingual CMS%s to be "
 "installed & activated!"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dokan-wpml",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "WPML compatibility for dokan plugin",
   "author": "weDevs",
   "license": "GPL",

readme.txt

@@ -1,13 +1,13 @@
 === Dokan WPML ===
-Contributors: wedevs, sabbir1991, rafsuntaskin,
+Contributors: wedevs, sabbir1991, rafsuntaskin, alamgircsebd
 Tags: WPML, i18n, l10n, Translation, Dokan
 Donate link: https://tareq.co/donate
 Requires at least: 4.7
-Tested up to: 5.3.0
+Tested up to: 5.5.3
 WC requires at least: 3.0
-WC tested up to: 3.8.0
+WC tested up to: 4.7.1
 Requires PHP: 5.6
-Stable tag: trunk
+Stable tag: 1.0.3
 License: GPL v2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -52,6 +52,13 @@ nothing here
 
 == Changelog ==
 
+v1.0.3 -> December 03, 2020
+---------------------------
+ - [fix] Vendor dashboard page all links coming 404 error fixed
+ - [fix] Vendor dashboard all url slug missing on url issue fixed
+ - [fix] Fatal error when dokan plugin deactivated
+ - [fix] Improve coding structure
+
 v1.0.2 -> November 23, 2019
 ---------------------------
  - [Fix]   Color customizer and order page is not loading