Changeset 4018

Timestamp:

09/09/2016 02:06:26 PM (10 years ago)

Author:

ocean90

Message:

Translate, Plugin Directory: Use class constant for the master project.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-plugin-directory/inc

Files:

• cache-purge/class-cache-purger.php (modified) (3 diffs)
• cli/class-delete-plugin-project.php (modified) (2 diffs)
• cli/class-set-plugin-project.php (modified) (2 diffs)
• cli/class-sync-plugin-translations.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-plugin-directory/inc/cache-purge/class-cache-purger.php

@@ -4 +4 @@
 
 use GP;
+use WordPressdotorg\GlotPress\Plugin_Directory\Plugin;
 
 class Cache_Purger {
-        public $master_project   = 'wp-plugins';
         public $i18n_cache_group = 'plugins-i18n';
 
@@ -103 +103 @@
 
                 $path = '/' . trim( $path, '/' ) . '/';
-                if ( false === strpos( $path, "/{$this->master_project}/" ) ) {
+                if ( false === strpos( $path, '/' . Plugin::GP_MASTER_PROJECT . '/' ) ) {
                         return false;
                 }
@@ -124 +124 @@
 
                 $project_dirs = explode( '/', trim( $project->path, '/' ) );
-                if ( empty( $project_dirs ) || 3 !== count( $project_dirs ) || $project_dirs[0] !== $this->master_project ) {
+                if ( empty( $project_dirs ) || 3 !== count( $project_dirs ) || Plugin::GP_MASTER_PROJECT !== $project_dirs[0]  ) {
                         return '';
                 }
 
-                return "{$this->master_project}:{$project_dirs[1]}:{$project_dirs[2]}";
+                return Plugin::GP_MASTER_PROJECT . ":{$project_dirs[1]}:{$project_dirs[2]}";
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-plugin-directory/inc/cli/class-delete-plugin-project.php

@@ -4 +4 @@
 
 use GP;
+use WordPressdotorg\GlotPress\Plugin_Directory\Plugin;
 use WP_CLI;
 use WP_CLI_Command;
 
 class Delete_Plugin_Project extends WP_CLI_Command {
-
-        /**
-         * Holds the path of the master project.
-         *
-         * @var string
-         */
-        private $master_project_path = 'wp-plugins';
 
         /**
@@ -31 +25 @@
                 global $wpdb;
 
-                $project_path = sprintf( '%s/%s', $this->master_project_path, $args[0] );
+                $project_path = sprintf( '%s/%s', Plugin::GP_MASTER_PROJECT , $args[0] );
 
                 $project = GP::$project->by_path( $project_path );

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-plugin-directory/inc/cli/class-set-plugin-project.php

@@ -5 +5 @@
 use GP;
 use stdClass;
+use WordPressdotorg\GlotPress\Plugin_Directory\Plugin;
 use WP_CLI;
 use WP_CLI_Command;
 
 class Set_Plugin_Project extends WP_CLI_Command {
-
-        /**
-         * Holds the path of the master project.
-         *
-         * @var string
-         */
-        private $master_project_path = 'wp-plugins';
 
         /**
@@ -43 +37 @@
                 $plugin_slug         = $args[0];
                 $process_type        = $args[1];
-                $plugin_project_path = "{$this->master_project_path}/{$plugin_slug}";
+                $plugin_project_path = Plugin::GP_MASTER_PROJECT . "/{$plugin_slug}";
 
                 // Get data for master parent project.
-                $master_project = GP::$project->by_path( $this->master_project_path );
+                $master_project = GP::$project->by_path( Plugin::GP_MASTER_PROJECT );
                 if ( ! $master_project ) {
-                        WP_CLI::error( sprintf( "The master project '%s' couldn't be found.", $this->master_project_path ), 2 );
+                        WP_CLI::error( sprintf( "The master project '%s' couldn't be found.", Plugin::GP_MASTER_PROJECT ), 2 );
                 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-plugin-directory/inc/cli/class-sync-plugin-translations.php

@@ -35 +35 @@
                 remove_action( 'gp_translation_saved', array( $translation_sync, 'queue_translation_for_sync' ), 5 );
 
-                $project_path = $translation_sync->master_project . '/' . $args[0];
+                $project_path = Plugin::GP_MASTER_PROJECT . '/' . $args[0];
                 $project_src = GP::$project->by_path( $project_path );
                 if ( ! $project_src ) {