Merge pull request #42 from ahmedkaludi/2.4.5

2.4.5

configs/plugins/seo-by-rank-math.json

@@ -8,10 +8,26 @@
     "rank_math_primary_category": {},
     "rank_math_robots": {},
     "rank_math_rich_snippet": {},
+    "rank_math_twitter_title": {},
+    "rank_math_twitter_description": {},
+    "rank_math_snippet_name": {},
+    "rank_math_snippet_desc": {},
+    "rank_math_snippet_article_type": {},
     "rank_math_facebook_title": {},
     "rank_math_facebook_description": {},
-    "rank_math_twitter_title": {},
-    "rank_math_twitter_description": {}
+    "rank_math_facebook_enable_image_overlay": {},
+    "rank_math_facebook_image_id": {},
+    "rank_math_facebook_image": {},
+    "rank_math_twitter_use_facebook": {},
+    "rank_math_twitter_card_type": {},
+    "rank_math_twitter_enable_image_overlay": {},
+    "rank_math_twitter_image_id": {},
+    "rank_math_twitter_image": {},
+    "rank_math_twitter_image_overlay": {},
+    "rank_math_canonical_url": {},
+    "rank_math_breadcrumb_title": {},
+    "redirection_header_code": {},
+    "redirection_url_to": {}
   },
   "admin_pages": [
     "toplevel_page_rank-math"
@@ -45,9 +61,25 @@
     "rank_math_primary_category": {},
     "rank_math_robots": {},
     "rank_math_rich_snippet": {},
+    "rank_math_twitter_title": {},
+    "rank_math_twitter_description": {},
+    "rank_math_snippet_name": {},
+    "rank_math_snippet_desc": {},
+    "rank_math_snippet_article_type": {},
     "rank_math_facebook_title": {},
     "rank_math_facebook_description": {},
-    "rank_math_twitter_title": {},
-    "rank_math_twitter_description": {} 
+    "rank_math_facebook_enable_image_overlay": {},
+    "rank_math_facebook_image_id": {},
+    "rank_math_facebook_image": {},
+    "rank_math_twitter_use_facebook": {},
+    "rank_math_twitter_card_type": {},
+    "rank_math_twitter_enable_image_overlay": {},
+    "rank_math_twitter_image_id": {},
+    "rank_math_twitter_image": {},
+    "rank_math_twitter_image_overlay": {},
+    "rank_math_canonical_url": {},
+    "rank_math_breadcrumb_title": {},
+    "redirection_header_code": {},
+    "redirection_url_to": {}
   }
 }

core-config.json

@@ -13,7 +13,8 @@
     "revision": null
   },
   "post_fields": {
-    "_wp_attachment_image_alt": {}
+    "_wp_attachment_image_alt": {},
+    "_thumbnail_id":{}
   },
   "taxonomies": {
     "category" : {},

includes/admin/class-wpm-admin-assets.php

@@ -205,7 +205,7 @@ public function add_language_switcher() {
 					var query = document.location.search;
 					var href = '';
 					if (query.search(/edit_lang=/i) !== -1) {
-						href = url + query.replace(/edit_lang=[a-z]{2,4}/i, 'edit_lang=' + lang) + document.location.hash;
+						href = url + query.replace(/edit_lang=[a-z]{2,4}((-[a-z]{2,4})?)*/i, 'edit_lang=' + lang) + document.location.hash;
 					} else {
 						href = url + query + '&edit_lang=' + lang + document.location.hash;
 					}

includes/admin/class-wpm-admin-widgets.php

@@ -24,34 +24,9 @@ class WPM_Admin_Widgets {
 	 */
 	public function __construct() {
 		add_filter( 'widget_form_callback', 'wpm_translate_value', 5 );
-		add_filter( 'widget_update_callback', array( $this, 'pre_save_widget' ), 99, 4 );
 		add_action( 'in_widget_form', array( $this, 'add_language_fields' ), 15, 3 );
 	}
 
-	/**
-	 * Update widget translation. Title and text field translate for all widgets.
-	 *
-	 * @param $instance
-	 * @param $new_instance
-	 * @param $old_instance
-	 * @param $widget
-	 *
-	 * @return array
-	 *
-	 */
-	public function pre_save_widget( $instance, $new_instance, $old_instance, $widget ) {
-
-		$widget_config = wpm_get_widget_config( $widget->id_base );
-
-		if ( null === $widget_config ) {
-			return $instance;
-		}
-
-		$instance = wpm_set_new_value( $old_instance, $new_instance, $widget_config );
-
-		return $instance;
-	}
-
 
 	/**
 	 * Add language select field

includes/class-wp-multilang.php

@@ -21,7 +21,7 @@ final class WP_Multilang {
 	 *
 	 * @var string
 	 */
-	public $version = '2.4.4';
+	public $version = '2.4.5';
 
 	/**
 	 * The single instance of the class.

includes/class-wpm-setup.php

@@ -530,7 +530,7 @@ public function load_integrations() {
 			'tablepress'                 => __NAMESPACE__ . '\Integrations\WPM_Tablepress',
 			'woocommerce'                => __NAMESPACE__ . '\Integrations\WPM_WooCommerce',
 			'wordpress-seo'              => __NAMESPACE__ . '\Integrations\WPM_Yoast_Seo',
-			'seo-by-rank-math'           => __NAMESPACE__ . '\Integrations\WPM_Rank_Math',
+			'seo-by-rank-math'           => __NAMESPACE__ . '\Integrations\WPM_Rank_Math'
 		) );
 
 		$active_plugins = wp_cache_get( 'active_plugins', 'wpm' );

includes/integrations/class-wpm-acf.php

@@ -144,7 +144,7 @@ public function update_value( $value, $post_id, $field ) {
 
 		$acf_field_config = apply_filters( "wpm_acf_{$info['type']}_config", null, $value, $post_id, $field );
 		$acf_field_config = apply_filters( "wpm_acf_{$field['type']}_config", $acf_field_config, $value, $post_id, $field );
-		$acf_field_config = apply_filters( "wpm_acf_name_{$field['name']}_config", $acf_field_config, $value, $post_id, $field );
+		$acf_field_config = apply_filters( "wpm_acf_name_{$field['_name']}_config", $acf_field_config, $value, $post_id, $field );
 
 		if ( null === $acf_field_config ) {
 			return $value;

includes/integrations/class-wpm-cf7.php

@@ -23,6 +23,8 @@ class WPM_CF7 {
 	public function __construct() {
 		add_filter( 'wpcf7_special_mail_tags', array( $this, 'add_language_tag' ), 10, 2 );
 		add_filter( 'wpcf7_form_hidden_fields', array( $this, 'add_lang_field' ) );
+		add_filter( 'wpcf7_special_mail_tags', array( $this, 'translate_post_title' ), 11, 2 );
+		add_action( 'wpcf7_contact_form', array( $this, 'edit_form_translate_shortcode_title_attr' ), 10, 1 );
 	}
 
 	public function add_language_tag( $output, $name ) {
@@ -48,4 +50,32 @@ public function add_lang_field( $fields ) {
 
 		return $fields;
 	}
+
+	/**
+	 * Translate post title
+	 *
+	 * @param $output string
+	 * @param $name string
+	 *
+	 * @return string
+	 * 
+	 * @since 2.4.5
+	 */
+	public function translate_post_title( $output, $name ) {
+		if ( '_post_name' == $name || '_post_title' == $name) {
+			return wpm_translate_string( $output);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Fix translation of the "title" attribute in the shortcode for copying, on the form edit page
+	 *
+	 * @param $wpcf7 current Contacts Form 7 instance
+	 * @since 2.4.5
+	*/
+	public function edit_form_translate_shortcode_title_attr( $wpcf7 ) {
+		$wpcf7->set_title( wpm_translate_string( $wpcf7->title() ) );
+	}
 }

includes/integrations/class-wpm-yoast-seo-presenters.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Creates an Opengraph alternate locale meta tag to be consumed by Yoast SEO
+ * Requires Yoast SEO 14.0 or newer.
+ */
+namespace WPM\Includes\Integrations;
+use Yoast\WP\SEO\Presenters\Abstract_Indexable_Presenter;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @class    WPM_Yoast_Seo_Presenters
+ * @package  WPM/Includes/Integrations
+ * @category Integrations
+ * @author   Damir Calusic
+ */
+class WPM_Yoast_Seo_Presenters extends Abstract_Indexable_Presenter {
+
+	/**
+	 * Facebook locale
+	 *
+	 * @var string $locale
+	 */
+	private $locale;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $locale Facebook locale.
+	 * @since 2.4.5
+	 */
+	public function __construct( $locale ) {
+		$this->locale = $locale;
+	}
+
+	/**
+	 * Returns the meta Opengraph alternate locale meta tag
+	 *
+	 * @return string
+	 * @since 2.4.5
+	 */
+	public function present() {
+		return sprintf( '<meta property="og:locale:alternate" content="%s" />', esc_attr( $this->get() ) );
+	}
+
+	/**
+	 * Returns the alternate locale
+	 *
+	 * @return string
+	 * @since 2.4.5
+	 */
+	public function get() {
+		return $this->locale;
+	}
+}

includes/integrations/class-wpm-yoast-seo.php

@@ -43,6 +43,8 @@ public function __construct() {
 			add_filter( 'wpseo_locale', array( $this, 'add_opengraph_locale' ) );
 			if(defined('WPSEO_VERSION') && version_compare(WPSEO_VERSION, '14.0', '<') ) {
 				add_action( 'wpseo_opengraph', array( $this, 'add_alternate_opengraph_locale' ), 40 );
+			}else {
+				add_filter( 'wpseo_frontend_presenters', array( $this, 'add_wpseo_frontend_presenters' ) );
 			}			
 		}
 	}
@@ -313,7 +315,7 @@ public function add_alternate_opengraph_locale() {
 				continue;
 			}
 
-			if ( ! empty( $language['wpseo_og_locale'] ) ) {
+			if ( ! empty( $language['wpseo_og_locale'] ) && null !== $wpseo_og ) {
 				$wpseo_og->og_tag( 'og:locale:alternate', $language['wpseo_og_locale'] );
 			}
 		}
@@ -465,4 +467,50 @@ public function update_opengraph_url($url)
 		}
 		return $url;
 	}
+
+	/**
+	 * Adds opengraph support for translations
+	 *
+	 * @since 2.4.5
+	 * 
+	 * @param array $presenters An array of objects implementing Abstract_Indexable_Presenter
+	 * @return array
+	 */
+	public function add_wpseo_frontend_presenters( $presenters ) {
+		$_presenters = array();
+
+		foreach ( $presenters as $presenter ) {
+			$_presenters[] = $presenter;
+
+			if ( get_class($presenter) == 'Yoast\WP\SEO\Presenters\Open_Graph\Locale_Presenter' ) {
+				error_log(print_r($presenter, 1));
+
+				foreach ( $this->get_ogp_alternate_languages() as $lang ) {
+					$_presenters[] = new WPM_Yoast_Seo_Presenters( $lang );
+				}
+			}
+		}
+
+		return $_presenters;
+	}
+
+	/**
+	 * Get alternate language codes for Opengraph
+	 *
+	 * @since 2.4.5
+	 *
+	 * @return array
+	 */
+	protected function get_ogp_alternate_languages() {
+		$alternates = array();
+
+		foreach ( wpm_get_languages() as $code => $language ) {
+			if ( $code !== wpm_get_language() && ! empty( $language['locale'] ) ) {
+				$alternates[] = $language['locale'];
+			}
+		}
+
+		// There is a risk that 2 languages have the same Facebook locale. So let's make sure to output each locale only once.
+		return array_unique( $alternates );
+	}
 }

includes/wpm-config-functions.php

@@ -82,6 +82,7 @@ function wpm_get_widget_config( $widget ) {
 		$default_fields = array(
 			'title' => array(),
 			'text'  => array(),
+			'content'  => array(),
 		);
 
 		$widget_config = wpm_array_merge_recursive( $default_fields, $widget_config );