Merge pull request #169 from WebDevStudios/fix/CC-349-textdomain-loading

update and make use of .org matching textdomain

Author: tw2113

plugin.php

@@ -1,19 +1,17 @@
 <?php
 /**
  * Constant Contact + WooCommerce
- *
  * @since 2019-02-15
  * @author Constant Contact <https://www.constantcontact.com/>
  * @package cc-woo
- *
  * @wordpress-plugin
  * Plugin Name: Constant Contact + WooCommerce
  * Description: Add products to your emails and sync your contacts.
  * Plugin URI: https://github.com/WebDevStudios/constant-contact-woocommerce
  * Version: 2.1.0
  * Author: Constant Contact
  * Author URI: https://www.constantcontact.com/
- * Text Domain: cc-woo
+ * Text Domain: constant-contact-woocommerce
  * WC requires at least: 3.6.0
  * WC tested up to: 6.8.2
  * Requires PHP: 7.2
@@ -26,7 +24,7 @@
 
 if ( ! is_readable( $cc_woo_autoloader ) ) {
 	/* Translators: Placeholder is the current directory. */
-	throw new \Exception( sprintf( __( 'Please run `composer install` in the plugin folder "%s" and try activating this plugin again.', 'cc-woo' ), dirname( __FILE__ ) ) );
+	throw new \Exception( sprintf( __( 'Please run `composer install` in the plugin folder "%s" and try activating this plugin again.', 'constant-contact-woocommerce' ), dirname( __FILE__ ) ) );
 }
 
 require_once $cc_woo_autoloader;

src/AbandonedCheckouts/CheckoutHandler.php

@@ -76,13 +76,13 @@ public function maybe_capture_guest_checkout() {
 		] );
 
 		if ( empty( $data['nonce'] ) || ! wp_verify_nonce( $data['nonce'], 'woocommerce-process_checkout' ) ) {
-			wp_send_json_error( esc_html__( 'Invalid nonce.', 'cc-woo' ) );
+			wp_send_json_error( esc_html__( 'Invalid nonce.', 'constant-contact-woocommerce' ) );
 		}
 
 		$email = filter_var( $data['email'], FILTER_VALIDATE_EMAIL );
 
 		if ( ! $email ) {
-			wp_send_json_error( esc_html__( 'Invalid email.', 'cc-woo' ) );
+			wp_send_json_error( esc_html__( 'Invalid email.', 'constant-contact-woocommerce' ) );
 		}
 
 		WC()->session->set( 'billing_email', $email );

src/AbandonedCheckouts/CheckoutRecovery.php

@@ -142,7 +142,7 @@ protected function recover_products( $products ) {
 						'%d item from your previous order is currently unavailable and could not be added to your cart.',
 						'%d items from your previous order are currently unavailable and could not be added to your cart.',
 						( count( $products ) - count( $products_added ) ),
-						'cc-woo'
+						'constant-contact-woocommerce'
 					),
 					( count( $products ) - count( $products_added ) )
 				),

src/Api/KeyManager.php

@@ -152,7 +152,7 @@ private function is_woo_commerce_api_key_query( $query ) {
 	public function disconnect_cc_woo() {
 
 		/* This action is documented in Plugin.php */
-		do_action( 'cc_woo_disconnect', esc_html__( 'REST API Key Revoked.', 'cc-woo' ) );
+		do_action( 'cc_woo_disconnect', esc_html__( 'REST API Key Revoked.', 'constant-contact-woocommerce' ) );
 
 		/* This action is documented in Plugin.php */
 		do_action( 'wc_ctct_disconnect' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Intentional improperly-prefixed hookname, used in webhooks.

src/Plugin.php

@@ -108,7 +108,7 @@ public function add_ssl_notice() {
 		$connected = get_option( 'cc_woo_import_connection_established' );
 
 		if ( ! $connected && ( isset( $_SERVER['HTTPS'] ) && 'on' !== $_SERVER['HTTPS'] ) ) {
-			$message = __( 'Your site does not appear to be using a secure connection (SSL). You might face issues when connecting to your account. Please add HTTPS to your site to make sure you have no issues connecting.', 'cc-woo' );
+			$message = __( 'Your site does not appear to be using a secure connection (SSL). You might face issues when connecting to your account. Please add HTTPS to your site to make sure you have no issues connecting.', 'constant-contact-woocommerce' );
 			new Notice(
 				new NoticeMessage( $message, 'error', true )
 			);
@@ -138,7 +138,7 @@ private function deactivate( $reason ) {
 		 *
 		 * @param  string $message Deactivation message.
 		 */
-		do_action( 'cc_woo_disconnect', esc_html__( 'Plugin deactivated.', 'cc-woo' ) );
+		do_action( 'cc_woo_disconnect', esc_html__( 'Plugin deactivated.', 'constant-contact-woocommerce' ) );
 
 		$this->do_deactivation_process();
 
@@ -167,13 +167,13 @@ public function check_for_required_dependencies() {
 			// Ensure requirements.
 			if ( ! $compatibility_checker->is_available() ) {
 				// translators: placeholder is the minimum supported WooCommerce version.
-				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater must be installed and activated to use %2$s.', 'cc-woo' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
+				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater must be installed and activated to use %2$s.', 'constant-contact-woocommerce' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
 				throw new Exception( $message );
 			}
 
 			if ( ! $compatibility_checker->is_compatible( \WooCommerce::instance() ) ) {
 				// translators: placeholder is the minimum supported WooCommerce version.
-				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater is required to use %2$s.', 'cc-woo' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
+				$message = sprintf( esc_html__( 'WooCommerce version "%1$s" or greater is required to use %2$s.', 'constant-contact-woocommerce' ), PluginCompatibilityCheck::MINIMUM_WOO_VERSION, self::PLUGIN_NAME );
 				throw new Exception( $message );
 			}
 		} catch ( Exception $e ) {
@@ -210,6 +210,7 @@ public function register_hooks() {
 		add_action( 'plugins_loaded', [ $this, 'check_for_required_dependencies' ] );
 		add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'admin_enqueue_scripts' ], 99 );
+		add_action( 'init', [ $this, 'load_plugin_textdomain' ] );
 
 		register_activation_hook( $this->plugin_file, [ $this, 'do_activation_process' ] );
 		register_deactivation_hook( $this->plugin_file, [ $this, 'do_deactivation_process' ] );
@@ -327,7 +328,7 @@ public function do_deactivation_process() {
 		delete_option( ConnectionStatus::CC_CONNECTION_USER_ID );
 		delete_option( ConnectionStatus::CC_FIRST_CONNECTION );
 		delete_option( ConnectionStatus::CC_CONNECTION_ESTABLISHED_KEY );
-		
+
 
 		// WooCommerce Options
 		delete_option( 'cc_woo_store_information_first_name' );
@@ -366,5 +367,15 @@ public function admin_enqueue_scripts() {
 		wp_enqueue_style( 'cc-woo-admin', trailingslashit( plugin_dir_url( $this->get_plugin_file() ) ) . 'app/admin.css' );
     	wp_enqueue_style( 'cc-woo-google-fonts', 'https://fonts.googleapis.com/css2?family=Maven+Pro:wght@400;700&display=swap', false );
 	}
+
+	/**
+	 * Load textdomain.
+	 *
+	 * @author Michael Beckwith <[email protected]>
+	 * @since 2.1.0
+	 */
+	public function load_plugin_textdomain() {
+		load_plugin_textdomain( 'constant-contact-woocommerce' );
+	}
 }
 

src/Rest/AbandonedCheckouts/Controller.php

@@ -89,7 +89,7 @@ public function get_items_permissions_check( $request ) {
 			);
 			$ctct_logger->log();
 
-			return new WP_Error( 'cc-woo-rest-not-allowed', esc_html__( 'Sorry, you cannot list resources.', 'cc-woo' ), [ 'status' => rest_authorization_required_code() ] );
+			return new WP_Error( 'cc-woo-rest-not-allowed', esc_html__( 'Sorry, you cannot list resources.', 'constant-contact-woocommerce' ), [ 'status' => rest_authorization_required_code() ] );
 		}
 
 		return true;