From a54bf2943f018e97bbd125c543f2a38eeb06b426 Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" Date: Tue, 8 Oct 2024 09:18:04 +0200 Subject: [PATCH 1/8] Enhance a changelog line --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index ae5092a0c8d..a5e293dd2ad 100644 --- a/readme.txt +++ b/readme.txt @@ -282,7 +282,7 @@ Yoast SEO 23.6 brings more enhancements and bugfixes. [Find more information abo #### Enhancements -* Adds a filter to modify the sitemap's URL. Props to [ashujangra](https://github.com/ashujangra). +* Adds a filter to modify the main sitemap's URL. Props to [ashujangra](https://github.com/ashujangra). * Improves the _transition words_ assessment for Turkish and English by expanding the relevant lists of transitions words. Props to [abulu](https://wordpress.org/support/users/abulu/). * Uses the full-sized counterpart when a resized first content image is used for Open Graph and X images. From 776bc0430b9689ee78bb0190bd383b5086c49163 Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" Date: Tue, 8 Oct 2024 09:49:12 +0200 Subject: [PATCH 2/8] Change BF ad title --- packages/js/src/shared-admin/components/premium-upsell-card.js | 3 ++- src/presenters/admin/sidebar-presenter.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/js/src/shared-admin/components/premium-upsell-card.js b/packages/js/src/shared-admin/components/premium-upsell-card.js index b38823070da..0ff5dece42e 100644 --- a/packages/js/src/shared-admin/components/premium-upsell-card.js +++ b/packages/js/src/shared-admin/components/premium-upsell-card.js @@ -36,8 +36,9 @@ export const PremiumUpsellCard = ( { link, linkProps, promotions } ) => { getPremium = createInterpolateElement( sprintf( /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */ - __( "%1$sAll annual plans incl. %2$s", "wordpress-seo" ), + __( "%1$sBuy %2$s%3$s", "wordpress-seo" ), "", + "Yoast SEO Premium", "" ), { diff --git a/src/presenters/admin/sidebar-presenter.php b/src/presenters/admin/sidebar-presenter.php index 876ecdaf3dd..ea9bd62f2f2 100644 --- a/src/presenters/admin/sidebar-presenter.php +++ b/src/presenters/admin/sidebar-presenter.php @@ -56,7 +56,7 @@ class="attachment-full size-full content-visible" classes->get( Promotion_Manager::class )->is( 'black-friday-2024-promotion' ) ) { /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. */ - \printf( \esc_html__( '%1$sAll annual plans incl.%2$s', 'wordpress-seo' ), '', '' ); + \printf( \esc_html__( '%1$sBuy %2$s%3$s', 'wordpress-seo' ), '', 'Yoast SEO Premium', '' ); } else { /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */ From c2102e240fb0bcd7a05ab63e7cdf7ca826b611f4 Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" <68744851+pls78@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:10:17 +0200 Subject: [PATCH 3/8] Update packages/js/src/shared-admin/components/premium-upsell-card.js Co-authored-by: Enrico Battocchi --- packages/js/src/shared-admin/components/premium-upsell-card.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/src/shared-admin/components/premium-upsell-card.js b/packages/js/src/shared-admin/components/premium-upsell-card.js index 0ff5dece42e..09a02b3d1b5 100644 --- a/packages/js/src/shared-admin/components/premium-upsell-card.js +++ b/packages/js/src/shared-admin/components/premium-upsell-card.js @@ -35,7 +35,7 @@ export const PremiumUpsellCard = ( { link, linkProps, promotions } ) => { getPremium = createInterpolateElement( sprintf( - /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */ + /* translators: %1$s and %3$s expand to a span wrap to avoid linebreaks. %2$s expands to "Yoast SEO Premium". */ __( "%1$sBuy %2$s%3$s", "wordpress-seo" ), "", "Yoast SEO Premium", From 8a860e774d2baa8e30a9c11ff1f44a9929b2c46a Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" <68744851+pls78@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:10:33 +0200 Subject: [PATCH 4/8] Update src/presenters/admin/sidebar-presenter.php Co-authored-by: Enrico Battocchi --- src/presenters/admin/sidebar-presenter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/presenters/admin/sidebar-presenter.php b/src/presenters/admin/sidebar-presenter.php index ea9bd62f2f2..9f60df7bb77 100644 --- a/src/presenters/admin/sidebar-presenter.php +++ b/src/presenters/admin/sidebar-presenter.php @@ -55,7 +55,7 @@ class="attachment-full size-full content-visible"

classes->get( Promotion_Manager::class )->is( 'black-friday-2024-promotion' ) ) { - /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. */ + /* translators: %1$s and %3$s expand to a span wrap to avoid linebreaks. %2$s expands to "Yoast SEO Premium". */ \printf( \esc_html__( '%1$sBuy %2$s%3$s', 'wordpress-seo' ), '', 'Yoast SEO Premium', '' ); } else { From cd2ecdef80848b2f0807e06bfbd88bbfac695966 Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" <68744851+pls78@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:19:38 +0200 Subject: [PATCH 5/8] Update packages/js/src/shared-admin/components/premium-upsell-card.js Co-authored-by: Enrico Battocchi --- .../src/shared-admin/components/premium-upsell-card.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/js/src/shared-admin/components/premium-upsell-card.js b/packages/js/src/shared-admin/components/premium-upsell-card.js index 09a02b3d1b5..701f4c641fd 100644 --- a/packages/js/src/shared-admin/components/premium-upsell-card.js +++ b/packages/js/src/shared-admin/components/premium-upsell-card.js @@ -35,11 +35,12 @@ export const PremiumUpsellCard = ( { link, linkProps, promotions } ) => { getPremium = createInterpolateElement( sprintf( - /* translators: %1$s and %3$s expand to a span wrap to avoid linebreaks. %2$s expands to "Yoast SEO Premium". */ - __( "%1$sBuy %2$s%3$s", "wordpress-seo" ), + /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */ + __( "%1$sBuy%2$s %3$s", "wordpress-seo" ), "", - "Yoast SEO Premium", - "" + "", + "Yoast SEO Premium" + ), { nowrap: , From 41565e7bb208e2f9dd9f9829a943a8d01a3745c6 Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" <68744851+pls78@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:19:47 +0200 Subject: [PATCH 6/8] Update src/presenters/admin/sidebar-presenter.php Co-authored-by: Enrico Battocchi --- src/presenters/admin/sidebar-presenter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/presenters/admin/sidebar-presenter.php b/src/presenters/admin/sidebar-presenter.php index 9f60df7bb77..4663ad1f2b7 100644 --- a/src/presenters/admin/sidebar-presenter.php +++ b/src/presenters/admin/sidebar-presenter.php @@ -55,8 +55,8 @@ class="attachment-full size-full content-visible"

classes->get( Promotion_Manager::class )->is( 'black-friday-2024-promotion' ) ) { - /* translators: %1$s and %3$s expand to a span wrap to avoid linebreaks. %2$s expands to "Yoast SEO Premium". */ - \printf( \esc_html__( '%1$sBuy %2$s%3$s', 'wordpress-seo' ), '', 'Yoast SEO Premium', '' ); + /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */ + \printf( \esc_html__( '%1$sBuy%2$s %3$s', 'wordpress-seo' ), '', '', 'Yoast SEO Premium' ); } else { /* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */ From 63ddfdaf13ca6749c3526f508f2be966b5bd49db Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 8 Oct 2024 08:36:03 +0000 Subject: [PATCH 7/8] Add changelog --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index a5e293dd2ad..ae5092a0c8d 100644 --- a/readme.txt +++ b/readme.txt @@ -282,7 +282,7 @@ Yoast SEO 23.6 brings more enhancements and bugfixes. [Find more information abo #### Enhancements -* Adds a filter to modify the main sitemap's URL. Props to [ashujangra](https://github.com/ashujangra). +* Adds a filter to modify the sitemap's URL. Props to [ashujangra](https://github.com/ashujangra). * Improves the _transition words_ assessment for Turkish and English by expanding the relevant lists of transitions words. Props to [abulu](https://wordpress.org/support/users/abulu/). * Uses the full-sized counterpart when a resized first content image is used for Open Graph and X images. From c7e3c5da14185d43b242adf6585916d7935597ad Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 8 Oct 2024 08:36:09 +0000 Subject: [PATCH 8/8] Bump version to 23.6-RC6 --- package.json | 2 +- wp-seo-main.php | 2 +- wp-seo.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7eab1e2e870..f121e6b592e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "webpack-bundle-analyzer": "^4.9.1" }, "yoast": { - "pluginVersion": "23.6-RC5" + "pluginVersion": "23.6-RC6" }, "version": "0.0.0" } diff --git a/wp-seo-main.php b/wp-seo-main.php index 7ad1dd16121..ea407184e87 100644 --- a/wp-seo-main.php +++ b/wp-seo-main.php @@ -15,7 +15,7 @@ * {@internal Nobody should be able to overrule the real version number as this can cause * serious issues with the options, so no if ( ! defined() ).}} */ -define( 'WPSEO_VERSION', '23.6-RC5' ); +define( 'WPSEO_VERSION', '23.6-RC6' ); if ( ! defined( 'WPSEO_PATH' ) ) { diff --git a/wp-seo.php b/wp-seo.php index e594bdb7bc0..518d288085e 100644 --- a/wp-seo.php +++ b/wp-seo.php @@ -8,7 +8,7 @@ * * @wordpress-plugin * Plugin Name: Yoast SEO - * Version: 23.6-RC5 + * Version: 23.6-RC6 * Plugin URI: https://yoa.st/1uj * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more. * Author: Team Yoast