Fix some strings which should not be replaced

woocommerce · Jun 24, 2019 · 1c82fd6 · 1c82fd6
1 parent 854ac94
commit 1c82fd6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 58 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml b/phpcs.xml
@@ -17,7 +17,7 @@
 
 	<rule ref="WordPress.WP.I18n">
 		<properties>
-			<property name="text_domain" type="array" value="woocommerce" />
+			<property name="text_domain" type="array" value="woocommerce-rest-api" />
 		</properties>
 	</rule>
 

diff --git a/src/Controllers/Version2/class-wc-rest-system-status-v2-controller.php b/src/Controllers/Version2/class-wc-rest-system-status-v2-controller.php
@@ -744,7 +744,7 @@ public function get_database_info() {
 		 * To ensure we include all WC tables, even if they do not exist, pre-populate the WC array with all the tables.
 		 */
 		$tables = array(
-			'woocommerce-rest-api' => array_fill_keys( $core_tables, false ),
+			'woocommerce' => array_fill_keys( $core_tables, false ),
 			'other'       => array(),
 		);
 
@@ -760,7 +760,7 @@ public function get_database_info() {
 			if ( is_multisite() && 0 !== strpos( $table->name, $site_tables_prefix ) && ! in_array( $table->name, $global_tables, true ) ) {
 				continue;
 			}
-			$table_type = in_array( $table->name, $core_tables ) ? 'woocommerce-rest-api' : 'other';
+			$table_type = in_array( $table->name, $core_tables ) ? 'woocommerce' : 'other';
 
 			$tables[ $table_type ][ $table->name ] = array(
 				'data'   => $table->data,
@@ -1001,7 +1001,7 @@ public function get_theme_info() {
 			'version_latest'          => WC_Admin_Status::get_latest_theme_version( $active_theme ),
 			'author_url'              => esc_url_raw( $active_theme->{'Author URI'} ),
 			'is_child_theme'          => is_child_theme(),
-			'has_woocommerce_support' => current_theme_supports( 'woocommerce-rest-api' ),
+			'has_woocommerce_support' => current_theme_supports( 'woocommerce' ),
 			'has_woocommerce_file'    => ( file_exists( get_stylesheet_directory() . '/woocommerce.php' ) || file_exists( get_template_directory() . '/woocommerce.php' ) ),
 			'has_outdated_templates'  => $outdated_templates,
 			'overrides'               => $override_files,

diff --git a/src/Controllers/Version3/class-wc-rest-order-notes-controller.php b/src/Controllers/Version3/class-wc-rest-order-notes-controller.php
@@ -35,7 +35,7 @@ class WC_REST_Order_Notes_Controller extends WC_REST_Order_Notes_V2_Controller {
 	public function prepare_item_for_response( $note, $request ) {
 		$data = array(
 			'id'               => (int) $note->comment_ID,
-			'author'           => __( 'woocommerce-rest-api', 'woocommerce-rest-api' ) === $note->comment_author ? 'system' : $note->comment_author,
+			'author'           => __( 'woocommerce', 'woocommerce-rest-api' ) === $note->comment_author ? 'system' : $note->comment_author,
 			'date_created'     => wc_rest_prepare_date_response( $note->comment_date ),
 			'date_created_gmt' => wc_rest_prepare_date_response( $note->comment_date_gmt ),
 			'note'             => $note->comment_content,

diff --git a/src/Controllers/Version4/OrderNotes.php b/src/Controllers/Version4/OrderNotes.php
@@ -336,7 +336,7 @@ public function delete_item( $request ) {
 	protected function get_data_for_response( $object, $request ) {
 		return array(
 			'id'               => (int) $object->comment_ID,
-			'author'           => __( 'woocommerce-rest-api', 'woocommerce-rest-api' ) === $object->comment_author ? 'system' : $object->comment_author,
+			'author'           => __( 'woocommerce', 'woocommerce-rest-api' ) === $object->comment_author ? 'system' : $object->comment_author,
 			'date_created'     => wc_rest_prepare_date_response( $object->comment_date ),
 			'date_created_gmt' => wc_rest_prepare_date_response( $object->comment_date_gmt ),
 			'note'             => $object->comment_content,

diff --git a/src/Controllers/Version4/Utilities/DatabaseInformation.php b/src/Controllers/Version4/Utilities/DatabaseInformation.php
@@ -78,7 +78,7 @@ public function get_database_info() {
 		 * To ensure we include all WC tables, even if they do not exist, pre-populate the WC array with all the tables.
 		 */
 		$tables = array(
-			'woocommerce-rest-api' => array_fill_keys( $core_tables, false ),
+			'woocommerce' => array_fill_keys( $core_tables, false ),
 			'other'       => array(),
 		);
 
@@ -94,7 +94,7 @@ public function get_database_info() {
 			if ( is_multisite() && 0 !== strpos( $table->name, $site_tables_prefix ) && ! in_array( $table->name, $global_tables, true ) ) {
 				continue;
 			}
-			$table_type = in_array( $table->name, $core_tables, true ) ? 'woocommerce-rest-api' : 'other';
+			$table_type = in_array( $table->name, $core_tables, true ) ? 'woocommerce' : 'other';
 
 			$tables[ $table_type ][ $table->name ] = array(
 				'data'   => $table->data,

diff --git a/src/Controllers/Version4/Utilities/ThemeInformation.php b/src/Controllers/Version4/Utilities/ThemeInformation.php
@@ -85,7 +85,7 @@ public function get_theme_info() {
 			'version_latest'          => \WC_Admin_Status::get_latest_theme_version( $active_theme ),
 			'author_url'              => esc_url_raw( $active_theme->{'Author URI'} ),
 			'is_child_theme'          => is_child_theme(),
-			'has_woocommerce_support' => current_theme_supports( 'woocommerce-rest-api' ),
+			'has_woocommerce_support' => current_theme_supports( 'woocommerce' ),
 			'has_woocommerce_file'    => ( file_exists( get_stylesheet_directory() . '/woocommerce.php' ) || file_exists( get_template_directory() . '/woocommerce.php' ) ),
 			'has_outdated_templates'  => $outdated_templates,
 			'overrides'               => $override_files,