diff --git a/includes/admin/templates/directory/pagination.php b/includes/admin/templates/directory/pagination.php index ed0af1e2..3a516c60 100644 --- a/includes/admin/templates/directory/pagination.php +++ b/includes/admin/templates/directory/pagination.php @@ -43,7 +43,7 @@ 'type' => 'text', 'label' => __( 'Results Text', 'ultimate-member' ), 'tooltip' => __( 'Customize the search result text . e.g. Found 3,000 Members. Leave this blank to not show result text', 'ultimate-member' ), - 'placeholder' => __( '{total_users} Members', 'ultimate-member' ), + 'description' => __( 'You could use {total_users} placeholder for getting users count', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value('_um_directory_header', null, 'na' ), ), array( @@ -51,7 +51,7 @@ 'type' => 'text', 'label' => __( 'Single Result Text', 'ultimate-member' ), 'tooltip' => __( 'Same as above but in case of 1 user found only', 'ultimate-member' ), - 'placeholder' => __( '{total_users} Member', 'ultimate-member' ), + 'description' => __( 'You could use {total_users} placeholder for getting users count', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value('_um_directory_header_single', null, 'na' ), ), array( @@ -59,7 +59,6 @@ 'type' => 'text', 'label' => __( 'Custom text if no users were found', 'ultimate-member' ), 'tooltip' => __( 'This is the text that is displayed if no users are found during a search', 'ultimate-member' ), - 'placeholder' => __( 'We are sorry. We cannot find any users who match your search criteria.', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value('_um_directory_no_users', null, 'na' ), ), ) diff --git a/includes/admin/templates/directory/profile.php b/includes/admin/templates/directory/profile.php index 6a4dcca4..9cfbddf1 100644 --- a/includes/admin/templates/directory/profile.php +++ b/includes/admin/templates/directory/profile.php @@ -59,7 +59,7 @@ array( 'id' => '_um_reveal_fields', 'type' => 'multi_selects', - 'label' => __( 'Choose field(s) to display in reveal section', 'ultimate-member' ), + 'label' => __( 'Choose field(s) to display in extra user information section', 'ultimate-member' ), 'value' => $_um_reveal_fields, 'add_text' => __( 'Add New Custom Field', 'ultimate-member' ), 'conditional' => array( '_um_show_userinfo', '=', 1 ), @@ -70,14 +70,15 @@ array( 'id' => '_um_show_social', 'type' => 'checkbox', - 'label' => __( 'Show social connect icons', 'ultimate-member' ), + 'label' => __( 'Show social connect icons in extra user information section', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_show_social' ), 'conditional' => array( '_um_show_userinfo', '=', 1 ) ), array( 'id' => '_um_userinfo_animate', 'type' => 'checkbox', - 'label' => __( 'Enable reveal section transition by default', 'ultimate-member' ), + 'label' => __( 'Hide extra user information to the reveal section', 'ultimate-member' ), + 'tooltip' => __( 'If not checked always shown', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_userinfo_animate' ), 'conditional' => array( '_um_show_userinfo', '=', 1 ) ), diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index aa82100a..0c881f8d 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -2202,7 +2202,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { * @title um_user_before_query * @description Action before users query on member directory * @input_vars - * [{"var":"$query_args","type":"array","desc":"Query arguments"}] + * [{"var":"$query_args","type":"array","desc":"Query arguments"}, + * {"var":"$md_class","type":"um\core\Member_Directory","desc":"Member Directory class"}] * @change_log * ["Since: 2.0"] * @usage add_action( 'um_user_before_query', 'function_name', 10, 1 ); @@ -2214,7 +2215,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { * } * ?> */ - do_action( 'um_user_before_query', $this->query_args ); + do_action( 'um_user_before_query', $this->query_args, $this ); add_filter( 'get_meta_sql', array( &$this, 'change_meta_sql' ), 10, 6 ); diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po index 21bbea5e..5c6bff9e 100644 --- a/languages/ultimate-member-en_US.po +++ b/languages/ultimate-member-en_US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Ultimate Member\n" -"POT-Creation-Date: 2019-11-26 19:03+0200\n" -"PO-Revision-Date: 2019-11-26 19:03+0200\n" +"POT-Creation-Date: 2019-11-27 17:27+0200\n" +"PO-Revision-Date: 2019-11-27 17:27+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en_US\n" @@ -3674,35 +3674,25 @@ msgid "" msgstr "" #: includes/admin/templates/directory/pagination.php:46 -#: includes/class-config.php:179 includes/class-config.php:279 -msgid "{total_users} Members" -msgstr "" - -#: includes/admin/templates/directory/pagination.php:51 -msgid "Single Result Text" +#: includes/admin/templates/directory/pagination.php:54 +msgid "You could use {total_users} placeholder for getting users count" msgstr "" #: includes/admin/templates/directory/pagination.php:52 -msgid "Same as above but in case of 1 user found only" +msgid "Single Result Text" msgstr "" #: includes/admin/templates/directory/pagination.php:53 -#: includes/class-config.php:180 includes/class-config.php:280 -msgid "{total_users} Member" -msgstr "" - -#: includes/admin/templates/directory/pagination.php:58 -msgid "Custom text if no users were found" -msgstr "" - -#: includes/admin/templates/directory/pagination.php:59 -msgid "" -"This is the text that is displayed if no users are found during a search" +msgid "Same as above but in case of 1 user found only" msgstr "" #: includes/admin/templates/directory/pagination.php:60 -#: includes/class-config.php:181 -msgid "We are sorry. We cannot find any users who match your search criteria." +msgid "Custom text if no users were found" +msgstr "" + +#: includes/admin/templates/directory/pagination.php:61 +msgid "" +"This is the text that is displayed if no users are found during a search" msgstr "" #: includes/admin/templates/directory/profile.php:20 @@ -3740,15 +3730,19 @@ msgid "Show extra user information below tagline?" msgstr "" #: includes/admin/templates/directory/profile.php:62 -msgid "Choose field(s) to display in reveal section" +msgid "Choose field(s) to display in extra user information section" msgstr "" #: includes/admin/templates/directory/profile.php:73 -msgid "Show social connect icons" +msgid "Show social connect icons in extra user information section" msgstr "" #: includes/admin/templates/directory/profile.php:80 -msgid "Enable reveal section transition by default" +msgid "Hide extra user information to the reveal section" +msgstr "" + +#: includes/admin/templates/directory/profile.php:81 +msgid "If not checked always shown" msgstr "" #: includes/admin/templates/directory/search.php:55 @@ -4586,6 +4580,18 @@ msgstr "" msgid "Password Reset" msgstr "" +#: includes/class-config.php:179 includes/class-config.php:279 +msgid "{total_users} Members" +msgstr "" + +#: includes/class-config.php:180 includes/class-config.php:280 +msgid "{total_users} Member" +msgstr "" + +#: includes/class-config.php:181 +msgid "We are sorry. We cannot find any users who match your search criteria." +msgstr "" + #: includes/class-config.php:250 msgid "Update Profile" msgstr ""