Changeset 1630619

Timestamp:

04/06/2017 02:04:56 AM (7 years ago)

Author:

Cheffheid

Message:

Update translation namespace away from variables, fix a handful of PHPCS errors.

File:

• post-series-manager/trunk/post-series-manager.php (modified) (14 diffs)

post-series-manager/trunk/post-series-manager.php

@@ -22 +22 @@
 *
 * This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License, version 2, as 
+* it under the terms of the GNU General Public License, version 2, as
 * published by the Free Software Foundation.
 *
@@ -46 +46 @@
 
     function __construct() {
-        $this->plugin_name = "post-series-manager";
-        $this->plugin_version = "1.1.0";
+        $this->plugin_name = ;
+        $this->plugin_version = ;
 
         register_activation_hook( __FILE__, array( &$this, 'post_series_manager_activate' ) );
@@ -77 +77 @@
             'post',
             array(
-                'label' => __( 'Post Series', $this->plugin_name ),
-                'rewrite' => array( 'slug' => 'post-series' ),
+                'label' => __( 'Post Series', 'post-series-manager' ),
+                'rewrite' => array(
+                    'slug' => 'post-series',
+                ),
                 'labels' => array(
-                    'name' => __( 'Post Series', $this->plugin_name ),
-                    'singular_name' => __( 'Post Series', $this->plugin_name ),
-                    'all_items' => __( 'All Post Series', $this->plugin_name ),
-                    'edit_item' => __( 'Edit Post Series', $this->plugin_name ),
-                    'view_item' => __( 'View Post Series', $this->plugin_name ),
-                    'update_item' => __( 'Update Post Series', $this->plugin_name ),
-                    'add_new_item' => __( 'Add New Post Series', $this->plugin_name ), 
-                    'new_item_name' => __( 'New Post Series Name', $this->plugin_name ),
-                    'search_items' => __( 'Search Post Series', $this->plugin_name ),
-                    'popular_items' => __( 'Popular Post Series', $this->plugin_name ),
-                    'separate_items_with_commas' => __( 'Separate post series with commas', $this->plugin_name ),
-                    'add_or_remove_items' => __( 'Add or remove post series', $this->plugin_name ),
-                    'choose_from_most_used' => __( 'Choose from most used post series', $this->plugin_name ),
-                    'not_found' => __( 'No post series found', $this->plugin_name ) )
-                )
+                    'name' => __( 'Post Series', 'post-series-manager' ),
+                    'singular_name' => esc_html__( 'Post Series', 'post-series-manager' ),
+                    'all_items' => esc_html__( 'All Post Series', 'post-series-manager' ),
+                    'edit_item' => esc_html__( 'Edit Post Series', 'post-series-manager' ),
+                    'view_item' => esc_html__( 'View Post Series', 'post-series-manager' ),
+                    'update_item' => esc_html__( 'Update Post Series', 'post-series-manager' ),
+                    'add_new_item' => esc_html__( 'Add New Post Series', 'post-series-manager' ),
+                    'new_item_name' => esc_html__( 'New Post Series Name', 'post-series-manager' ),
+                    'search_items' => esc_html__( 'Search Post Series', 'post-series-manager' ),
+                    'popular_items' => esc_html__( 'Popular Post Series', 'post-series-manager' ),
+                    'separate_items_with_commas' => esc_html__( 'Separate post series with commas', 'post-series-manager' ),
+                    'add_or_remove_items' => esc_html__( 'Add or remove post series', 'post-series-manager' ),
+                    'choose_from_most_used' => esc_html__( 'Choose from most used post series', 'post-series-manager' ),
+                    'not_found' => esc_html__( 'No post series found', 'post-series-manager' ),
+                ),
+            )
         );
     }
@@ -100 +103 @@
     public function post_series_i18n() {
         load_plugin_textdomain(
-            $this->plugin_name,
+            ,
             false,
             dirname( plugin_basename( __FILE__ ) ) . '/languages/'
-            );
+        );
     }
 
@@ -123 +126 @@
                 $series_link = sprintf( '<a href="%s">%s</a>', get_term_link( $series ), $series->name );
 
-                $series_text = apply_filters( 'post-series-manager-series-text', __( 'This post is part of the series', $this->plugin_name ) );
-
-                if( is_single() )
+                $series_text = apply_filters( 'post-series-manager-series-text', __( 'This post is part of the series',  ) );
+
+                if( is_single() )
                 {
                     $series_list_HTML = $this->get_series_list_HTML( $series );
@@ -143 +146 @@
     *
     * @since  1.0.0
-    * 
+    *
     * @param  object $series The post series to work through
     * @return string $series_list_HTML Completed HTML string of all the series lists
@@ -151 +154 @@
         $current_post_ID = get_the_ID();
 
-        $current_indicator = apply_filters( 'post-series-manager-current-text', __('(Current)', $this->plugin_name) );
+        $current_indicator = apply_filters( 'post-series-manager-current-text', ) );
 
         $args = array(
@@ -158 +161 @@
                     'taxonomy' => 'post-series',
                     'field' => 'slug',
-                    'terms' => $series->name
-                )
+                    'terms' => $series->name
+                )
             ),
             'order' => 'ASC',
@@ -167 +170 @@
         $series_posts = get_posts( $args );
 
-        if( count( $series_posts ) > 1 )
+        if( count( $series_posts ) > 1 )
         {
             $current_post = get_post( $current_post_ID );
@@ -185 +188 @@
             }
 
-            $list_introduction = apply_filters( 'post-series-list-intro-text', sprintf( '<p>%s</p>', __( 'Other posts in this series:', $this->plugin_name ) ) );
+            $list_introduction = apply_filters( 'post-series-list-intro-text', sprintf( '<p>%s</p>', __( 'Other posts in this series:',  ) ) );
 
             $list_opening = apply_filters( 'post-series-list-opening-tags', sprintf( '<ol class="post-series-manager-post-list" start="%s">', $start_index + 1 ) );
@@ -191 +194 @@
             $series_list_HTML = $list_introduction . $list_opening;
 
-            for($i = $start_index; $i <= $end_index; $i++ )
+            for$i = $start_index; $i <= $end_index; $i++ )
             {
                 $post_title   = get_the_title( $series_posts[$i]->ID );
@@ -222 +225 @@
 
         if ( $all_series ) {
-            $series_text = apply_filters( 'post-series-manager-next-text', __( 'Continue reading this series:', $this->plugin_name ) );
-            
+            $series_text = apply_filters( 'post-series-manager-next-text',  ) );
+
             $series_nav = '<div class="post-series-nav"><p>%s<br /> %s</p></div>';
             $next = get_next_post_link( '%link', '%title', true, NULL, 'post-series' );
@@ -232 +235 @@
         }
 
-       return $shortcode_HTML;
+    return $shortcode_HTML;
 
     }
@@ -257 +260 @@
     // Reverse sort order, since part 1 is generally older than part X
     public function post_series_sort_order( $query ) {
-        if( ( $query->is_main_query() ) && ( is_tax('post-series') ) ) {
+        if( ( $query->is_main_query() ) && ( is_tax() ) ) {
             $query->set( 'order', 'ASC' );
         }