Merge tag '5.2.2' into develop

v5.2.2
Esteban-Rocha · Jun 9, 2018 · ecf30a1 · ecf30a1
2 parents 12ca536 + 3aab516
commit ecf30a1
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/class/Abstracts/MergeTag.php b/class/Abstracts/MergeTag.php
@@ -203,7 +203,7 @@ public function set_trigger( Interfaces\Triggerable $trigger ) {
 	/**
 	 * Sets resolver function
 	 *
-	 * @since [Next]
+	 * @since 5.2.2
 	 * @param mixed $resolver Resolver, can be either a closure or array or string.
 	 */
 	public function set_resolver( $resolver ) {
@@ -249,7 +249,7 @@ public function is_hidden() {
 	/**
 	 * Cleans the value
 	 *
-	 * @since  [Next]
+	 * @since  5.2.2
 	 * @return void
 	 */
 	public function clean_value() {

diff --git a/class/Abstracts/Trigger.php b/class/Abstracts/Trigger.php
@@ -281,7 +281,7 @@ private function resolve_fields() {
 	/**
 	 * Cleans the merge tags.
 	 *
-	 * @since [Next]
+	 * @since 5.2.2
 	 * @return void
 	 */
 	private function clean_merge_tags() {

diff --git a/class/Admin/Settings.php b/class/Admin/Settings.php
@@ -339,15 +339,15 @@ public function notifications_settings( $settings ) {
 				'default'     => '',
 				'render'      => array( new CoreFields\Text(), 'input' ),
 				'sanitize'    => array( new CoreFields\Text(), 'sanitize' ),
-				'description' => sprintf( __( 'Leave blank to use default value: %s' ), '<code>WordPress</code>' ),
+				'description' => sprintf( __( 'Leave blank to use default value: %s', 'notification' ), '<code>WordPress</code>' ),
 			) )
 			->add_field( array(
 				'name'        => __( 'From Email', 'notification' ),
 				'slug'        => 'from_email',
 				'default'     => '',
 				'render'      => array( new CoreFields\Text(), 'input' ),
 				'sanitize'    => array( new CoreFields\Text(), 'sanitize' ),
-				'description' => sprintf( __( 'Leave blank to use default value: %s' ), '<code>' . $default_from_email . '</code>' ),
+				'description' => sprintf( __( 'Leave blank to use default value: %s', 'notification' ), '<code>' . $default_from_email . '</code>' ),
 			) );
 
 		$notifications->add_group( __( 'Webhook', 'notification' ), 'webhook' )

diff --git a/class/Admin/Share.php b/class/Admin/Share.php
@@ -24,7 +24,7 @@ class Share {
 	/**
 	 * Share class constructor.
 	 *
-	 * @since [Next]
+	 * @since 5.2.2
 	 * @param View $view View class.
 	 */
 	public function __construct( View $view ) {

diff --git a/class/Defaults/MergeTag/Taxonomy/TaxonomyName.php b/class/Defaults/MergeTag/Taxonomy/TaxonomyName.php
@@ -28,7 +28,7 @@ class TaxonomyName extends StringTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      * @param array $params merge tag configuration params.
      */
     public function __construct( $params = array() ) {
@@ -65,7 +65,7 @@ public function check_requirements() {
 	/**
 	 * Gets nice, translated taxonomy name
 	 *
-	 * @since  [Next]
+	 * @since  5.2.2
 	 * @return string taxonomy nicename
 	 */
 	public function get_nicename() {

diff --git a/class/Defaults/MergeTag/Taxonomy/TaxonomySlug.php b/class/Defaults/MergeTag/Taxonomy/TaxonomySlug.php
@@ -28,7 +28,7 @@ class TaxonomySlug extends StringTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      * @param array $params merge tag configuration params.
      */
     public function __construct( $params = array() ) {

diff --git a/class/Defaults/MergeTag/Taxonomy/TermDescription.php b/class/Defaults/MergeTag/Taxonomy/TermDescription.php
@@ -21,7 +21,7 @@ class TermDescription extends StringTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      */
     public function __construct() {
 

diff --git a/class/Defaults/MergeTag/Taxonomy/TermID.php b/class/Defaults/MergeTag/Taxonomy/TermID.php
@@ -21,7 +21,7 @@ class TermID extends IntegerTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      */
     public function __construct() {
 

diff --git a/class/Defaults/MergeTag/Taxonomy/TermName.php b/class/Defaults/MergeTag/Taxonomy/TermName.php
@@ -21,7 +21,7 @@ class TermName extends StringTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      */
     public function __construct() {
 

diff --git a/class/Defaults/MergeTag/Taxonomy/TermSlug.php b/class/Defaults/MergeTag/Taxonomy/TermSlug.php
@@ -21,7 +21,7 @@ class TermSlug extends StringTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      */
     public function __construct() {
 

diff --git a/class/Defaults/MergeTag/User/UserPasswordResetLink.php b/class/Defaults/MergeTag/User/UserPasswordResetLink.php
@@ -35,7 +35,7 @@ class UserPasswordResetLink extends StringTag {
 	/**
      * Merge tag constructor
      *
-     * @since [Next]
+     * @since 5.2.2
      */
     public function __construct() {
 

diff --git a/class/Defaults/Trigger/Taxonomy/TermTrigger.php b/class/Defaults/Trigger/Taxonomy/TermTrigger.php
@@ -61,7 +61,7 @@ public function merge_tags() {
 	/**
 	 * Gets nice, translated taxonomy name
 	 *
-	 * @since  [Next]
+	 * @since  5.2.2
 	 * @return string taxonomy
 	 */
 	public function get_current_taxonomy_name() {
@@ -71,7 +71,7 @@ public function get_current_taxonomy_name() {
 	/**
 	 * Gets nice, translated taxonomy name for taxonomy slug
 	 *
-	 * @since [Next]
+	 * @since 5.2.2
 	 * @param string $taxonomy taxonomy slug.
 	 * @return string taxonomy
 	 */
@@ -82,7 +82,7 @@ public static function get_taxonomy_name( $taxonomy ) {
 	/**
 	 * Gets nice, translated singular taxonomy name for taxonomy slug
 	 *
-	 * @since [Next]
+	 * @since 5.2.2
 	 * @param string $taxonomy taxonomy slug.
 	 * @return string taxonomy
 	 */

diff --git a/class/Integration/WordPress.php b/class/Integration/WordPress.php
@@ -17,7 +17,7 @@ class WordPress {
 	 *
 	 * @filter wp_mail_from_name 1000
 	 *
-	 * @since  [Next]
+	 * @since  5.2.2
 	 * @param  string $from_name Default From Name.
 	 * @return string
 	 */
@@ -34,7 +34,7 @@ public function filter_email_from_name( $from_name ) {
 	 *
 	 * @filter wp_mail_from 1000
 	 *
-	 * @since  [Next]
+	 * @since  5.2.2
 	 * @param  string $from_email Default From Email.
 	 * @return string
 	 */

diff --git a/inc/functions/general.php b/inc/functions/general.php
@@ -8,7 +8,7 @@
 /**
  * Adds handlers for doc hooks to an object
  *
- * @since  [Next]
+ * @since  5.2.2
  * @param  object $object Object to create the hooks.
  * @return object
  */
@@ -21,7 +21,7 @@ function notification_add_doc_hooks( $object ) {
 /**
  * Checks if the story should be displayed.
  *
- * @since  [Next]
+ * @since  5.2.2
  * @return boolean
  */
 function notification_display_story() {

diff --git a/notification.php b/notification.php
@@ -4,7 +4,7 @@
  * Description: Customisable email and webhook notifications with powerful developer friendly API for custom triggers and notifications. Send alerts easily.
  * Author: BracketSpace
  * Author URI: https://bracketspace.com
- * Version: 5.2.1
+ * Version: 5.2.2
  * License: GPL3
  * Text Domain: notification
  * Domain Path: /languages

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.me/underDEV/
 Tags: notification, notify, alert, email, mail, webhook, API, developer, framework
 Requires at least: 4.6
 Tested up to: 4.9.5
-Stable tag: 5.2.1
+Stable tag: 5.2.2
 Requires PHP: 5.3
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html

diff --git a/views/story.php b/views/story.php
@@ -11,28 +11,28 @@
 
 	<h1>Wait a moment...</h1>
 
-	<p><?php _e( 'I know you\'ve been using the Notification plugin for a while. That makes me very proud of my work.' ); ?></p>
+	<p><?php _e( 'I know you\'ve been using the Notification plugin for a while. That makes me very proud of my work.', 'notification' ); ?></p>
 
-	<p><?php _e( 'The biggest problem is the plugin popularity. While I truly believe it\'s a very good software, still not to many people know that it exists.' ); ?></p>
+	<p><?php _e( 'The biggest problem is the plugin popularity. While I truly believe it\'s a very good software, still not to many people know that it exists.', 'notification' ); ?></p>
 
-	<p><?php _e( 'You can help me change that.' ); ?></p>
+	<p><?php _e( 'You can help me change that.', 'notification' ); ?></p>
 
-	<p><?php _e( 'Think about just one person who would be interested in this plugin.' ); ?></p>
+	<p><?php _e( 'Think about just one person who would be interested in this plugin.', 'notification' ); ?></p>
 
-	<p><?php _e( 'Then, send this person a link to this plugin:' ); ?></p>
+	<p><?php _e( 'Then, send this person a link to this plugin:', 'notification' ); ?></p>
 
-	<p><code data-clipboard-text="https://wordpress.org/plugins/notification/">https://wordpress.org/plugins/notification/<span><?php esc_html_e( 'copy' ); ?></span></code></p>
+	<p><code data-clipboard-text="https://wordpress.org/plugins/notification/">https://wordpress.org/plugins/notification/<span><?php esc_html_e( 'copy', 'notification' ); ?></span></code></p>
 
-	<p><?php _e( 'Thanks for making things happen!' ); ?></p>
+	<p><?php _e( 'Thanks for making things happen!', 'notification' ); ?></p>
 
 	<div class="founder">
 		<?php echo get_avatar( '[email protected]', 80 ); ?>
 		<div class="name">Jakub Mikita</div>
-		<div class="title"><?php _e( 'Founder of the Notification plugin' ); ?></div>
+		<div class="title"><?php _e( 'Founder of the Notification plugin', 'notification' ); ?></div>
 	</div>
 
 	<div class="skip">
-		<a href="<?php echo admin_url( 'edit.php?post_type=notification&notification-story-skip=true' ); ?>"><?php esc_html_e( 'Skip this screen' ); ?></a>
+		<a href="<?php echo admin_url( 'edit.php?post_type=notification&notification-story-skip=true' ); ?>"><?php esc_html_e( 'Skip this screen', 'notification' ); ?></a>
 	</div>
 
 </div>