Merge branch 'master' into update/installers

class-wc-calypso-bridge.php

@@ -4,7 +4,7 @@
  *
  * @package WC_Calypso_Bridge/Classes
  * @since   1.0.0
- * @version x.x.x
+ * @version 2.7.0
  */
 
 defined( 'ABSPATH' ) || exit;

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "automattic/wc-calypso-bridge",
-  "version": "v2.6.0",
+  "version": "v2.7.1",
   "autoload": {
     "files": [
       "wc-calypso-bridge.php"

includes/class-wc-calypso-bridge-coming-soon.php

@@ -6,7 +6,7 @@
  * Class WC_Calypso_Bridge_Coming_Soon
  *
  * @since   2.6.0
- * @version 2.6.0
+ * @version 2.7.1
  *
  * Handle Coming Soon mode.
  */
@@ -40,7 +40,7 @@ public function __construct() {
 		add_filter( 'pre_option_woocommerce_coming_soon', array( $this, 'override_option_woocommerce_coming_soon' ) );
 		add_filter( 'pre_update_option_woocommerce_coming_soon', array( $this, 'override_update_woocommerce_coming_soon' ), 10, 2 );
 		// Admin bar menu is not only shown in the admin area but also in the front end when the admin user is logged in.
-		add_action( 'admin_bar_menu', array( $this, 'possibly_remove_site_visibility_badge' ), 32 );
+		add_action( 'admin_bar_menu', array( $this, 'remove_site_visibility_badge' ), 32 );
 
 		if ( is_admin() ) {
 			add_filter( 'plugins_loaded', array( $this, 'maybe_add_admin_notice' ) );
@@ -208,9 +208,8 @@ function () use ( $message, $notice_type ) {
 	 * @param WP_Admin_Bar $wp_admin_bar The admin bar instance.
 	 * @return void
 	 */
-	public function possibly_remove_site_visibility_badge( $wp_admin_bar  ) {
-		// TODO: Remove feature check once the site visibility badge is behind feature flag in core.
-		if ( wc_calypso_bridge_is_trial_plan() || ! $this->is_feature_enabled() ) {
+	public function remove_site_visibility_badge( $wp_admin_bar ) {
+		if ( $wp_admin_bar ) {
 			$wp_admin_bar->remove_node( 'woocommerce-site-visibility-badge' );
 		}
 	}

includes/class-wc-calypso-bridge-themes-setup.php

@@ -102,7 +102,6 @@ public function set_theme_default_values() {
 			set_theme_mod( 'sp_homepage_top_rated', false ); // Removes Top Rated Products area from starter content.
 			set_theme_mod( 'sp_homepage_on_sale', false ); // Removes On Sale Products area from starter content.
 			set_theme_mod( 'sp_homepage_best_sellers', false ); // Removes Best Sellers Products area from starter content.
-			update_option( 'woocommerce_demo_store', 'yes' ); // enables demo store notice.
 			// Force Fresh Site.
 			update_option( 'fresh_site', true );
 			// Save option that says the setup has been run already.

includes/class-wc-calypso-bridge-woocommerce-admin-features.php

@@ -4,7 +4,7 @@
  *
  * @package WC_Calypso_Bridge/Classes
  * @since   1.0.0
- * @version 2.5.2
+ * @version 2.7.0
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -140,11 +140,6 @@ public function filter_wc_admin_enabled_features( $features ) {
 	 * @return array
 	 */
 	public function filter_woocommerce_admin_features( $features ) {
-		// Disable launch-your-store to prevent clashes with similar functionality already provided.
-		if ( isset( $features['launch-your-store'] ) ) {
-			$features['launch-your-store'] = false;
-		}
-
 		// The rest applies only to Entrepreneur and Woo Express plans.
 		if ( ! wc_calypso_bridge_has_ecommerce_features() ) {
 			return $features;

languages/wc-calypso-bridge-ar-09bb012e7dde92df64cb62b6649b1279.json

@@ -1 +1 @@
-{"translation-revision-date":"2024-08-09 15:54:03+0000","generator":"WP-CLI\/2.10.0","source":"build\/plugins.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"ar","plural-forms":"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"},"Hire an expert":["\u0627\u0633\u062a\u0639\u0646 \u0628\u062e\u0628\u064a\u0631"],"Can\u2019t find what you\u2019re looking for? Hire one of our expert agencies! From new extensions to full-store builds, our Woo Expertsthey can help you create the store of your dreams.":["\u0623\u0644\u0627 \u062a\u0633\u062a\u0637\u064a\u0639 \u0625\u064a\u062c\u0627\u062f \u0645\u0627 \u062a\u0628\u062d\u062b \u0639\u0646\u0647\u061f \u064a\u0645\u0643\u0646\u0643 \u0627\u0644\u0644\u062c\u0648\u0621 \u0625\u0644\u0649 \u0625\u062d\u062f\u0649 \u0627\u0644\u0648\u0643\u0627\u0644\u0627\u062a \u0627\u0644\u062e\u0628\u064a\u0631\u0629 \u0644\u062f\u064a\u0646\u0627! \u0628\u062f\u0621\u064b\u0627 \u0645\u0646 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062c\u062f\u064a\u062f\u0629 \u0648\u062d\u062a\u0649 \u0639\u0645\u0644\u064a\u0627\u062a \u0627\u0644\u0625\u0646\u0634\u0627\u0621 \u0641\u064a \u0627\u0644\u0645\u062a\u062c\u0631 \u0628\u0627\u0644\u0643\u0627\u0645\u0644\u060c \u064a\u0645\u0643\u0646 \u0644\u0640 Woo Expertsthey \u0644\u062f\u064a\u0646\u0627 \u0645\u0633\u0627\u0639\u062f\u062a\u0643 \u0639\u0644\u0649 \u0625\u0646\u0634\u0627\u0621 \u0627\u0644\u0645\u062a\u062c\u0631 \u0627\u0644\u0630\u064a \u062a\u062d\u0644\u0645 \u0628\u0647."],"Looking to expand on the ecommerce functionality of your store? The Woo Marketplace has hundreds of trusted extensions designed specifically for your store.":["\u0647\u0644 \u062a\u0633\u0639\u0649 \u0625\u0644\u0649 \u062a\u0648\u0633\u064a\u0639 \u0648\u0638\u0627\u0626\u0641 \u0627\u0644\u062a\u062c\u0627\u0631\u0629 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u0629 \u0641\u064a \u0645\u062a\u062c\u0631\u0643\u061f \u064a\u062d\u062a\u0648\u064a Woo Marketplace \u0639\u0644\u0649 \u0645\u0626\u0627\u062a \u0645\u0646 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0645\u0648\u062b\u0648\u0642 \u0628\u0647\u0627 \u0627\u0644\u0645\u0635\u0645\u0645\u0629 \u062e\u0635\u0648\u0635\u064b\u0627 \u0644\u0645\u062a\u062c\u0631\u0643."],"From SEO tools to multi-language functionality, with WordPress plugins, you can customize your website to do anything you need.":["\u0628\u062f\u0621\u064b\u0627 \u0645\u0646 \u0623\u062f\u0648\u0627\u062a \u062a\u062d\u0633\u064a\u0646 \u0645\u062d\u0631\u0643\u0627\u062a \u0627\u0644\u0628\u062d\u062b \u0648\u062d\u062a\u0649 \u0627\u0644\u0648\u0638\u0627\u0626\u0641 \u0645\u062a\u0639\u062f\u062f\u0629 \u0627\u0644\u0644\u063a\u0627\u062a\u060c \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0625\u0636\u0627\u0641\u0627\u062a \u0648\u0648\u0631\u062f\u0628\u0631\u064a\u0633\u060c \u064a\u0645\u0643\u0646\u0643 \u062a\u062e\u0635\u064a\u0635 \u0645\u0648\u0642\u0639\u0643 \u0639\u0644\u0649 \u0627\u0644\u0648\u064a\u0628 \u0644\u0644\u0642\u064a\u0627\u0645 \u0628\u0623\u064a \u0634\u064a\u0621 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u064a\u0647."],"Customize your website":["\u062e\u0635\u0651\u0635 \u0645\u0648\u0642\u0639\u0643 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a"],"Add extra functionality and features to your website at a click of a button. Upgrade to a paid plan and gain access to thousands of free and paid WordPress plugins. Curious to find out what\u2019s possible?":["\u0623\u0636\u0641 \u0627\u0644\u0648\u0638\u0627\u0626\u0641 \u0648\u0627\u0644\u0645\u064a\u0632\u0627\u062a \u0627\u0644\u0625\u0636\u0627\u0641\u064a\u0629 \u0625\u0644\u0649 \u0645\u0648\u0642\u0639\u0643 \u0639\u0644\u0649 \u0627\u0644\u0648\u064a\u0628 \u0628\u0646\u0642\u0631\u0629 \u0632\u0631. \u0642\u0645 \u0628\u0627\u0644\u062a\u0631\u0642\u064a\u0629 \u0625\u0644\u0649 \u062e\u0637\u0629 \u0645\u062f\u0641\u0648\u0639\u0629 \u0648\u062a\u0645\u062a\u0639 \u0628\u0627\u0644\u0648\u0635\u0648\u0644 \u0625\u0644\u0649 \u0622\u0644\u0627\u0641 \u0645\u0646 \u0625\u0636\u0627\u0641\u0627\u062a \u0648\u0648\u0631\u062f\u0628\u0631\u064a\u0633 \u0627\u0644\u0645\u062c\u0627\u0646\u064a\u0629 \u0648\u0627\u0644\u0645\u062f\u0641\u0648\u0639\u0629. \u0647\u0644 \u062a\u0634\u0639\u0631 \u0628\u0627\u0644\u0641\u0636\u0648\u0644 \u0644\u0645\u0639\u0631\u0641\u0629 \u0645\u0627 \u064a\u064f\u0639\u062f \u0645\u0645\u0643\u0646\u064b\u0627\u061f"],"Do it your way":["\u0627\u0644\u0642\u064a\u0627\u0645 \u0628\u0630\u0644\u0643 \u0628\u0637\u0631\u064a\u0642\u062a\u0643"],"Discover Extensions":["\u0627\u0643\u062a\u0634\u0627\u0641 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a"],"Extend your store":["\u062a\u0648\u0633\u064a\u0639 \u0645\u062a\u062c\u0631\u0643"],"Browse plugins":["\u062a\u0635\u0641\u064f\u0651\u062d \u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a"],"Make anything happen, with plugins":["\u062c\u0639\u0644 \u0623\u064a \u0634\u064a\u0621 \u0642\u0627\u0628\u0644\u0627\u064b \u0644\u0644\u062d\u062f\u0648\u062b \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a"],"Take your store to the next level, with extensions":["\u0627\u0646\u0642\u0644 \u0645\u062a\u062c\u0631\u0643 \u0625\u0644\u0649 \u0627\u0644\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u062a\u0627\u0644\u064a \u0625\u0644\u0649 \u062c\u0627\u0646\u0628 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a."],"Upgrade now":["\u0628\u0627\u062f\u0631 \u0628\u0627\u0644\u062a\u0631\u0642\u064a\u0629 \u0627\u0644\u0622\u0646"]}}}
+{"translation-revision-date":"2024-09-19 11:54:03+0000","generator":"WP-CLI\/2.10.0","source":"build\/plugins.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"ar","plural-forms":"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"},"Hire an expert":["\u0627\u0633\u062a\u0639\u0646 \u0628\u062e\u0628\u064a\u0631"],"Can\u2019t find what you\u2019re looking for? Hire one of our expert agencies! From new extensions to full-store builds, our Woo Expertsthey can help you create the store of your dreams.":["\u0623\u0644\u0627 \u062a\u0633\u062a\u0637\u064a\u0639 \u0625\u064a\u062c\u0627\u062f \u0645\u0627 \u062a\u0628\u062d\u062b \u0639\u0646\u0647\u061f \u064a\u0645\u0643\u0646\u0643 \u0627\u0644\u0644\u062c\u0648\u0621 \u0625\u0644\u0649 \u0625\u062d\u062f\u0649 \u0627\u0644\u0648\u0643\u0627\u0644\u0627\u062a \u0627\u0644\u062e\u0628\u064a\u0631\u0629 \u0644\u062f\u064a\u0646\u0627! \u0628\u062f\u0621\u064b\u0627 \u0645\u0646 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u062c\u062f\u064a\u062f\u0629 \u0648\u062d\u062a\u0649 \u0639\u0645\u0644\u064a\u0627\u062a \u0627\u0644\u0625\u0646\u0634\u0627\u0621 \u0641\u064a \u0627\u0644\u0645\u062a\u062c\u0631 \u0628\u0627\u0644\u0643\u0627\u0645\u0644\u060c \u064a\u0645\u0643\u0646 \u0644\u0640 Woo Expertsthey \u0644\u062f\u064a\u0646\u0627 \u0645\u0633\u0627\u0639\u062f\u062a\u0643 \u0639\u0644\u0649 \u0625\u0646\u0634\u0627\u0621 \u0627\u0644\u0645\u062a\u062c\u0631 \u0627\u0644\u0630\u064a \u062a\u062d\u0644\u0645 \u0628\u0647."],"Looking to expand on the ecommerce functionality of your store? The Woo Marketplace has hundreds of trusted extensions designed specifically for your store.":["\u0647\u0644 \u062a\u0633\u0639\u0649 \u0625\u0644\u0649 \u062a\u0648\u0633\u064a\u0639 \u0648\u0638\u0627\u0626\u0641 \u0627\u0644\u062a\u062c\u0627\u0631\u0629 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u0629 \u0641\u064a \u0645\u062a\u062c\u0631\u0643\u061f \u064a\u062d\u062a\u0648\u064a Woo Marketplace \u0639\u0644\u0649 \u0645\u0626\u0627\u062a \u0645\u0646 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0645\u0648\u062b\u0648\u0642 \u0628\u0647\u0627 \u0627\u0644\u0645\u0635\u0645\u0645\u0629 \u062e\u0635\u0648\u0635\u064b\u0627 \u0644\u0645\u062a\u062c\u0631\u0643."],"From SEO tools to multi-language functionality, with WordPress plugins, you can customize your website to do anything you need.":["\u0628\u062f\u0621\u064b\u0627 \u0645\u0646 \u0623\u062f\u0648\u0627\u062a \u062a\u062d\u0633\u064a\u0646 \u0645\u062d\u0631\u0643\u0627\u062a \u0627\u0644\u0628\u062d\u062b \u0648\u062d\u062a\u0649 \u0627\u0644\u0648\u0638\u0627\u0626\u0641 \u0645\u062a\u0639\u062f\u062f\u0629 \u0627\u0644\u0644\u063a\u0627\u062a\u060c \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0625\u0636\u0627\u0641\u0627\u062a \u0648\u0648\u0631\u062f\u0628\u0631\u064a\u0633\u060c \u064a\u0645\u0643\u0646\u0643 \u062a\u062e\u0635\u064a\u0635 \u0645\u0648\u0642\u0639\u0643 \u0639\u0644\u0649 \u0627\u0644\u0648\u064a\u0628 \u0644\u0644\u0642\u064a\u0627\u0645 \u0628\u0623\u064a \u0634\u064a\u0621 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u064a\u0647."],"Customize your website":["\u062e\u0635\u0651\u0635 \u0645\u0648\u0642\u0639\u0643 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a"],"Add extra functionality and features to your website at a click of a button. Upgrade to a paid plan and gain access to thousands of free and paid WordPress plugins. Curious to find out what\u2019s possible?":["\u0623\u0636\u0641 \u0627\u0644\u0648\u0638\u0627\u0626\u0641 \u0648\u0627\u0644\u0645\u064a\u0632\u0627\u062a \u0627\u0644\u0625\u0636\u0627\u0641\u064a\u0629 \u0625\u0644\u0649 \u0645\u0648\u0642\u0639\u0643 \u0639\u0644\u0649 \u0627\u0644\u0648\u064a\u0628 \u0628\u0646\u0642\u0631\u0629 \u0632\u0631. \u0642\u0645 \u0628\u0627\u0644\u062a\u0631\u0642\u064a\u0629 \u0625\u0644\u0649 \u062e\u0637\u0629 \u0645\u062f\u0641\u0648\u0639\u0629 \u0648\u062a\u0645\u062a\u0639 \u0628\u0627\u0644\u0648\u0635\u0648\u0644 \u0625\u0644\u0649 \u0622\u0644\u0627\u0641 \u0645\u0646 \u0625\u0636\u0627\u0641\u0627\u062a \u0648\u0648\u0631\u062f\u0628\u0631\u064a\u0633 \u0627\u0644\u0645\u062c\u0627\u0646\u064a\u0629 \u0648\u0627\u0644\u0645\u062f\u0641\u0648\u0639\u0629. \u0647\u0644 \u062a\u0634\u0639\u0631 \u0628\u0627\u0644\u0641\u0636\u0648\u0644 \u0644\u0645\u0639\u0631\u0641\u0629 \u0645\u0627 \u064a\u064f\u0639\u062f \u0645\u0645\u0643\u0646\u064b\u0627\u061f"],"Do it your way":["\u0627\u0644\u0642\u064a\u0627\u0645 \u0628\u0630\u0644\u0643 \u0628\u0637\u0631\u064a\u0642\u062a\u0643"],"Discover Extensions":["\u0627\u0643\u062a\u0634\u0627\u0641 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a"],"Extend your store":["\u062a\u0648\u0633\u064a\u0639 \u0645\u062a\u062c\u0631\u0643"],"Browse plugins":["\u062a\u0635\u0641\u064f\u0651\u062d \u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a"],"Make anything happen, with plugins":["\u062c\u0639\u0644 \u0623\u064a \u0634\u064a\u0621 \u0642\u0627\u0628\u0644\u0627\u064b \u0644\u0644\u062d\u062f\u0648\u062b \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a"],"Take your store to the next level, with extensions":["\u0627\u0646\u0642\u0644 \u0645\u062a\u062c\u0631\u0643 \u0625\u0644\u0649 \u0627\u0644\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u062a\u0627\u0644\u064a \u0625\u0644\u0649 \u062c\u0627\u0646\u0628 \u0627\u0644\u0627\u0645\u062a\u062f\u0627\u062f\u0627\u062a."],"Upgrade now":["\u0628\u0627\u062f\u0631 \u0628\u0627\u0644\u062a\u0631\u0642\u064a\u0629 \u0627\u0644\u0622\u0646"]}}}