Merge branch 'hotfix/3.2.2-build-1' into fix/post-save-v3

Author: Marco Pereirinha

php/class-utils.php

@@ -546,11 +546,11 @@ public static function looks_like_json( $thing ) {
 		}
 
 		$thing = trim( $thing );
-	
+
 		if ( empty( $thing ) ) {
 			return false;
 		}
-	
+
 		if ( ! in_array( $thing[0], array( '{', '[' ), true ) ) {
 			return false;
 		}
@@ -1267,4 +1267,38 @@ public static function rest_url( $path = '', $scheme = null ) {
 		 */
 		return apply_filters( 'cloudinary_rest_url', $rest_url, $path, $scheme );
 	}
+
+	/**
+	 * Get the transformations title.
+	 *
+	 * @param string $context The context.
+	 *
+	 * @return string
+	 */
+	public static function get_transformations_title( $context ) {
+		$transformations_title = __( 'Cloudinary global transformations', 'cloudinary' );
+		$taxonomy_slug         = static::get_sanitized_text( 'taxonomy' );
+
+		if ( $taxonomy_slug ) {
+			$taxonomy              = get_taxonomy( $taxonomy_slug );
+			$transformations_title = sprintf(
+				// translators: %1$s is the taxonomy label and the %2$s is the context of the use.
+				__( '%1$s %2$s transformations', 'cloudinary' ),
+				$taxonomy->labels->singular_name,
+				$context
+			);
+
+			$taxonomy_id = static::get_sanitized_text( 'tag_ID' );
+
+			if ( $taxonomy_id ) {
+				$transformations_title = sprintf(
+					// translators: %s is the term name.
+					__( '%s transformations', 'cloudinary' ),
+					get_term( $taxonomy_id )->name
+				);
+			}
+		}
+
+		return $transformations_title;
+	}
 }

php/templates/taxonomy-transformation-fields.php

@@ -22,20 +22,21 @@
 		<h2>
 			<?php
 			// translators: The taxonomy label.
-			echo esc_html( sprintf( __( 'Cloudinary %s transformations', 'cloudinary' ), strtolower( $tax_labels->singular_name ) ) );
+			echo esc_html( sprintf( __( 'Cloudinary %s transformations', 'cloudinary' ), $tax_labels->singular_name ) );
 			?>
 		</h2>
 		<button type="button"><i class="dashicons dashicons-arrow-down-alt2"></i></button>
 	</div>
 	<div class="cloudinary-collapsible__content" style="display:none;">
 		<div class="cld-more-details">
 			<?php
-			echo esc_html(
-				sprintf(
-					// translators: The taxonomy label.
-					__( 'Additional transformations for this %s that will be appended to the globally defined Cloudinary transformations.', 'cloudinary' ),
-					$tax_labels->singular_name
-				)
+			printf(
+				// translators: %1$s is the taxonomy label, %2$s is the image settings link, %4$s is the video settings link. The %3$s is the closing tags for the links.
+				esc_html__( 'Add these %1$s-specific transformations to the global Cloudinary transformations in the plugin\'s %2$simage%3$s and %4$svideo%3$s settings.', 'cloudinary' ),
+				esc_html( $tax_labels->singular_name ),
+				'<a href="' . esc_url( admin_url( 'admin.php?page=cloudinary_image_settings#text-image-settings.image-freeform' ) ) . '">',
+				'</a>',
+				'<a href="' . esc_url( admin_url( 'admin.php?page=cloudinary_video_settings#text-video-settings.video-freeform' ) ) . '">'
 			)
 			?>
 		</div>

php/ui/component/class-notice.php

@@ -9,6 +9,7 @@
 
 use Cloudinary\REST_API;
 use Cloudinary\UI\Component;
+use Cloudinary\Utils;
 
 /**
  * Frame Component to render components only.

php/ui/component/class-text.php

@@ -44,6 +44,10 @@ protected function wrap( $struct ) {
 			'cld-input-' . $this->type,
 		);
 
+		if ( $this->setting->has_param( 'anchor' ) ) {
+			$struct['attributes']['id'] = 'text-' . str_replace( '_', '-', $this->setting->get_slug() );
+		}
+
 		return $struct;
 	}
 

ui-definitions/settings-image.php

@@ -8,13 +8,7 @@
 use Cloudinary\Utils;
 use function Cloudinary\get_plugin_instance;
 
-$transformations_title = __( 'Cloudinary global transformations', 'cloudinary' );
-
-$taxonomy_slug = Utils::get_sanitized_text( 'taxonomy' );
-
-if ( $taxonomy_slug ) {
-	$transformations_title = __( 'Term transformations', 'cloudinary' );
-}
+$transformations_title = Utils::get_transformations_title( esc_html__( 'Image', 'cloudinary' ) );
 
 $settings = array(
 	array(
@@ -161,6 +155,7 @@
 						'slug'           => 'image_freeform',
 						'title'          => $transformations_title,
 						'default'        => '',
+						'anchor'         => true,
 						'tooltip_text'   => sprintf(
 							// translators: The link to transformation reference.
 							__(

ui-definitions/settings-video.php

@@ -8,13 +8,7 @@
 use Cloudinary\Utils;
 use function Cloudinary\get_plugin_instance;
 
-$transformations_title = __( 'Cloudinary global transformations', 'cloudinary' );
-
-$taxonomy_slug = Utils::get_sanitized_text( 'taxonomy' );
-
-if ( $taxonomy_slug ) {
-	$transformations_title = __( 'Term transformations', 'cloudinary' );
-}
+$transformations_title = Utils::get_transformations_title( esc_html__( 'Video', 'cloudinary' ) );
 
 $settings = array(
 	array(
@@ -247,6 +241,7 @@
 						'slug'           => 'video_freeform',
 						'title'          => $transformations_title,
 						'default'        => '',
+						'anchor'         => true,
 						'tooltip_text'   => sprintf(
 							// translators: The link to transformation reference.
 							__(