Merge pull request #291 from brenoalvs/develop

Release 0.5.1

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+- **[0.5.1]**
+    + Fixed bug on medias update process
+    + Fixed accessibility attributes on admin controls.
+    + Fixed persistent language filter when post type has no posts.
+
 - **[0.5.0]**
     + Added site title and description translation
     + Added shortcode to retrieve translation links

README.txt

@@ -3,7 +3,7 @@ Contributors: breno-alves, ale-correa, leonofre, rafaelangeline
 Tags: multilingual, translation, language, multilanguage, international, localization
 Requires at least: 4.6
 Tested up to: 4.8.1
-Stable tag: 0.5.0
+Stable tag: 0.5.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -70,6 +70,11 @@ You must! Join us on our [GitHub repository](http://github.com/brenoalvs/monk/)
 
 == Changelog ==
 
+= [0.5.1] =
+* Fixed bug on medias update process
+* Fixed accessibility attributes on admin controls.
+* Fixed persistent language filter when post type has no posts.
+
 = [0.5.0] =
 * Added site title and description translation
 * Added shortcode to retrieve translation links

admin/class-monk-admin.php

@@ -438,7 +438,7 @@ public function monk_post_meta_box() {
 	 */
 	public function monk_post_meta_box_field_render( $post ) {
 		global $current_screen;
-		$monk_languages = monk_get_available_languages();
+		$monk_languages         = monk_get_available_languages();
 		$monk_id                = get_post_meta( $post->ID, '_monk_post_translations_id', true );
 		$post_default_language  = get_post_meta( $post->ID, '_monk_post_language', true );
 		$site_default_language  = get_option( 'monk_default_language', false );
@@ -569,12 +569,14 @@ public function monk_save_post_meta_box( $post_id ) {
 		$post_terms            = get_the_terms( $post_id, 'category' );
 		$default_post_category = get_term( get_option( 'default_category' ) );
 
-		if ( 1 >= count( $post_terms ) && $default_post_category->term_id === $post_terms[0]->term_id ) {
-			$default_post_category           = get_term( get_option( 'default_category' ) );
-			$default_category_translations   = get_option( 'monk_term_translations_' . $default_post_category->term_id, array() );
-			$default_category_translation_id = array_key_exists( $language, $default_category_translations ) ? $default_category_translations[ $language ] : false;
+		if ( is_object( $post_terms[0] ) && is_object( $default_post_category ) ) {
+			if ( 1 >= count( $post_terms ) && $default_post_category->term_id === $post_terms[0]->term_id ) {
+				$default_post_category           = get_term( get_option( 'default_category' ) );
+				$default_category_translations   = get_option( 'monk_term_translations_' . $default_post_category->term_id, array() );
+				$default_category_translation_id = array_key_exists( $language, $default_category_translations ) ? $default_category_translations[ $language ] : false;
 
-			wp_set_post_terms( $post_id, array( $default_category_translation_id ), 'category' );
+				wp_set_post_terms( $post_id, array( $default_category_translation_id ), 'category' );
+			}
 		}
 	}
 
@@ -862,7 +864,20 @@ public function monk_customize_css() {
 	 * @return  void
 	 */
 	public function monk_admin_languages_selector() {
-		require plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/monk-language-filter.php';
+		$screen   = $this->get_current_screen();
+		$class    = wp_count_posts( $screen->post_type );
+		$has_post = false;
+		$is_trash = 'trash' === filter_input( INPUT_GET, 'post_status' ) ? true : false;
+
+		foreach ( $class as $type => $number ) {
+			if ( ( 'trash' !== $type && 'auto-draft' !== $type && 0 !== $number && ! $is_trash ) || ( 'trash' === $type && $is_trash && 0 !== $number ) ) {
+				$has_post = true;
+			}
+		}
+
+		if ( $has_post ) {
+			require plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/monk-language-filter.php';
+		}
 	}
 
 	/**
@@ -1081,7 +1096,7 @@ public function monk_edit_custom_taxonomy_field( $term ) {
 	 */
 	public function monk_taxonomy_language_column_content( $content, $column_name, $term_id ) {
 		if ( 'languages' === $column_name ) :
-			$monk_languages = monk_get_available_languages();
+			$monk_languages            = monk_get_available_languages();
 			$taxonomies                = get_taxonomies();
 			$monk_language             = get_term_meta( $term_id, '_monk_term_language', true );
 			$monk_term_translations_id = get_term_meta( $term_id, '_monk_term_translations_id', true );
@@ -1121,7 +1136,7 @@ public function monk_taxonomy_language_column_content( $content, $column_name, $
 	 * @return  void
 	 */
 	public function monk_term_translation_meta_field( $term ) {
-		$monk_languages = monk_get_available_languages();
+		$monk_languages            = monk_get_available_languages();
 		$monk_language             = get_term_meta( $term->term_id, '_monk_term_language', true );
 		$languages                 = get_option( 'monk_active_languages', false );
 		$taxonomies                = get_taxonomies();

admin/partials/admin-monk-language-name-render.php

@@ -15,8 +15,8 @@
 if ( ! $language ) : ?>
 	<?php if ( monk_get_url_args( 'lang' ) ) : ?>
 		<?php $language = monk_get_url_args( 'lang' ); ?>
-	<?php elseif ( $_REQUEST['post_id'] && get_post_meta( $_REQUEST['post_id'], '_monk_post_language', true ) ) : ?>
-		<?php $language = get_post_meta( $_REQUEST['post_id'], '_monk_post_language', true ); ?>
+	<?php elseif ( filter_input( INPUT_POST, 'post_id' ) && get_post_meta( filter_input( INPUT_POST, 'post_id' ), '_monk_post_language', true ) ) : ?>
+		<?php $language = get_post_meta( filter_input( INPUT_POST, 'post_id' ), '_monk_post_language', true ); ?>
 	<?php else : ?>
 		<?php $language = get_option( 'monk_default_language', false ); ?>
 	<?php endif; ?>
@@ -25,4 +25,4 @@
 	<span class="monk-language-name"><?php echo esc_html( $monk_languages[ $language ]['english_name'] ); ?></span>
 	<span class="monk-selector-flag flag-icon <?php echo esc_attr( 'flag-icon-' . $monk_languages[ $language ]['slug'] ); ?>"></span>
 </div>
-<input type="hidden" name="<?php echo sprintf( 'attachments[%d][language]', $post_id ); ?>" id="<?php echo sprintf( 'attachments[%d][language]', $post_id ); ?>" value="<?php echo esc_attr( $language ); ?>">
+<input type="hidden" name="<?php echo esc_attr( sprintf( 'attachments[%d][language]', $post_id ) ); ?>" id="<?php echo esc_attr( sprintf( 'attachments[%d][language]', $post_id ) ); ?>" value="<?php echo esc_attr( $language ); ?>">

admin/partials/admin-monk-site-description-render.php

@@ -13,10 +13,10 @@
 	die;
 }
 ?>
-<input type="text" name="blogdescription" value="<?php echo esc_attr( $site_description ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $default_slug ); ?>"></span><br>
+<input type="text" name="blogdescription" value="<?php echo esc_attr( $site_description ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $default_slug ); ?>" aria-label="<?php echo esc_attr( $monk_languages[ $default_language ]['native_name'] ); ?>" title="<?php echo esc_attr( $monk_languages[ $default_language ]['native_name'] ); ?>"></span><br>
 <?php foreach ( $active_languages as $lang ) : ?>
 	<?php if ( $lang !== $default_language ) : ?>
 		<?php $site_description = get_option( 'monk_' . $lang . '_blogdescription', '' ); ?>
-		<input type="text" name="<?php echo esc_attr( 'monk_' . $lang . '_blogdescription' ); ?>" value="<?php echo esc_attr( $site_description ); ?>" placeholder="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $monk_languages[ $lang ]['slug'] ); ?>"></span><br>
+		<input type="text" name="<?php echo esc_attr( 'monk_' . $lang . '_blogdescription' ); ?>" value="<?php echo esc_attr( $site_description ); ?>" placeholder="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $monk_languages[ $lang ]['slug'] ); ?>" aria-label="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>" title="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>"></span><br>
 	<?php endif; ?>
 <?php endforeach; ?>

admin/partials/admin-monk-site-name-render.php

@@ -13,10 +13,10 @@
 	die;
 }
 ?>
-<input type="text" name="blogname" value="<?php echo esc_attr( $site_name ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $default_slug ); ?>"></span><br>
+<input type="text" name="blogname" value="<?php echo esc_attr( $site_name ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $default_slug ); ?>" aria-label="<?php echo esc_attr( $monk_languages[ $default_language ]['native_name'] ); ?>" title="<?php echo esc_attr( $monk_languages[ $default_language ]['native_name'] ); ?>"></span><br>
 <?php foreach ( $active_languages as $lang ) : ?>
 	<?php if ( $lang !== $default_language ) : ?>
 		<?php $site_name = get_option( 'monk_' . $lang . '_blogname', '' ); ?>
-		<input type="text" name="<?php echo esc_attr( 'monk_' . $lang . '_blogname' ); ?>" value="<?php echo esc_attr( $site_name ); ?>" placeholder="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $monk_languages[ $lang ]['slug'] ); ?>"></span><br>
+		<input type="text" name="<?php echo esc_attr( 'monk_' . $lang . '_blogname' ); ?>" value="<?php echo esc_attr( $site_name ); ?>" placeholder="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>" class="regular-text"><span class="monk-language-flag flag-icon flag-icon-<?php echo esc_attr( $monk_languages[ $lang ]['slug'] ); ?>" aria-label="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>" title="<?php echo esc_attr( $monk_languages[ $lang ]['native_name'] ); ?>"></span><br>
 	<?php endif; ?>
 <?php endforeach; ?>

admin/partials/monk-language-column.php

@@ -17,7 +17,7 @@
 <div class="monk-column-translations">
 	<?php if ( $monk_language ) : ?>
 		<div class="monk-flag-wrapper">
-			<span class="monk-selector-flag flag-icon <?php echo esc_attr( 'flag-icon-' . $monk_languages[ $monk_language ]['slug'] ); ?>"></span>
+			<span class="monk-selector-flag flag-icon <?php echo esc_attr( 'flag-icon-' . $monk_languages[ $monk_language ]['slug'] ); ?>" aria-label="<?php echo esc_attr( $monk_languages[ $monk_language ]['english_name'] ); ?>" title="<?php echo esc_attr( $monk_languages[ $monk_language ]['english_name'] ); ?>"></span>
 		</div>
 		<?php if ( $available_languages ) : ?>
 			<div class="monk-button-wrapper">

includes/class-monk.php

@@ -67,7 +67,7 @@ class Monk {
 	public function __construct() {
 
 		$this->plugin_name = 'Monk';
-		$this->version = '0.5.0';
+		$this->version = '0.5.1';
 
 		$this->load_dependencies();
 		$this->set_locale();
@@ -113,7 +113,7 @@ private function load_dependencies() {
 		/**
 		 * Imports a global array with the translatable and native language names.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/monk-available-languages.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/monk-dictionaries.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.

includes/monk-available-languages.php → includes/monk-dictionaries.php

@@ -8,55 +8,7 @@
  * @subpackage Monk/Includes
  */
 
-	global $monk_languages, $monk_uncategorized_translations;
-	$monk_languages = array(
-		'da_DK' => array(
-			'native_name' => 'Dansk',
-			'name'        => __( 'Danish', 'monk' ),
-			'slug'        => 'da',
-		),
-		'en_US' => array(
-			'native_name' => 'English',
-			'name'        => __( 'English', 'monk' ),
-			'slug'        => 'en',
-		),
-		'fr_FR' => array(
-			'native_name' => 'Français',
-			'name'        => __( 'French', 'monk' ),
-			'slug'        => 'fr',
-		),
-		'de_DE' => array(
-			'native_name' => 'Deutsch',
-			'name'        => __( 'German', 'monk' ),
-			'slug'        => 'de',
-		),
-		'it_IT' => array(
-			'native_name' => 'Italiano',
-			'name'        => __( 'Italian', 'monk' ),
-			'slug'        => 'it',
-		),
-		'ja'    => array(
-			'native_name' => '日本の',
-			'name'        => __( 'Japanese', 'monk' ),
-			'slug'        => 'ja',
-		),
-		'pt_BR' => array(
-			'native_name' => 'Português (Brasil)',
-			'name'        => __( 'Portuguese (Brazil)', 'monk' ),
-			'slug'        => 'pt-br',
-		),
-		'ru_RU' => array(
-			'native_name' => 'Pусский',
-			'name'        => __( 'Russian', 'monk' ),
-			'slug'        => 'ru',
-		),
-		'es_ES' => array(
-			'native_name' => 'Español',
-			'name'        => __( 'Spanish', 'monk' ),
-			'slug'        => 'es',
-		),
-	);
-
+	global $monk_uncategorized_translations;
 	$monk_uncategorized_translations = array(
 		'en_US'          => 'Uncategorized',
 		'af'             => 'Ongekategoriseerd',

includes/monk-functions.php

@@ -18,7 +18,7 @@
  * @return boolean                  Language code validation.
  */
 function monk_is_language_code( $language_code ) {
-	$monk_languages = monk_get_available_languages();
+	$monk_languages  = monk_get_available_languages();
 	$languages_codes = array_keys( $monk_languages );
 
 	return in_array( $language_code , $language_codes, true );