From fe2d45ece504eedea3cb7cadcc5a469f5241d18c Mon Sep 17 00:00:00 2001 From: chandonn Date: Mon, 21 Aug 2017 15:19:27 -0300 Subject: [PATCH 01/25] Fixed coding standards --- admin/class-monk-admin.php | 6 +++--- includes/monk-functions.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/class-monk-admin.php b/admin/class-monk-admin.php index 281219e1..56dfd4bb 100755 --- a/admin/class-monk-admin.php +++ b/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 ); @@ -1081,7 +1081,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 +1121,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(); diff --git a/includes/monk-functions.php b/includes/monk-functions.php index baca1551..35b173d5 100644 --- a/includes/monk-functions.php +++ b/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 ); From a3172c70338401c5972480fd228c8112ddd05b9d Mon Sep 17 00:00:00 2001 From: chandonn Date: Mon, 21 Aug 2017 15:27:25 -0300 Subject: [PATCH 02/25] Renamed file, from monk-available-languages to /monk-dictionaries --- includes/{monk-available-languages.php => monk-dictionaries.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename includes/{monk-available-languages.php => monk-dictionaries.php} (100%) diff --git a/includes/monk-available-languages.php b/includes/monk-dictionaries.php similarity index 100% rename from includes/monk-available-languages.php rename to includes/monk-dictionaries.php From ed848710711b9c6f51ca039e9bc019abd4f3b067 Mon Sep 17 00:00:00 2001 From: chandonn Date: Mon, 21 Aug 2017 15:48:41 -0300 Subject: [PATCH 03/25] Removed global $monk_languages --- includes/monk-dictionaries.php | 50 +--------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/includes/monk-dictionaries.php b/includes/monk-dictionaries.php index e97462fd..9e92170c 100644 --- a/includes/monk-dictionaries.php +++ b/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', From 513dc38f0b44d8a526658381d002a2e161010bfd Mon Sep 17 00:00:00 2001 From: Leonofre Date: Mon, 21 Aug 2017 20:00:42 -0300 Subject: [PATCH 04/25] Fixed bug on update attachment --- admin/class-monk-admin.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/admin/class-monk-admin.php b/admin/class-monk-admin.php index 281219e1..eec65809 100755 --- a/admin/class-monk-admin.php +++ b/admin/class-monk-admin.php @@ -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 ) && 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' ); + } } } From 994e5477292622e9a984e6d6ccf575044a06ed9f Mon Sep 17 00:00:00 2001 From: chandonn Date: Tue, 22 Aug 2017 00:21:39 -0300 Subject: [PATCH 05/25] Changed file call due to rename: monk-dictionaries.php --- includes/class-monk.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/class-monk.php b/includes/class-monk.php index 2dd24395..59361c73 100755 --- a/includes/class-monk.php +++ b/includes/class-monk.php @@ -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. From 6fac9a0a2374dac311a8b010d7ff120f440976cc Mon Sep 17 00:00:00 2001 From: chandonn Date: Tue, 22 Aug 2017 01:46:54 -0300 Subject: [PATCH 06/25] Added code to verify whether to show the post language filter or not --- admin/class-monk-admin.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/admin/class-monk-admin.php b/admin/class-monk-admin.php index 281219e1..51c2aabb 100755 --- a/admin/class-monk-admin.php +++ b/admin/class-monk-admin.php @@ -862,7 +862,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 = 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 ) || ( 'trash' === $type && $is_trash ) ) { + $has_post = true; + } + } + + if ( $has_post ) { + require plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/monk-language-filter.php'; + } } /** From 2c2f435e16c2bcf545d95f59586685949537e044 Mon Sep 17 00:00:00 2001 From: chandonn Date: Tue, 22 Aug 2017 08:25:47 -0300 Subject: [PATCH 07/25] Improved logic to cover the full possible cases in monk_admin_languages_selector --- admin/class-monk-admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/class-monk-admin.php b/admin/class-monk-admin.php index 51c2aabb..f7e6c93b 100755 --- a/admin/class-monk-admin.php +++ b/admin/class-monk-admin.php @@ -862,13 +862,13 @@ public function monk_customize_css() { * @return void */ public function monk_admin_languages_selector() { - $screen = get_current_screen(); + $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 ) || ( 'trash' === $type && $is_trash ) ) { + if ( ( 'trash' !== $type && 'auto-draft' !== $type && 0 !== $number && ! $is_trash ) || ( 'trash' === $type && $is_trash && 0 !== $number ) ) { $has_post = true; } } From 5d57f1f0ce4791fcc9eecd33e5b5a4742691f23e Mon Sep 17 00:00:00 2001 From: chandonn Date: Wed, 23 Aug 2017 00:28:47 -0300 Subject: [PATCH 08/25] Added new attribute to improve accessibility --- admin/partials/monk-language-column.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/partials/monk-language-column.php b/admin/partials/monk-language-column.php index 6e370d02..e5b75cee 100644 --- a/admin/partials/monk-language-column.php +++ b/admin/partials/monk-language-column.php @@ -17,7 +17,7 @@
- +
From d96f5d63f6456e4299cefab29b2e8dc2d34af0aa Mon Sep 17 00:00:00 2001 From: chandonn Date: Wed, 23 Aug 2017 06:09:51 -0300 Subject: [PATCH 09/25] Changed cursor over the Monk Love element to avoid misunderstandings --- public/css/monk-widget.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/monk-widget.css b/public/css/monk-widget.css index b4b956dc..5816647c 100644 --- a/public/css/monk-widget.css +++ b/public/css/monk-widget.css @@ -125,6 +125,7 @@ div#monk-language-switcher div.monk-love { margin-top: 5px; padding: 0; font-size: 12px; + cursor: default; } div#monk-language-switcher div.monk-love span.monk-heart { From 88a4e2f4d575bad7efe3f4883263ea03aaa0e276 Mon Sep 17 00:00:00 2001 From: chandonn Date: Thu, 24 Aug 2017 07:51:21 -0300 Subject: [PATCH 10/25] Removed the monk love public view from the Language Switcher div --- widgets/partials/public-monk-language-switcher.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/widgets/partials/public-monk-language-switcher.php b/widgets/partials/public-monk-language-switcher.php index d6ffea60..49152cc9 100644 --- a/widgets/partials/public-monk-language-switcher.php +++ b/widgets/partials/public-monk-language-switcher.php @@ -60,12 +60,12 @@ -
- ', 'Monk' ); - ?> -
-
+
+ ', 'Monk' ); + ?> +
+ From 9dcfb7469bc8705d8be58c562018f9aac12cbd18 Mon Sep 17 00:00:00 2001 From: chandonn Date: Thu, 24 Aug 2017 07:57:47 -0300 Subject: [PATCH 11/25] Ajusted css for monk love --- public/css/monk-widget.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/css/monk-widget.css b/public/css/monk-widget.css index 5816647c..59f1707d 100644 --- a/public/css/monk-widget.css +++ b/public/css/monk-widget.css @@ -119,16 +119,15 @@ div#monk-language-switcher div.monk-current-lang span.monk-current-lang-name spa width: 18px; } -div#monk-language-switcher div.monk-love { +div.monk-love { box-sizing: border-box; line-height: normal; margin-top: 5px; padding: 0; font-size: 12px; - cursor: default; } -div#monk-language-switcher div.monk-love span.monk-heart { +div.monk-love span.monk-heart { padding: 0; font-size: 12px; color: #de1414; From c49e37e54a07ec1c455723b1eb8cc4d2615c0e86 Mon Sep 17 00:00:00 2001 From: chandonn Date: Thu, 24 Aug 2017 08:50:10 -0300 Subject: [PATCH 12/25] Added accessibility attributes in the site description under monk options --- admin/partials/admin-monk-site-description-render.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/partials/admin-monk-site-description-render.php b/admin/partials/admin-monk-site-description-render.php index fd24ae43..5b9fdaad 100644 --- a/admin/partials/admin-monk-site-description-render.php +++ b/admin/partials/admin-monk-site-description-render.php @@ -13,10 +13,10 @@ die; } ?> -
+
-
+
From 328ca99244d5926103e46e1447a307a262feed92 Mon Sep 17 00:00:00 2001 From: chandonn Date: Thu, 24 Aug 2017 08:50:44 -0300 Subject: [PATCH 13/25] Added accessibility attributes in the site name under monk options --- admin/partials/admin-monk-site-name-render.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/partials/admin-monk-site-name-render.php b/admin/partials/admin-monk-site-name-render.php index 23a96db9..d859456d 100644 --- a/admin/partials/admin-monk-site-name-render.php +++ b/admin/partials/admin-monk-site-name-render.php @@ -13,10 +13,10 @@ die; } ?> -
+
-
+
From 987a4ba35c2597269b17f795d55e3ff038783bb1 Mon Sep 17 00:00:00 2001 From: chandonn Date: Thu, 24 Aug 2017 17:33:25 -0300 Subject: [PATCH 14/25] Added escaping function to this partial --- admin/partials/admin-monk-language-name-render.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/partials/admin-monk-language-name-render.php b/admin/partials/admin-monk-language-name-render.php index 229ef121..96107659 100644 --- a/admin/partials/admin-monk-language-name-render.php +++ b/admin/partials/admin-monk-language-name-render.php @@ -25,4 +25,4 @@
- + From 961b9ddb57ab8c1009520bbf0fe6b43cbdb4026e Mon Sep 17 00:00:00 2001 From: chandonn Date: Thu, 24 Aug 2017 17:46:36 -0300 Subject: [PATCH 15/25] Added title tag to spans, improving the UI --- admin/partials/admin-monk-site-description-render.php | 4 ++-- admin/partials/admin-monk-site-name-render.php | 4 ++-- admin/partials/monk-language-column.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/partials/admin-monk-site-description-render.php b/admin/partials/admin-monk-site-description-render.php index 5b9fdaad..2bf7f1fb 100644 --- a/admin/partials/admin-monk-site-description-render.php +++ b/admin/partials/admin-monk-site-description-render.php @@ -13,10 +13,10 @@ die; } ?> -
+
-
+
diff --git a/admin/partials/admin-monk-site-name-render.php b/admin/partials/admin-monk-site-name-render.php index d859456d..6e5b6e9b 100644 --- a/admin/partials/admin-monk-site-name-render.php +++ b/admin/partials/admin-monk-site-name-render.php @@ -13,10 +13,10 @@ die; } ?> -
+
-
+
diff --git a/admin/partials/monk-language-column.php b/admin/partials/monk-language-column.php index e5b75cee..67b8e406 100644 --- a/admin/partials/monk-language-column.php +++ b/admin/partials/monk-language-column.php @@ -17,7 +17,7 @@
- +
From 84383d50e2d35b62925349f9cf71b1b0b82a8e15 Mon Sep 17 00:00:00 2001 From: chandonn Date: Fri, 25 Aug 2017 11:30:45 -0300 Subject: [PATCH 16/25] Changed Monk version from 0.5.0 to 0.5.1 --- README.txt | 2 +- includes/class-monk.php | 2 +- monk.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.txt b/README.txt index 04491b37..77ab0097 100755 --- a/README.txt +++ b/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 diff --git a/includes/class-monk.php b/includes/class-monk.php index 2dd24395..ccb03375 100755 --- a/includes/class-monk.php +++ b/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(); diff --git a/monk.php b/monk.php index 83b2df5f..1ec0460e 100755 --- a/monk.php +++ b/monk.php @@ -3,7 +3,7 @@ * Plugin Name: Monk * Plugin URI: https://wordpress.org/plugins/monk * Description: Monk is a lightweight translation plugin to make your content reach the world. - * Version: 0.5.0 + * Version: 0.5.1 * Author: Breno Alves * Author URI: https://github.com/brenoalvs * License: GPL-2.0 or later From 5cf9b4a0828ea0a834214deeb2a2157d688bb37c Mon Sep 17 00:00:00 2001 From: chandonn Date: Fri, 25 Aug 2017 11:37:13 -0300 Subject: [PATCH 17/25] Updated the CHANGELOG file --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab4e55d2..8fb5b943 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## Changelog +- **[0.5.1]** + + Fixed themes and plugins language packs download + + Fixed bug on medias update process + + Added nation names when hovering a flag + + Improved the posts language filter to work more similarly to other filters + - **[0.5.0]** + Added site title and description translation + Added shortcode to retrieve translation links From d6fe5ef021bc0037426a641f876fb9c327532b6b Mon Sep 17 00:00:00 2001 From: chandonn Date: Fri, 25 Aug 2017 11:38:32 -0300 Subject: [PATCH 18/25] Updated the CHANGELOG section of the README file --- README.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.txt b/README.txt index 77ab0097..ca27bb0c 100755 --- a/README.txt +++ b/README.txt @@ -70,6 +70,12 @@ You must! Join us on our [GitHub repository](http://github.com/brenoalvs/monk/) == Changelog == += [0.5.1] = +* Fixed themes and plugins language packs download +* Fixed bug on medias update process +* Added nation names when hovering a flag +* Improved the posts language filter to work more similarly to other filters + = [0.5.0] = * Added site title and description translation * Added shortcode to retrieve translation links From 18c3d8a4fe8f2d1ca874e290ba4a870017c13852 Mon Sep 17 00:00:00 2001 From: chandonn Date: Fri, 25 Aug 2017 15:40:36 -0300 Subject: [PATCH 19/25] Fixed validation for the post_id from URL --- admin/partials/admin-monk-language-name-render.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/partials/admin-monk-language-name-render.php b/admin/partials/admin-monk-language-name-render.php index 96107659..291709a6 100644 --- a/admin/partials/admin-monk-language-name-render.php +++ b/admin/partials/admin-monk-language-name-render.php @@ -15,8 +15,8 @@ if ( ! $language ) : ?> - - + + From 33124e1e8c355603deca0871ef30c9c0bda3efbd Mon Sep 17 00:00:00 2001 From: chandonn Date: Fri, 25 Aug 2017 15:41:20 -0300 Subject: [PATCH 20/25] Added sanitizing function --- admin/partials/admin-monk-language-name-render.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/partials/admin-monk-language-name-render.php b/admin/partials/admin-monk-language-name-render.php index 291709a6..b3613bf3 100644 --- a/admin/partials/admin-monk-language-name-render.php +++ b/admin/partials/admin-monk-language-name-render.php @@ -25,4 +25,4 @@
- + From b8db54ed2853e3335fb663f327e7d522a7f69409 Mon Sep 17 00:00:00 2001 From: Breno Alvs Date: Sat, 26 Aug 2017 22:56:17 -0300 Subject: [PATCH 21/25] Modified release items message --- CHANGELOG.md | 4 ++-- README.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fb5b943..50ac1f13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,8 @@ - **[0.5.1]** + Fixed themes and plugins language packs download + Fixed bug on medias update process - + Added nation names when hovering a flag - + Improved the posts language filter to work more similarly to other filters + + 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 diff --git a/README.txt b/README.txt index ca27bb0c..bfb5d205 100755 --- a/README.txt +++ b/README.txt @@ -73,8 +73,8 @@ You must! Join us on our [GitHub repository](http://github.com/brenoalvs/monk/) = [0.5.1] = * Fixed themes and plugins language packs download * Fixed bug on medias update process -* Added nation names when hovering a flag -* Improved the posts language filter to work more similarly to other filters +* 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 From 6f48ee948655d71668bfe071f97b819a9fa9bc3f Mon Sep 17 00:00:00 2001 From: Leonofre Date: Mon, 28 Aug 2017 13:29:12 -0300 Subject: [PATCH 22/25] Removed unmerged improvement --- CHANGELOG.md | 1 - README.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50ac1f13..dc3eaf09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ ## Changelog - **[0.5.1]** - + Fixed themes and plugins language packs download + Fixed bug on medias update process + Fixed accessibility attributes on admin controls. + Fixed persistent language filter when post type has no posts. diff --git a/README.txt b/README.txt index bfb5d205..f9335c36 100755 --- a/README.txt +++ b/README.txt @@ -71,7 +71,6 @@ You must! Join us on our [GitHub repository](http://github.com/brenoalvs/monk/) == Changelog == = [0.5.1] = -* Fixed themes and plugins language packs download * Fixed bug on medias update process * Fixed accessibility attributes on admin controls. * Fixed persistent language filter when post type has no posts. From 684a1a4a72ddac960807ab8509f2eaa67a297c17 Mon Sep 17 00:00:00 2001 From: Leonofre Date: Mon, 28 Aug 2017 13:51:33 -0300 Subject: [PATCH 23/25] Updated .mo and .pot files --- languages/monk.mo | Bin 743 -> 743 bytes languages/monk.pot | 257 ++++++++++++++++++++++++--------------------- 2 files changed, 139 insertions(+), 118 deletions(-) diff --git a/languages/monk.mo b/languages/monk.mo index 54dccd642459a67058a102ff1b77015d2f5d3b32..cda3005d5c75d5f3a7e96921b6ac3e30ba28c15f 100644 GIT binary patch delta 19 acmaFP`kZw_ABT~Jf}ydMiN(fgflL5IHU=#K delta 19 acmaFP`kZw_ABUlZf}y3Af$7F+flL5IGX^UF diff --git a/languages/monk.pot b/languages/monk.pot index 9e95575b..eecd1f22 100755 --- a/languages/monk.pot +++ b/languages/monk.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Monk 0.1.0\n" "Report-Msgid-Bugs-To: Monk\n" -"POT-Creation-Date: 2017-08-18 19:05-0300\n" +"POT-Creation-Date: 2017-08-28 13:48-0300\n" "PO-Revision-Date: \n" "Last-Translator: Breno Alves\n" "Language-Team: Monk\n" @@ -23,6 +23,10 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" "X-Poedit-SearchPath-0: .\n" +#: includes/monk-functions.php:100 +msgid "English (United States)" +msgstr "" + #: includes/monk-available-languages.php:15 msgid "Danish" msgstr "" @@ -59,148 +63,106 @@ msgstr "" msgid "Spanish" msgstr "" -#: includes/monk-functions.php:100 -msgid "English (United States)" -msgstr "" - -#: widgets/class-monk-language-switcher.php:32 -msgid "Switch between site translations." -msgstr "" - -#: widgets/class-monk-language-switcher.php:34 admin/class-monk-admin.php:654 -msgid "Language Switcher" -msgstr "" - -#: widgets/class-monk-language-switcher.php:49 -#: widgets/partials/admin-monk-language-switcher.php:16 -msgid "Languages" -msgstr "" - -#: widgets/partials/admin-monk-language-switcher.php:21 -msgid "Title: " -msgstr "" - -#: widgets/partials/admin-monk-language-switcher.php:25 -msgid "Hide Flags" -msgstr "" - -#: widgets/partials/admin-monk-language-switcher.php:29 -msgid "Monk Love" +#: admin/class-monk-admin.php:125 +msgid "Monk Settings" msgstr "" -#: widgets/partials/public-monk-language-switcher.php:43 -msgid "No other translations" +#: admin/class-monk-admin.php:148 +#: admin/partials/admin-monk-settings-tabs-render.php:18 +msgid "Tools" msgstr "" -#: widgets/partials/public-monk-language-switcher.php:66 -#, php-format -msgid "Made with %1$s by %2$s" +#: admin/class-monk-admin.php:156 +#: admin/partials/admin-monk-settings-tabs-render.php:19 +msgid "Options" msgstr "" -#: admin/class-monk-admin.php:125 -msgid "Monk Settings" +#: admin/class-monk-admin.php:165 +msgid "General Settings" msgstr "" -#: admin/class-monk-admin.php:147 -msgid "General Settings" +#: admin/class-monk-admin.php:175 +msgid "Default site language" msgstr "" -#: admin/class-monk-admin.php:154 -#: admin/partials/admin-monk-settings-tabs-render.php:18 -msgid "Tools" +#: admin/class-monk-admin.php:184 +#: admin/partials/admin-monk-post-meta-box-field-render.php:80 +msgid "Add new translation" msgstr "" -#: admin/class-monk-admin.php:163 -msgid "Default site language" +#: admin/class-monk-admin.php:193 +msgid "Set default language to all posts and terms without language" msgstr "" -#: admin/class-monk-admin.php:172 +#: admin/class-monk-admin.php:202 msgid "Show default language in URL" msgstr "" -#: admin/class-monk-admin.php:181 -#: admin/partials/admin-monk-post-meta-box-field-render.php:80 -msgid "Add new translation" +#: admin/class-monk-admin.php:211 +msgid "Site Title" msgstr "" -#: admin/class-monk-admin.php:190 -msgid "Set default language to all posts and terms" +#: admin/class-monk-admin.php:220 +msgid "Tagline" msgstr "" -#: admin/class-monk-admin.php:218 +#: admin/class-monk-admin.php:248 msgid "Here you can configure your language preferences." msgstr "" -#: admin/class-monk-admin.php:219 +#: admin/class-monk-admin.php:249 msgid "" "Select a default language for your site and check the languages you will " "translate." msgstr "" -#: admin/class-monk-admin.php:318 admin/class-monk-admin.php:761 -#: admin/class-monk-admin.php:1238 +#: admin/class-monk-admin.php:422 admin/class-monk-admin.php:876 +#: admin/class-monk-admin.php:1353 #: admin/partials/admin-monk-language-update-term.php:20 #: admin/partials/admin-monk-language-term.php:19 #: admin/partials/admin-monk-language-term.php:39 msgid "Language" msgstr "" -#: admin/class-monk-admin.php:669 +#: admin/class-monk-admin.php:769 widgets/class-monk-language-switcher.php:34 +msgid "Language Switcher" +msgstr "" + +#: admin/class-monk-admin.php:784 msgid "Background" msgstr "" -#: admin/class-monk-admin.php:684 +#: admin/class-monk-admin.php:799 msgid "Text" msgstr "" -#: admin/class-monk-admin.php:699 +#: admin/class-monk-admin.php:814 msgid "Background Hover" msgstr "" -#: admin/class-monk-admin.php:714 +#: admin/class-monk-admin.php:829 msgid "Text Hover" msgstr "" -#: admin/class-monk-admin.php:1143 +#: admin/class-monk-admin.php:1258 msgid "No translations available" msgstr "" -#: admin/class-monk-admin.php:1244 +#: admin/class-monk-admin.php:1359 msgid "Translate" msgstr "" -#: admin/partials/admin-monk-select-menu-to-edit-render.php:35 -#, php-format -msgid "Translations of %s" -msgstr "" - -#: admin/partials/admin-monk-select-menu-to-edit-render.php:55 -msgid "— Select a Menu —" -msgstr "" - -#: admin/partials/admin-monk-select-menu-to-edit-render.php:113 -msgid "None" -msgstr "" - #: admin/partials/monk-language-filter.php:20 msgid "All Languages" msgstr "" -#: admin/partials/admin-monk-settings-tabs-render.php:17 -msgid "General" -msgstr "" - -#: admin/partials/admin-monk-term-translation.php:21 -#: admin/partials/admin-monk-post-meta-box-field-render.php:74 -msgid "Translations" -msgstr "" - -#: admin/partials/admin-monk-term-translation.php:47 -msgid "Add a translation +" +#: admin/partials/monk-language-column.php:29 +#: admin/partials/admin-monk-post-meta-box-field-render.php:78 +msgid "Add+" msgstr "" -#: admin/partials/admin-monk-term-translation.php:50 -msgid "You must set a language before add translations." +#: admin/partials/monk-language-column.php:34 +msgid "No language" msgstr "" #: admin/partials/admin-monk-language-selector-render.php:50 @@ -227,62 +189,64 @@ msgstr "" msgid "configure your language preferences" msgstr "" -#: admin/partials/admin-monk-settings-render.php:49 -msgid "Select the checkbox." +#: admin/partials/admin-monk-options-description.php:16 +msgid "Here you can translate some data referring to your site." msgstr "" -#: admin/partials/admin-monk-settings-render.php:50 -msgid "Defining language for posts and terms..." +#: admin/partials/admin-monk-language-term.php:50 +msgid "This is a translation of " msgstr "" -#: admin/partials/admin-monk-settings-render.php:52 -msgid "Downloading packages..." +#: admin/partials/admin-monk-menu-translation-fields-render.php:22 +msgid "Add translation +" msgstr "" -#: admin/partials/admin-monk-settings-render.php:54 -msgid "Done!" +#: admin/partials/admin-monk-menu-translation-fields-render.php:62 +msgid "Menu Translations" msgstr "" -#: admin/partials/admin-monk-settings-render.php:55 -msgid "Error. Try again." +#: admin/partials/admin-monk-menu-translation-fields-render.php:65 +msgid "This menu does not have translations. " msgstr "" -#: admin/partials/admin-monk-tools-description.php:17 -msgid "" -"Here you can set default language to all posts and terms without language." +#: admin/partials/admin-monk-menu-translation-fields-render.php:67 +msgid "You can add one here. " msgstr "" -#: admin/partials/admin-monk-tools-description.php:18 -msgid "Mark the checkbox and click on \"Save Changes\" to confirm." +#: admin/partials/admin-monk-settings-render.php:60 +msgid "Select the checkbox." msgstr "" -#: admin/partials/monk-language-column.php:29 -#: admin/partials/admin-monk-post-meta-box-field-render.php:78 -msgid "Add+" +#: admin/partials/admin-monk-settings-render.php:61 +msgid "Defining language for posts and terms..." msgstr "" -#: admin/partials/monk-language-column.php:34 -msgid "No language" +#: admin/partials/admin-monk-settings-render.php:67 +msgid "Saving Options..." msgstr "" -#: admin/partials/admin-monk-language-term.php:50 -msgid "This is a translation of " +#: admin/partials/admin-monk-settings-render.php:76 +msgid "Downloading packages..." msgstr "" -#: admin/partials/admin-monk-menu-translation-fields-render.php:22 -msgid "Add translation +" +#: admin/partials/admin-monk-settings-render.php:80 +msgid "Done!" msgstr "" -#: admin/partials/admin-monk-menu-translation-fields-render.php:62 -msgid "Menu Translations" +#: admin/partials/admin-monk-settings-render.php:81 +msgid "Error. Try again." msgstr "" -#: admin/partials/admin-monk-menu-translation-fields-render.php:65 -msgid "This menu does not have translations. " +#: admin/partials/admin-monk-widget-notice.php:24 +msgid "Remember to activate the " msgstr "" -#: admin/partials/admin-monk-menu-translation-fields-render.php:67 -msgid "You can add one here. " +#: admin/partials/admin-monk-widget-notice.php:24 +msgid "language switcher." +msgstr "" + +#: admin/partials/admin-monk-settings-tabs-render.php:17 +msgid "General" msgstr "" #: admin/partials/admin-monk-post-meta-box-field-render.php:21 @@ -294,6 +258,11 @@ msgstr "" msgid "Translating \"%s\"." msgstr "" +#: admin/partials/admin-monk-post-meta-box-field-render.php:74 +#: admin/partials/admin-monk-term-translation.php:21 +msgid "Translations" +msgstr "" + #: admin/partials/admin-monk-post-meta-box-field-render.php:150 #: admin/partials/admin-monk-post-meta-box-field-render.php:189 msgid "Cancel" @@ -311,10 +280,62 @@ msgstr "" msgid "Not translated, add one" msgstr "" -#: admin/partials/admin-monk-widget-notice.php:24 -msgid "Remember to activate the " +#: admin/partials/admin-monk-tools-description.php:17 +msgid "" +"Here you can set default language to all posts and terms without language." msgstr "" -#: admin/partials/admin-monk-widget-notice.php:24 -msgid "language switcher." +#: admin/partials/admin-monk-tools-description.php:18 +msgid "Mark the checkbox and click on \"Save Changes\" to confirm." +msgstr "" + +#: admin/partials/admin-monk-select-menu-to-edit-render.php:35 +#, php-format +msgid "Translations of %s" +msgstr "" + +#: admin/partials/admin-monk-select-menu-to-edit-render.php:55 +msgid "— Select a Menu —" +msgstr "" + +#: admin/partials/admin-monk-select-menu-to-edit-render.php:113 +msgid "None" +msgstr "" + +#: admin/partials/admin-monk-term-translation.php:47 +msgid "Add a translation +" +msgstr "" + +#: admin/partials/admin-monk-term-translation.php:50 +msgid "You must set a language before add translations." +msgstr "" + +#: widgets/class-monk-language-switcher.php:32 +msgid "Switch between site translations." +msgstr "" + +#: widgets/class-monk-language-switcher.php:49 +#: widgets/partials/admin-monk-language-switcher.php:16 +msgid "Languages" +msgstr "" + +#: widgets/partials/public-monk-language-switcher.php:43 +msgid "No other translations" +msgstr "" + +#: widgets/partials/public-monk-language-switcher.php:66 +#, php-format +msgid "Made with %1$s by %2$s" +msgstr "" + +#: widgets/partials/admin-monk-language-switcher.php:21 +msgid "Title: " +msgstr "" + +#: widgets/partials/admin-monk-language-switcher.php:25 +msgid "Hide Flags" +msgstr "" + +#: widgets/partials/admin-monk-language-switcher.php:29 +msgid "Monk Love" msgstr "" From 12e00afa2aec5f4c7c5d0aa0578599a22b5d604a Mon Sep 17 00:00:00 2001 From: Leonofre Date: Mon, 28 Aug 2017 14:03:50 -0300 Subject: [PATCH 24/25] Removed .mo file --- languages/monk.mo | Bin 743 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 languages/monk.mo diff --git a/languages/monk.mo b/languages/monk.mo deleted file mode 100644 index cda3005d5c75d5f3a7e96921b6ac3e30ba28c15f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 743 zcmZut&2G~`5Dq^lA31YaB#s$lrvc1bIgqqP6^*bO7xlJU?7=ZOyVmZyBoD%4^p*N7 zjDK)~#7LiZX1;HJb{=0m|2-jlLU>7dO?XC_5?YH04^JnP5A?R0(GsJ7VCLW|hp%XC zsTF5yt$wn=5BGs=Uq$dAT?6iN;+*gTN+fFeXQ=$5~+$t76>WI-7xHLjx$u^cH^zD z))&Wx+f7$mIaJj3P}3$3_wG$y$x_8E+e%~6EpF3Gh>p5;`gb&Np)#G9s^Bd8Ryr@K z8Y3&X)MjTnQ*{^G#VlsMyHM=af`zenNBiwvu6Hy9Hcj0gin9aSJNSeOP5-e(V_rHI z`tSTXmGmKObYn7H^^0-VZ#J@@@$gHV++LTKItmdBjL~Ld>vq+tyXWC_mK`b4xzaf^ zs5w1hwNjrq-p6z_03Uuv-duj|%B-vD`Z0L3T_EK7` brQ34m`;`6Pncn_$CX^=ICR70d)p(OXA{phk From d7015f22ac046b817688fac22e82606a8fab044f Mon Sep 17 00:00:00 2001 From: Leonofre Date: Mon, 28 Aug 2017 18:50:33 -0300 Subject: [PATCH 25/25] Fixed bug on set default category translation to post --- admin/class-monk-admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/class-monk-admin.php b/admin/class-monk-admin.php index ed554d17..0af81aea 100755 --- a/admin/class-monk-admin.php +++ b/admin/class-monk-admin.php @@ -569,7 +569,7 @@ 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 ( is_object( $post_terms ) && is_object( $default_post_category ) ) { + 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() );