Merge branch 'release/1.7.5'

Author: picklewagon

includes/plugins.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Contains all functionality to make the New User Approve plugin
+ * compatible with all plugins.
+ */
+
+/*
+ * Don't show the error if the s2member plugin is active
+ */
+function nua_c2member_dismiss_membership_notice( $show_notice ) {
+	if ( class_exists( 'c_ws_plugin__s2member_constants' ) ) {
+		$show_notice = false;
+	}
+
+	return $show_notice;
+}
+add_filter( 'new_user_approve_show_membership_notice', 'nua_c2member_dismiss_membership_notice' );

includes/user-list.php

@@ -171,10 +171,8 @@ public function status_filter( $which ) {
 		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'View all users', 'new-user-approve' ); ?></label>
 		<select id="<?php echo $id ?>" name="<?php echo $id ?>" style="float: none; margin: 0 0 0 15px;">
 			<option value=""><?php _e( 'View all users', 'new-user-approve' ); ?></option>
-		<?php foreach ( pw_new_user_approve()->get_user_statuses() as $status => $users ) : ?>
-			<?php if ( count( $users ) ) : ?>
+		<?php foreach ( pw_new_user_approve()->get_valid_statuses() as $status ) : ?>
 			<option value="<?php echo esc_attr( $status ); ?>"<?php selected( $status, $filtered_status ); ?>><?php echo esc_html( $status ); ?></option>
-			<?php endif; ?>
 		<?php endforeach; ?>
 		</select>
 		<?php echo apply_filters( 'new_user_approve_filter_button', $filter_button ); ?>
@@ -193,7 +191,7 @@ public function status_filter( $which ) {
 	 * @uses pre_user_query
 	 * @param $query
 	 */
-		public function filter_by_status( $query ) {
+    public function filter_by_status( $query ) {
 		global $wpdb;
 
 		if ( !is_admin() ) {
@@ -420,10 +418,10 @@ public function save_profile_status_field( $user_id ) {
 	public function pending_users_bubble() {
 		global $menu;
 
-		$users = pw_new_user_approve()->get_user_statuses();
+		$users = pw_new_user_approve()->get_count_of_user_statuses();
 
-		// Count Number of Pending Members
-		$pending_users = count( $users['pending'] );
+		// Get the number of pending users
+		$pending_users = $users['pending'];
 
 		// Make sure there are pending members
 		if ( $pending_users > 0 ) {

localization/new-user-approve-bg_BG.mo

@@ -0,0 +1,328 @@
+# New User Approve WordPress plugin
+# Copyright (C) 2013 Josh Harrison
+# This file is distributed under the same license as the parent package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: New User Approve\n"
+"Report-Msgid-Bugs-To: http://wordpress.org/tag/new-user-approve\n"
+"POT-Creation-Date: 2017-05-20 01:20+0300\n"
+"PO-Revision-Date: 2017-05-23 11:37+0300\n"
+"Language-Team: Picklewagon <josh@picklewagon.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.2\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c\n"
+"X-Poedit-Basepath: .\n"
+"Last-Translator: Spas Zdravkov Spasov [WP: @spaszs] <spas.z.spasov@gmail."
+"com>\n"
+"Language: bg_BG\n"
+"X-Poedit-SearchPath-0: ..\n"
+"X-Poedit-SearchPath-1: ../includes\n"
+
+#: ../new-user-approve.php:98
+#, php-format
+msgid "New User Approve requires WordPress %s or newer."
+msgstr ""
+"New User Approve (Одобри нови потребители) изисква WordPress %s или по-нова "
+"версия."
+
+#: ../new-user-approve.php:145
+#, php-format
+msgid ""
+"The Membership setting must be turned on in order for the New User Approve "
+"to work correctly. <a href=\"%1$s\">Update in settings</a>. | <a href=\"%2$s"
+"\">Hide Notice</a>"
+msgstr ""
+"За да работи New User Approve коректно е необходимо отметката Всеки може да "
+"се регистрира (раздел Членство, меню Настройки) да бъде включена. <a href="
+"\"%1$s\">Актуализирай настройките</a>. | <a href=\"%2$s\">Скрий известието</"
+"a>."
+
+#: ../new-user-approve.php:257
+msgid "<strong>ERROR</strong>: Your account is still pending approval."
+msgstr "<strong>Грешка</strong>: Вашата потребителска сметка очаква одобрение."
+
+#: ../new-user-approve.php:260
+msgid ""
+"<strong>ERROR</strong>: Your account has been denied access to this site."
+msgstr ""
+"<strong>Грешка</strong>: Достъпъпа на вашата потребителска сметка до тази "
+"страница е забранен."
+
+#: ../new-user-approve.php:362
+msgid "Users"
+msgstr "Потребители"
+
+#: ../new-user-approve.php:392
+#, php-format
+msgid "[%s] User Approval"
+msgstr "Потребителя [%s] е одобрен."
+
+#: ../new-user-approve.php:454
+#, php-format
+msgid ""
+"<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a "
+"href=\"mailto:%s\">webmaster</a> !"
+msgstr ""
+"<strong>Грешка</strong>: Меуспешна регистрация... моля сържете с <a href="
+"\"mailto:%s\">уеб администатора</a> !"
+
+#: ../new-user-approve.php:520
+#, php-format
+msgid "[%s] Registration Approved"
+msgstr "[%s] Регострацията е одобрена"
+
+#: ../new-user-approve.php:550
+#, php-format
+msgid "[%s] Registration Denied"
+msgstr "[%s] Регистрацията е отказана"
+
+#: ../new-user-approve.php:614
+msgid "Registration successful."
+msgstr "Успешна регистрация."
+
+#: ../new-user-approve.php:617
+msgid "Pending Approval"
+msgstr "Очаква Одобрение"
+
+#: ../admin/templates/approve.php:6
+msgid "User successfully updated."
+msgstr "Потребителят е обновен успешно."
+
+#: ../admin/templates/approve.php:11
+msgid "User Registration Approval"
+msgstr "Одобряване на регистрация на потребител"
+
+# "Approve New Users" must be translated as "Одобри нови потребители" but it is too long for a menu element, so the translation is "Нови потребители", which means "New users"
+#: ../includes/admin-approve.php:50
+msgid "Approve New Users"
+msgstr "Нови потребители"
+
+#: ../includes/admin-approve.php:82
+msgid "Username"
+msgstr "Потребителско име"
+
+#: ../includes/admin-approve.php:83
+msgid "Name"
+msgstr "Име"
+
+#: ../includes/admin-approve.php:84
+msgid "E-mail"
+msgstr "Е-поща"
+
+#: ../includes/admin-approve.php:86 ../includes/admin-approve.php:88
+msgid "Actions"
+msgstr "Действия"
+
+#: ../includes/admin-approve.php:129
+msgid "email:"
+msgstr "е-поща:"
+
+#: ../includes/admin-approve.php:133 ../includes/user-list.php:97
+#: ../includes/user-list.php:223 ../includes/user-list.php:224
+msgid "Approve"
+msgstr "Одобри"
+
+#: ../includes/admin-approve.php:138 ../includes/user-list.php:98
+#: ../includes/user-list.php:226 ../includes/user-list.php:227
+msgid "Deny"
+msgstr "Откажи"
+
+#: ../includes/admin-approve.php:154
+msgid "approved"
+msgstr "одобрен"
+
+#: ../includes/admin-approve.php:156
+msgid "denied"
+msgstr "отказан"
+
+#: ../includes/admin-approve.php:158
+msgid "pending"
+msgstr "необработен"
+
+#: ../includes/admin-approve.php:161
+#, php-format
+msgid "There are no users with a status of %s"
+msgstr "Няма потребители със статус %s"
+
+#: ../includes/admin-approve.php:197
+#, php-format
+msgid ""
+"You can now update user status on the <a href=\"%1$s\">users admin page</a>. "
+"| <a href=\"%2$s\">Hide Notice</a>"
+msgstr ""
+"Сега можете да обновите потребителския статус в <a href=\"%1$s\">страницата "
+"администриране на потребители</a>. | <a href=\"%2$s\">Скрий известието</a>"
+
+#: ../includes/admin-approve.php:220
+msgid "Approve Users"
+msgstr "Одобри Потребители"
+
+#: ../includes/admin-approve.php:221
+msgid "Updates"
+msgstr "Обновления"
+
+#: ../includes/admin-approve.php:222
+msgid "Support"
+msgstr "Поддръжка"
+
+#: ../includes/admin-approve.php:223
+msgid "Feedback"
+msgstr "Обратна връзка"
+
+#: ../includes/admin-approve.php:231
+msgid "Users Pending Approval"
+msgstr "Потребители Очакващи Одобрение"
+
+#: ../includes/admin-approve.php:233
+msgid "Approved Users"
+msgstr "Одобрени Потребители"
+
+#: ../includes/admin-approve.php:235
+msgid "Denied Users"
+msgstr "Отхвърлени Потребители"
+
+#: ../includes/email-tags.php:235
+msgid "The user's username on the site as well as the Username label"
+msgstr ""
+"Потребителското име на потребителя в сайта също както етикет Потребителско "
+"име"
+
+#: ../includes/email-tags.php:241
+msgid "The user's email address"
+msgstr "Е-поща на потребителя"
+
+#: ../includes/email-tags.php:247
+msgid "Your site name"
+msgstr "Името на вашия сайт"
+
+#: ../includes/email-tags.php:253
+msgid "Your site URL"
+msgstr "Адревсът на вашия сайт"
+
+#: ../includes/email-tags.php:259
+msgid "The URL to approve/deny users"
+msgstr "Адсресът за одобрение/отказ на потребителски заявки"
+
+#: ../includes/email-tags.php:265
+msgid "The URL to login to the site"
+msgstr "Адрессът за влизане в сайта"
+
+#: ../includes/email-tags.php:271
+msgid "Generates the password for the user to add to the email"
+msgstr "Генерира паролата на потребителя, която ще бъде вмъкната в е-писмото"
+
+#: ../includes/email-tags.php:299
+#, php-format
+msgid "Username: %s"
+msgstr "Нова заявка за потребителско име: %s"
+
+#: ../includes/email-tags.php:390
+#, php-format
+msgid "Password: %s"
+msgstr "Парола: %s"
+
+#: ../includes/messages.php:9
+msgid "You have been approved to access {sitename}"
+msgstr "Вашето запитване за достъп до {sitename} беше одобрено."
+
+#: ../includes/messages.php:12
+msgid "To set or reset your password, visit the following address:"
+msgstr "За да зададете или промените вашата парола, посетете следния адрес:"
+
+#: ../includes/messages.php:25
+msgid "You have been denied access to {sitename}."
+msgstr "Вашето запитване за достъп до {sitename} беше отказано."
+
+#: ../includes/messages.php:38
+msgid ""
+"An email has been sent to the site administrator. The administrator will "
+"review the information that has been submitted and either approve or deny "
+"your request."
+msgstr ""
+"Беше изпратено е-писмо до администратора. Той ще прегледа информацията, "
+"която е изпратена и ще одобри или ще откаже вашето запитване."
+
+#: ../includes/messages.php:40
+msgid ""
+"You will receive an email with instructions on what you will need to do "
+"next. Thanks for your patience."
+msgstr ""
+"Вие ще получите е-писмо с инструкции за това, което следва да направите. "
+"Благодарим за търпението."
+
+#: ../includes/messages.php:53
+msgid ""
+"Welcome to {sitename}. This site is accessible to approved users only. To be "
+"approved, you must first register."
+msgstr ""
+"Добре дошли в {sitename}. Тази страница е достъпна само за одобрени "
+"потребители. За да бъдете одобрен първо трябва да се регистрирате."
+
+#: ../includes/messages.php:66
+msgid "{username} ({user_email}) has requested a username at {sitename}"
+msgstr ""
+"{username} ({user_email}) изпрати запитване за потребителско име в "
+"{sitename}:"
+
+#: ../includes/messages.php:68
+msgid "To approve or deny this user access to {sitename} go to"
+msgstr ""
+"За да одобрите или откажете тази потребителска сметка в {sitename}, отидете "
+"на адрес:"
+
+#: ../includes/messages.php:83
+msgid ""
+"After you register, your request will be sent to the site administrator for "
+"approval. You will then receive an email with further instructions."
+msgstr ""
+"След вашата регистрация, вашето запитване ще бъде препратено за одобрение до "
+"администратора на сайта. След това ще получите е-писмо с последващи "
+"инстукции."
+
+#: ../includes/user-list.php:120
+msgid "Status"
+msgstr "Статус"
+
+#: ../includes/user-list.php:156
+msgid "Filter"
+msgstr "Филтър"
+
+#: ../includes/user-list.php:161 ../includes/user-list.php:163
+msgid "View all users"
+msgstr "Виж всички потребители"
+
+#: ../includes/user-list.php:320
+#, php-format
+msgid "User denied."
+msgid_plural "%s users denied."
+msgstr[0] "Потребителят е отказан."
+msgstr[1] "Потребителите %s са отказани."
+
+#: ../includes/user-list.php:325
+#, php-format
+msgid "User approved."
+msgid_plural "%s users approved."
+msgstr[0] "Потребителят е обновен."
+msgstr[1] "Потребителите %s са одобрени."
+
+#: ../includes/user-list.php:349
+msgid "Access Status"
+msgstr "Статус на Достъп"
+
+#: ../includes/user-list.php:354
+msgid "-- Status --"
+msgstr "-- Статус --"
+
+#: ../includes/user-list.php:362
+msgid "If user has access to sign in or not."
+msgstr "Ако потребителя има достъп за влисване, или ако няма."
+
+#: ../includes/user-list.php:365
+msgid "Current user status is <strong>pending</strong>."
+msgstr "Текущият потребителси статис е <strong>Необработен</strong>."