release: fixes

selul · web-flow · commit 47e5f0c44c13 · 2025-11-25T21:35:35.000+02:00
diff --git a/src/Loader.php b/src/Loader.php
@@ -331,10 +331,7 @@ final class Loader {
 	 * Initialize the sdk logic.
 	 */
 	public static function init() {
-		/**
-		 * This filter can be used to localize the labels inside each product.
-		 */
-		self::$labels = apply_filters( 'themeisle_sdk_labels', self::$labels );
+		self::localize_labels();
 		if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Loader ) ) {
 			self::$instance = new Loader();
 			$modules        = array_merge( self::$available_modules, apply_filters( 'themeisle_sdk_modules', [] ) );
@@ -346,8 +343,90 @@ public static function init() {
 			self::$available_modules = $modules;
 
 			add_action( 'themeisle_sdk_first_activation', array( __CLASS__, 'activate' ) );
+		
 		}
 	}
+	
+	/**
+	 * Localize the labels.
+	 */
+	public static function localize_labels() {
+		$originals        = self::$labels;
+		$all_translations = [];
+
+		global $wp_filter;
+		if ( isset( $wp_filter['themeisle_sdk_labels'] ) ) {
+			foreach ( $wp_filter['themeisle_sdk_labels']->callbacks as $priority => $hooks ) {
+				foreach ( $hooks as $hook ) {
+					// Each callback gets fresh originals, not previous callback's output
+					$result             = call_user_func( $hook['function'], $originals );
+					$all_translations[] = $result;
+				}
+			}
+			
+			// Remove the filter so it doesn't run again via apply_filters
+			remove_all_filters( 'themeisle_sdk_labels' );
+		}
+
+		// Merge all results, first real translation wins
+		self::$labels = self::merge_all_translations( $originals, $all_translations );
+	}
+	/**
+	 * Merge all translations.
+	 *
+	 * @param array $originals The original labels.
+	 * @param array $all_translations The all translations.
+	 *
+	 * @return array The merged labels.
+	 */
+	private static function merge_all_translations( $originals, $all_translations ) {
+		$result = $originals;
+		
+		foreach ( $all_translations as $translations ) {
+			$result = self::merge_if_translated( $result, $translations, $originals );
+		}
+		
+		return $result;
+	}
+	/**
+	 * Merge if translated.
+	 *
+	 * @param array $current The current labels.
+	 * @param array $new The new labels.
+	 * @param array $originals The original labels.
+	 * @return array The merged labels.
+	 */
+	private static function merge_if_translated( $current, $new, $originals ) {
+		foreach ( $new as $key => $value ) {
+			if ( ! isset( $originals[ $key ] ) ) {
+				// New key, accept it
+				if ( ! isset( $current[ $key ] ) ) {
+					$current[ $key ] = $value;
+				}
+				continue;
+			}
+			
+			if ( is_array( $value ) && is_array( $originals[ $key ] ) ) {
+				$current[ $key ] = self::merge_if_translated( 
+					$current[ $key ], 
+					$value, 
+					$originals[ $key ] 
+				);
+			} else {
+				// Only accept if:
+				// 1. New value is actually translated (differs from original)
+				// 2. Current value is NOT already translated
+				$is_new_translated       = ( $value !== $originals[ $key ] );
+				$is_current_untranslated = ( $current[ $key ] === $originals[ $key ] );
+				
+				if ( $is_new_translated && $is_current_untranslated ) {
+					$current[ $key ] = $value;
+				}
+			}
+		}
+		
+		return $current;
+	}
 
 	/**
 	 * Get cache token used in API requests.
diff --git a/src/Modules/Announcements.php b/src/Modules/Announcements.php
@@ -245,6 +245,8 @@ public function black_friday_notice_render() {
 			return;
 		}
 
+		$logo_url           = ! empty( $data['logo_url'] ) ? $data['logo_url'] : $this->get_sdk_uri() . 'assets/images/themeisle-logo.png';
+		$cta_label          = ! empty( $data['cta_label'] ) ? $data['cta_label'] : Loader::$labels['announcements']['notice_link_label'];
 		$sale_url           = ! empty( $data['sale_url'] ) ? $data['sale_url'] : '';
 		$hide_other_notices = ! empty( $data['hide_other_notices'] ) ? $data['hide_other_notices'] : ! $can_dismiss;
 		$dismiss_notice_url = wp_nonce_url( 
@@ -340,7 +342,7 @@ public function black_friday_notice_render() {
 				<div class="themeisle-sale-logo">
 					<img
 						width="45"
-						src="<?php echo esc_url( $this->get_sdk_uri() . 'assets/images/themeisle-logo.png' ); ?>"
+						src="<?php echo esc_url( $logo_url ); ?>"
 					/>
 				</div>
 				<div class="themeisle-sale-content">
@@ -360,7 +362,7 @@ public function black_friday_notice_render() {
 						target="_blank"
 						class="button button-primary themeisle-sale-button"
 					>
-					<?php echo esc_html( Loader::$labels['announcements']['notice_link_label'] ); ?>
+					<?php echo esc_html( $cta_label ); ?>
 					</a>
 				</div>
 				<?php if ( $can_dismiss ) : ?>
