fix: translation errors (#67)

Fix errors and warnings related to translations (move the translation function call to a context where translation is available)

Author: Soare-Robert-Daniel

inc/API.php

@@ -234,6 +234,7 @@ public function register_routes() {
 	 * @return \WP_REST_Response
 	 */
 	public function get_settings() {
+		Main::add_labels_to_default_settings();
 		$settings = Main::get_settings();
 		return rest_ensure_response( $settings );
 	}
@@ -694,6 +695,7 @@ function ( $message ) use ( $run_id ) {
 			return rest_ensure_response( [ 'error' => __( 'No messages found.', 'hyve-lite' ) ] );
 		}
 
+		Main::add_labels_to_default_settings();
 		$settings = Main::get_settings();
 
 		$response = ( isset( $message['success'] ) && true === $message['success'] && isset( $message['response'] ) ) ? $message['response'] : esc_html( $settings['default_message'] );

inc/BaseAPI.php

@@ -36,23 +36,11 @@ class BaseAPI {
 	 */
 	protected $table;
 
-	/**
-	 * Error messages.
-	 * 
-	 * @var array
-	 */
-	private $errors = [];
-
 	/**
 	 * Constructor.
 	 */
 	public function __construct() {
 		$this->table = DB_Table::instance();
-
-		$this->errors = [
-			'invalid_api_key' => __( 'Incorrect API key provided.', 'hyve-lite' ),
-			'missing_scope'   => __( ' You have insufficient permissions for this operation.', 'hyve-lite' ),
-		];
 	}
 
 	/**
@@ -63,8 +51,12 @@ public function __construct() {
 	 * @return string
 	 */
 	public function get_error_message( $error ) {
-		if ( isset( $this->errors[ $error->get_error_code() ] ) ) {
-			return $this->errors[ $error->get_error_code() ];
+		$errors = [
+			'invalid_api_key' => __( 'Incorrect API key provided.', 'hyve-lite' ),
+			'missing_scope'   => __( 'You have insufficient permissions for this operation.', 'hyve-lite' ),
+		];
+		if ( isset( $errors[ $error->get_error_code() ] ) ) {
+			return $errors[ $error->get_error_code() ];
 		}
 
 		return $error->get_error_message();

inc/Main.php

@@ -189,8 +189,6 @@ public static function get_default_settings() {
 				'qdrant_api_key'       => '',
 				'qdrant_endpoint'      => '',
 				'chat_enabled'         => true,
-				'welcome_message'      => __( 'Hello! How can I help you today?', 'hyve-lite' ),
-				'default_message'      => __( 'Sorry, I\'m not able to help with that.', 'hyve-lite' ),
 				'chat_model'           => 'gpt-4o-mini',
 				'temperature'          => 1,
 				'top_p'                => 1,
@@ -207,6 +205,8 @@ public static function get_default_settings() {
 					'harassment/threatening' => 60,
 					'violence'               => 70,
 				],
+				'welcome_message'      => '',
+				'default_message'      => '',
 			]
 		);
 	}
@@ -223,6 +223,31 @@ public static function get_settings() {
 		return wp_parse_args( $settings, self::get_default_settings() );
 	}
 
+	/**
+	 * Add the translatable label to the default value.
+	 * 
+	 * Use this in a context where translations are correctly loaded.
+	 * 
+	 * @since 1.2
+	 * 
+	 * @return void
+	 */
+	public static function add_labels_to_default_settings() {
+		add_filter(
+			'hyve_default_settings',
+			function ( $settings ) {
+				if ( ! is_array( $settings ) ) {
+					return $settings;
+				}
+
+				$settings['welcome_message'] = __( 'Hello! How can I help you today?', 'hyve-lite' );
+				$settings['default_message'] = __( 'Sorry, I\'m not able to help with that.', 'hyve-lite' );
+
+				return $settings;
+			}
+		);
+	}
+
 	/**
 	 * Enqueue assets.
 	 *
@@ -254,6 +279,7 @@ public function enqueue_assets() {
 
 		wp_set_script_translations( 'hyve-lite-scripts', 'hyve-lite' );
 
+		self::add_labels_to_default_settings();
 		$settings = self::get_settings();
 
 		wp_localize_script(

phpcs.xml

@@ -2,36 +2,38 @@
 <ruleset name="">
     <description>ThemeIsle ruleset</description>
 
-    <config name="testVersion" value="8.1-"/>
+    <config name="testVersion" value="8.1-" />
 
     <rule ref="WordPress-VIP-Go" />
 
     <rule ref="WordPress-Core">
-        <exclude name="WordPress.DB.SlowDBQuery.slow_db_query_meta_query"/>
-        <exclude name="WordPress.DB.DirectDatabaseQuery.NoCaching"/>
-        <exclude name="WordPress.DB.DirectDatabaseQuery.DirectQuery"/>
+        <exclude name="WordPress.DB.SlowDBQuery.slow_db_query_meta_query" />
+        <exclude name="WordPress.DB.DirectDatabaseQuery.NoCaching" />
+        <exclude name="WordPress.DB.DirectDatabaseQuery.DirectQuery" />
     </rule>
 
     <rule ref="WordPress-Docs" />
 
     <rule ref="WordPress-Extra">
         <!-- Forget about file names -->
-        <exclude name="WordPress.Files.FileName"/>
-	    <exclude name="Universal.Arrays.DisallowShortArraySyntax.Found"/>
+        <exclude name="WordPress.Files.FileName" />
+        <exclude name="Universal.Arrays.DisallowShortArraySyntax.Found" />
     </rule>
 
     <rule ref="PHPCompatibility" />
 
     <rule ref="WordPress.WP.I18n">
         <properties>
-            <property name="text_domain" value="quickwp" />
+            <property name="text_domain" type="array">
+                <element value="hyve-lite" />
+            </property>
         </properties>
     </rule>
 
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax.Found"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax.Found" />
 
-    <arg name="extensions" value="php"/>
-    <arg value="s"/>
+    <arg name="extensions" value="php" />
+    <arg value="s" />
 
     <file>.</file>
     <exclude-pattern>node_modules/*</exclude-pattern>

src/backend/parts/ModerationReview.js

@@ -56,7 +56,10 @@ const ModerationReview = ({
 
 	return (
 		<Modal
-			title={ sprintf( __( 'Failed Moderation: %s', 'hyve-lite' ), ( post?.title || __( 'Untitled', 'hyve-lite' ) ) ) }
+			title={ sprintf(
+
+				// translators: %s the reason for failed moderation.
+				__( 'Failed Moderation: %s', 'hyve-lite' ), ( post?.title || __( 'Untitled', 'hyve-lite' ) ) ) }
 			onRequestClose={ onClose }
 			shouldCloseOnClickOutside={ false }
 			className="md:max-w-3xl md:w-full"