Sync branch [skip ci]

Author: pirate-bot

assets/apps/customizer-controls/src/scss/_general.scss

@@ -86,9 +86,12 @@
 #customize-control-neve_pro_global_header_settings_main_shortcut p,
 #customize-control-neve_pro_global_header_settings_bottom_shortcut p {
   margin: 0;
+  background-color: #fff;
+  padding: 10px;
 
   a {
 	cursor: pointer;
+  color: #007cba;
   }
 }
 

assets/apps/dashboard/src/Components/Content/AvailableModule.js

@@ -1,5 +1,5 @@
 /* global neveDash */
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import {
 	NEVE_AVAILABLE_MODULES_ICON_MAP,
 	NEVE_STORE,
@@ -42,10 +42,8 @@ const ModuleToggle = ({
 	const { api } = neveDash;
 	const { title } = moduleData;
 	const toastMessage = {
-		//translators: %s - Plugin name
-		installing: sprintf(__('Installing %s', 'neve'), 'Orbit Fox Plugin'),
-		//translators: %s - Plugin name
-		activating: sprintf(__('Activating %s', 'neve'), 'Orbit Fox Plugin'),
+		installing: __('Installing', 'neve'),
+		activating: __('Activating', 'neve'),
 	};
 
 	const handleToggle = async (value) => {
@@ -90,7 +88,10 @@ const ModuleToggle = ({
 			);
 		} catch (error) {
 			setToast(
-				__('Something went wrong while activating the module.', 'neve')
+				__(
+					'Something went wrong. Please reload the page and try again.',
+					'neve'
+				)
 			);
 		} finally {
 			setLoading(false);
@@ -154,7 +155,7 @@ const AvailableModuleCard = ({
 					className="flex mt-2 text-blue-600 gap-2 align-middle"
 					href="admin.php?page=obfx_companion"
 				>
-					{__('Go to Settings to Edit', 'neve')}
+					{__('Settings', 'neve')}
 					<ArrowRight size={18} />
 				</a>
 			)}

composer.lock

@@ -402,7 +402,7 @@ public function activate_plugin( $request ) {
 			}
 
 			if ( ! isset( $api->download_link ) ) {
-				wp_send_json_error( array( 'message' => __( 'Invalid plugin information.', 'neve' ) ) );
+				wp_send_json_error( array( 'message' => __( 'Invalid action', 'neve' ) ) );
 			}
 
 			$skin     = new \WP_Ajax_Upgrader_Skin();
@@ -423,7 +423,7 @@ public function activate_plugin( $request ) {
 				global $wp_filesystem;
 
 				$status = [
-					'message' => __( 'Invalid plugin information.', 'neve' ),
+					'message' => __( 'Invalid action', 'neve' ),
 				];
 
 				if ( $wp_filesystem instanceof \WP_Filesystem_Base && $wp_filesystem->errors->has_errors() ) {
@@ -440,7 +440,7 @@ public function activate_plugin( $request ) {
 			wp_send_json_error( array( 'message' => $result->get_error_message() ) );
 		}
 
-		wp_send_json_success( array( 'message' => __( 'Plugin activated successfully.', 'neve' ) ) );
+		wp_send_json_success( array( 'message' => __( 'Module Activated', 'neve' ) ) );
 	}
 
 	/**
@@ -454,19 +454,19 @@ public function activate_module( $request ) {
 		$module_value = $request->get_param( 'value' );
 
 		if ( ! class_exists( 'Orbit_Fox_Global_Settings' ) ) {
-			wp_send_json_error( __( 'Orbit Fox is not installed or activated.', 'neve' ) );
+			wp_send_json_error( __( 'Invalid action', 'neve' ) );
 		}
 
 		$settings = new \Orbit_Fox_Global_Settings();
 		$modules  = $settings::$instance->module_objects;
 
 		if ( ! isset( $modules[ $module_slug ] ) ) {
-			wp_send_json_error( __( 'Invalid module slug.', 'neve' ) );
+			wp_send_json_error( __( 'Invalid action', 'neve' ) );
 		}
 
 		$response = $modules[ $module_slug ]->set_status( 'active', $module_value );
 
-		wp_send_json_success( __( 'Module status changed.', 'neve' ) );
+		wp_send_json_success( $module_value ? __( 'Module Activated', 'neve' ) : __( 'Module Deactivated.', 'neve' ) );
 	}
 
 	/**