Skip to content

Commit b9cd4db

Browse files
bruckercloudbruckercloud
authored
Merge pull request #1016 from cloudinary/uat
3.2.5
2 parents 10cdd89 + 77a7185 commit b9cd4db

10 files changed

+114
-78
lines changed

‎.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.4
1+
3.2.5

‎gruntfile.js

+2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ module.exports = function ( grunt ) {
121121
'!vendor/**/*',
122122
'!package/**/*',
123123
'!php/media/class-filter.php',
124+
'!php/misc/class-image-sizes-no-textdomain.php',
124125
],
125126
},
126127
},
@@ -137,6 +138,7 @@ module.exports = function ( grunt ) {
137138
'build/*',
138139
'vendor/*',
139140
'package/*',
141+
'php/misc/class-image-sizes-no-textdomain.php',
140142
],
141143
mainFile: 'cloudinary.php',
142144
potFilename: 'cloudinary.pot',

‎languages/cloudinary.pot

+40-60
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Copyright (C) 2024 Cloudinary Ltd., XWP
1+
# Copyright (C) 2025 Cloudinary Ltd., XWP
22
# This file is distributed under the GPLv2+.
33
msgid ""
44
msgstr ""
55
"Project-Id-Version: Cloudinary STABLETAG\n"
66
"Report-Msgid-Bugs-To: https://github.com/cloudinary/cloudinary_wordpress\n"
7-
"POT-Creation-Date: 2024-12-20 16:52:13+00:00\n"
7+
"POT-Creation-Date: 2025-02-11 09:20:41+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
11-
"PO-Revision-Date: 2024-MO-DA HO:MI+ZONE\n"
11+
"PO-Revision-Date: 2025-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"
1414
"Language: en\n"
@@ -343,127 +343,127 @@ msgstr ""
343343
msgid "Plan details for @%s"
344344
msgstr ""
345345

346-
#: php/class-deactivation.php:115
346+
#: php/class-deactivation.php:114
347347
msgid "Set up is too difficult"
348348
msgstr ""
349349

350-
#: php/class-deactivation.php:119
350+
#: php/class-deactivation.php:118
351351
msgid "Lack of documentation"
352352
msgstr ""
353353

354-
#: php/class-deactivation.php:123
354+
#: php/class-deactivation.php:122
355355
msgid "Not the features I wanted"
356356
msgstr ""
357357

358-
#: php/class-deactivation.php:127
358+
#: php/class-deactivation.php:126
359359
msgid "Found a better plugin"
360360
msgstr ""
361361

362-
#: php/class-deactivation.php:131
362+
#: php/class-deactivation.php:130
363363
msgid "Incompatible with theme or plugin"
364364
msgstr ""
365365

366-
#: php/class-deactivation.php:135
366+
#: php/class-deactivation.php:134
367367
msgid "Other"
368368
msgstr ""
369369

370-
#: php/class-deactivation.php:149
370+
#: php/class-deactivation.php:148
371371
msgid "Keep plugin data as it is"
372372
msgstr ""
373373

374-
#: php/class-deactivation.php:154
374+
#: php/class-deactivation.php:153
375375
msgid "Remove all plugin data and settings"
376376
msgstr ""
377377

378-
#: php/class-deactivation.php:178
378+
#: php/class-deactivation.php:177
379379
#. translators: The System Report link tag.
380380
msgid "Share a %s with Cloudinary to help improve the plugin."
381381
msgstr ""
382382

383-
#: php/class-deactivation.php:183 php/class-report.php:277
383+
#: php/class-deactivation.php:182 php/class-report.php:277
384384
#: ui-definitions/settings-pages.php:395
385385
#. translators: The System Report link and label.
386386
msgid "System Report"
387387
msgstr ""
388388

389-
#: php/class-deactivation.php:194
389+
#: php/class-deactivation.php:193
390390
msgid ""
391391
"Caution: Your storage setting is currently set to \"Cloudinary only\", "
392392
"disabling the plugin will result in broken links to media assets. Are you "
393393
"sure you want to continue?"
394394
msgstr ""
395395

396-
#: php/class-deactivation.php:198
396+
#: php/class-deactivation.php:197
397397
msgid "I understand and I want to proceed"
398398
msgstr ""
399399

400-
#: php/class-deactivation.php:204
400+
#: php/class-deactivation.php:203
401401
msgid ""
402402
"Before you deactivate the plugin, would you quickly give us your reason for "
403403
"doing so?"
404404
msgstr ""
405405

406-
#: php/class-deactivation.php:214
406+
#: php/class-deactivation.php:213
407407
msgid "Additional details:"
408408
msgstr ""
409409

410-
#: php/class-deactivation.php:221
410+
#: php/class-deactivation.php:220
411411
msgid "Please, choose one option what we should do with the plugin’s settings"
412412
msgstr ""
413413

414-
#: php/class-deactivation.php:248
414+
#: php/class-deactivation.php:247
415415
msgid "Allow Cloudinary to contact me regarding deactivation of the plugin."
416416
msgstr ""
417417

418-
#: php/class-deactivation.php:254
418+
#: php/class-deactivation.php:253
419419
msgid "Skip and deactivate"
420420
msgstr ""
421421

422-
#: php/class-deactivation.php:257 php/class-deactivation.php:300
422+
#: php/class-deactivation.php:256 php/class-deactivation.php:299
423423
msgid "Cancel"
424424
msgstr ""
425425

426-
#: php/class-deactivation.php:260
426+
#: php/class-deactivation.php:259
427427
msgid "Submit and deactivate"
428428
msgstr ""
429429

430-
#: php/class-deactivation.php:263 php/class-deactivation.php:309
430+
#: php/class-deactivation.php:262 php/class-deactivation.php:308
431431
msgid "Sending…"
432432
msgstr ""
433433

434-
#: php/class-deactivation.php:268 php/class-deactivation.php:314
434+
#: php/class-deactivation.php:267 php/class-deactivation.php:313
435435
msgid ""
436436
"Uninstall has been started and the plugin will automatically be deactivated "
437437
"once complete."
438438
msgstr ""
439439

440-
#: php/class-deactivation.php:271 php/class-deactivation.php:317
440+
#: php/class-deactivation.php:270 php/class-deactivation.php:316
441441
msgid "Close"
442442
msgstr ""
443443

444-
#: php/class-deactivation.php:290
444+
#: php/class-deactivation.php:289
445445
msgid "We noticed you didn't connect your account. Maybe we can help?"
446446
msgstr ""
447447

448-
#: php/class-deactivation.php:291
448+
#: php/class-deactivation.php:290
449449
msgid ""
450450
"Place your email below and our support will get back to you as soon as "
451451
"possible."
452452
msgstr ""
453453

454-
#: php/class-deactivation.php:294 php/class-deactivation.php:295
454+
#: php/class-deactivation.php:293 php/class-deactivation.php:294
455455
msgid "Your email address"
456456
msgstr ""
457457

458-
#: php/class-deactivation.php:303
458+
#: php/class-deactivation.php:302
459459
msgid "Deactivate"
460460
msgstr ""
461461

462-
#: php/class-deactivation.php:306
462+
#: php/class-deactivation.php:305
463463
msgid "Contact me"
464464
msgstr ""
465465

466-
#: php/class-deactivation.php:464
466+
#: php/class-deactivation.php:463
467467
msgid "Data clean up. The plugin will self deactivate once complete. "
468468
msgstr ""
469469

@@ -579,7 +579,7 @@ msgstr ""
579579
msgid "See examples"
580580
msgstr ""
581581

582-
#: php/class-plugin.php:751
582+
#: php/class-plugin.php:752
583583
msgid "Visit plugin site"
584584
msgstr ""
585585

@@ -784,61 +784,41 @@ msgid ""
784784
"%1$sCloudinary Academy%2$s."
785785
msgstr ""
786786

787-
#: php/class-utils.php:469
787+
#: php/class-utils.php:472
788788
#. translators: The plugin version.
789789
msgid "I need help with Cloudinary WordPress plugin version %s"
790790
msgstr ""
791791

792-
#: php/class-utils.php:473
792+
#: php/class-utils.php:476
793793
msgid ""
794794
"Please, provide more details on your request, and if possible, attach a "
795795
"System Report"
796796
msgstr ""
797797

798-
#: php/class-utils.php:787
798+
#: php/class-utils.php:790
799799
msgid "Debug log is empty"
800800
msgstr ""
801801

802-
#: php/class-utils.php:841
802+
#: php/class-utils.php:844
803803
msgid "Missing SRC attribute."
804804
msgstr ""
805805

806-
#: php/class-utils.php:879
806+
#: php/class-utils.php:882
807807
#. translators: The attachment ID.
808808
msgid "Clean up sync metadata for %d"
809809
msgstr ""
810810

811-
#: php/class-utils.php:927
812-
msgid "Thumbnail"
813-
msgstr ""
814-
815-
#: php/class-utils.php:928
816-
msgid "Medium"
817-
msgstr ""
818-
819-
#: php/class-utils.php:929
820-
msgid "Medium Large"
821-
msgstr ""
822-
823-
#: php/class-utils.php:930
824-
msgid "Large"
825-
msgstr ""
826-
827-
#: php/class-utils.php:931
828-
msgid "Full Size"
829-
msgstr ""
830-
831-
#: php/class-utils.php:1284
811+
#: php/class-utils.php:1279
832812
msgid "Cloudinary global transformations"
833813
msgstr ""
834814

835-
#: php/class-utils.php:1291
815+
#: php/class-utils.php:1286
836816
#. translators: %1$s is the taxonomy label and the %2$s is the context of the
837817
#. use.
838818
msgid "%1$s %2$s transformations"
839819
msgstr ""
840820

841-
#: php/class-utils.php:1301
821+
#: php/class-utils.php:1296
842822
#. translators: %s is the term name.
843823
msgid "%s transformations"
844824
msgstr ""

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,5 @@
143143
"webpack-cli": "^4.2.0",
144144
"webpackbar": "^5.0.2"
145145
},
146-
"version": "3.2.4"
146+
"version": "3.2.5"
147147
}

‎php/class-utils.php

+4-11
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Cloudinary;
99

10+
use Cloudinary\Misc\Image_Sizes_No_Textdomain;
1011
use Cloudinary\Settings\Setting;
1112
use Google\Web_Stories\Story_Post_Type;
1213
use WP_Post;
@@ -472,7 +473,7 @@ public static function get_support_link( $args = array() ) {
472473
$plugin->version
473474
)
474475
),
475-
'tf_description' => esc_attr( __( 'Please, provide more details on your request, and if possible, attach a System Report', 'cloudinary' ) ),
476+
'tf_description' => esc_attr( __( 'Please, provide more details on your request, and if possible, attach a System Report', 'cloudinary' ) ),
476477
);
477478

478479
$args = wp_parse_args(
@@ -574,7 +575,7 @@ public static function is_rest_api() {
574575
// Fallback if rest engine is not setup yet.
575576
$rest_base = wp_parse_url( static::rest_url( '/' ), PHP_URL_PATH );
576577
$request_uri = filter_input( INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL );
577-
$is = strpos( $request_uri, $rest_base ) === 0;
578+
$is = is_string( $request_uri ) && strpos( $request_uri, $rest_base ) === 0;
578579
}
579580

580581
return $is;
@@ -924,15 +925,7 @@ public static function get_registered_sizes( $attachment_id = null ) {
924925
/** This filter is documented in wp-admin/includes/media.php */
925926
$image_sizes = apply_filters(
926927
'image_size_names_choose',
927-
array(
928-
// phpcs:disable WordPress.WP.I18n.MissingArgDomain
929-
'thumbnail' => __( 'Thumbnail' ),
930-
'medium' => __( 'Medium' ),
931-
'medium_large' => __( 'Medium Large' ),
932-
'large' => __( 'Large' ),
933-
'full' => __( 'Full Size' ),
934-
// phpcs:enable WordPress.WP.I18n.MissingArgDomain
935-
)
928+
Image_Sizes_No_Textdomain::get_image_sizes()
936929
);
937930

938931
$labels = wp_parse_args( $labels, $image_sizes );

‎php/delivery/class-responsive-breakpoints.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ protected function apply_breakpoints( $tag_element ) {
140140
$size_transformation = $this->media->get_crop_from_transformation( $this->media->get_transformations_from_string( $src ) );
141141
$size_string = Api::generate_transformation_string( array( $size_transformation ) );
142142
$breakpoints = array();
143-
while ( $max > $min ) {
143+
while ( $max >= $min ) {
144144
if ( $width >= $max ) {
145145
$size_transformation['width'] = $max;
146146
$size_transformation['height'] = floor( $max / $ratio );

‎php/misc/class-image-sizes-no-textdomain.php

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Returns image sizes used in `class-utils.php`.
4+
*
5+
* These sizes are defined in a separate file, because the `addtextdomain`
6+
* task in `gruntfile.js` would otherwise try to add our textdomain to
7+
* them, which we don't want.
8+
*
9+
* We need these size names to use the default WordPress translations.
10+
*
11+
* @package Cloudinary
12+
*/
13+
14+
namespace Cloudinary\Misc;
15+
16+
/**
17+
* Class Image_Sizes_No_Textdomain
18+
*/
19+
class Image_Sizes_No_Textdomain {
20+
/**
21+
* Get image sizes.
22+
*
23+
* @return array
24+
*/
25+
public static function get_image_sizes() {
26+
return array(
27+
// phpcs:disable WordPress.WP.I18n.MissingArgDomain
28+
'thumbnail' => __( 'Thumbnail' ),
29+
'medium' => __( 'Medium' ),
30+
'medium_large' => __( 'Medium Large' ),
31+
'large' => __( 'Large' ),
32+
'full' => __( 'Full Size' ),
33+
// phpcs:enable WordPress.WP.I18n.MissingArgDomain
34+
);
35+
}
36+
}

0 commit comments

Comments
 (0)