Skip to content

Commit 5b9f015

Browse files
hannaw93hannaw93
committed
fix merge conflict
2 parents cd5824e + 799860e commit 5b9f015

File tree

365 files changed

+12168
-12319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+12168
-12319
lines changed

‎admin/class-admin-asset-manager.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,11 @@ protected function styles_to_be_registered() {
622622
'src' => 'new-settings-' . $flat_version,
623623
'deps' => [ self::PREFIX . 'tailwind' ],
624624
],
625+
[
626+
'name' => 'black-friday-banner',
627+
'src' => 'black-friday-banner-' . $flat_version,
628+
'deps' => [ self::PREFIX . 'tailwind' ],
629+
],
625630
[
626631
'name' => 'academy',
627632
'src' => 'academy-' . $flat_version,

‎admin/class-admin-utils.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public static function get_install_link( $plugin ) {
7575
public static function get_new_tab_message() {
7676
return sprintf(
7777
'<span class="screen-reader-text">%s</span>',
78+
/* translators: Hidden accessibility text. */
7879
esc_html__( '(Opens in a new browser tab)', 'wordpress-seo' )
7980
);
8081
}

‎admin/class-bulk-editor-list-table.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ public function extra_tablenav( $which ) {
408408
printf(
409409
'<label for="%1$s" class="screen-reader-text">%2$s</label>',
410410
esc_attr( 'post-type-filter-' . $instance_type ),
411+
/* translators: Hidden accessibility text. */
411412
esc_html__( 'Filter by content type', 'wordpress-seo' )
412413
);
413414
printf(
@@ -809,7 +810,7 @@ protected function parse_page_title_column( $rec ) {
809810
$actions['edit'] = sprintf(
810811
'<a href="%s" aria-label="%s">%s</a>',
811812
esc_url( get_edit_post_link( $rec->ID, true ) ),
812-
/* translators: %s: post title */
813+
/* translators: Hidden accessibility text; %s: post title. */
813814
esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;', 'wordpress-seo' ), $title ) ),
814815
__( 'Edit', 'wordpress-seo' )
815816
);
@@ -821,7 +822,7 @@ protected function parse_page_title_column( $rec ) {
821822
$actions['view'] = sprintf(
822823
'<a href="%s" aria-label="%s">%s</a>',
823824
esc_url( add_query_arg( 'preview', 'true', get_permalink( $rec->ID ) ) ),
824-
/* translators: %s: post title */
825+
/* translators: Hidden accessibility text; %s: post title. */
825826
esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;', 'wordpress-seo' ), $title ) ),
826827
__( 'Preview', 'wordpress-seo' )
827828
);
@@ -831,7 +832,7 @@ protected function parse_page_title_column( $rec ) {
831832
$actions['view'] = sprintf(
832833
'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
833834
esc_url( get_permalink( $rec->ID ) ),
834-
/* translators: %s: post title */
835+
/* translators: Hidden accessibility text; %s: post title. */
835836
esc_attr( sprintf( __( 'View &#8220;%s&#8221;', 'wordpress-seo' ), $title ) ),
836837
__( 'View', 'wordpress-seo' )
837838
);

‎admin/class-config.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ public function config_page_scripts() {
9191
'isRtl' => is_rtl(),
9292
'isPremium' => YoastSEO()->helpers->product->is_premium(),
9393
'isWooCommerceActive' => $woocommerce_conditional->is_met(),
94+
'currentPromotions' => YoastSEO()->classes->get( Yoast\WP\SEO\Promotions\Application\Promotion_Manager::class )->get_current_promotions(),
9495
'webinarIntroSettingsUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/webinar-intro-settings' ),
95-
'blackFridayBlockEditorUrl' => ( YoastSEO()->classes->get( Yoast\WP\SEO\Promotions\Application\Promotion_Manager::class )->is( 'black_friday_2023_checklist' ) ) ? WPSEO_Shortlinker::get( 'https://yoa.st/black-friday-checklist' ) : '',
9696
'webinarIntroFirstTimeConfigUrl' => $this->get_webinar_shortlink(),
97+
'linkParams' => WPSEO_Shortlinker::get_query_params(),
9798
'pluginUrl' => \plugins_url( '', \WPSEO_FILE ),
9899
];
99100

‎admin/class-gutenberg-compatibility.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
1515
*
1616
* @var string
1717
*/
18-
const CURRENT_RELEASE = '16.6.0';
18+
const CURRENT_RELEASE = '16.8.1';
1919

2020
/**
2121
* The minimally supported version of Gutenberg by the plugin.
2222
*
2323
* @var string
2424
*/
25-
const MINIMUM_SUPPORTED = '16.6.0';
25+
const MINIMUM_SUPPORTED = '16.8.1';
2626

2727
/**
2828
* Holds the current version.

‎admin/class-meta-columns.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,19 @@ public function column_heading( $columns ) {
9797
$added_columns = [];
9898

9999
if ( $this->analysis_seo->is_enabled() ) {
100-
$added_columns['wpseo-score'] = '<span class="yoast-column-seo-score yoast-column-header-has-tooltip" data-tooltip-text="' . esc_attr__( 'SEO score', 'wordpress-seo' ) . '"><span class="screen-reader-text">' . __( 'SEO score', 'wordpress-seo' ) . '</span></span></span>';
100+
$added_columns['wpseo-score'] = '<span class="yoast-column-seo-score yoast-column-header-has-tooltip" data-tooltip-text="' .
101+
esc_attr__( 'SEO score', 'wordpress-seo' ) .
102+
'"><span class="screen-reader-text">' .
103+
__( 'SEO score', 'wordpress-seo' ) .
104+
'</span></span></span>';
101105
}
102106

103107
if ( $this->analysis_readability->is_enabled() ) {
104-
$added_columns['wpseo-score-readability'] = '<span class="yoast-column-readability yoast-column-header-has-tooltip" data-tooltip-text="' . esc_attr__( 'Readability score', 'wordpress-seo' ) . '"><span class="screen-reader-text">' . __( 'Readability score', 'wordpress-seo' ) . '</span></span></span>';
108+
$added_columns['wpseo-score-readability'] = '<span class="yoast-column-readability yoast-column-header-has-tooltip" data-tooltip-text="' .
109+
esc_attr__( 'Readability score', 'wordpress-seo' ) .
110+
'"><span class="screen-reader-text">' .
111+
__( 'Readability score', 'wordpress-seo' ) .
112+
'</span></span></span>';
105113
}
106114

107115
$added_columns['wpseo-title'] = __( 'SEO Title', 'wordpress-seo' );
@@ -154,6 +162,7 @@ public function column_content( $column_name, $post_id ) {
154162
}
155163
if ( $metadesc_val === '' ) {
156164
echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">',
165+
/* translators: Hidden accessibility text. */
157166
esc_html__( 'Meta description not set.', 'wordpress-seo' ),
158167
'</span>';
159168

@@ -169,6 +178,7 @@ public function column_content( $column_name, $post_id ) {
169178

170179
if ( $focuskw_val === '' ) {
171180
echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">',
181+
/* translators: Hidden accessibility text. */
172182
esc_html__( 'Focus keyphrase not set.', 'wordpress-seo' ),
173183
'</span>';
174184

@@ -238,6 +248,7 @@ public function posts_filter_dropdown() {
238248

239249
$ranks = WPSEO_Rank::get_all_ranks();
240250

251+
/* translators: Hidden accessibility text. */
241252
echo '<label class="screen-reader-text" for="wpseo-filter">' . esc_html__( 'Filter by SEO Score', 'wordpress-seo' ) . '</label>';
242253
echo '<select name="seo_filter" id="wpseo-filter">';
243254

@@ -266,6 +277,7 @@ public function posts_filter_dropdown_readability() {
266277

267278
$ranks = WPSEO_Rank::get_all_readability_ranks();
268279

280+
/* translators: Hidden accessibility text. */
269281
echo '<label class="screen-reader-text" for="wpseo-readability-filter">' . esc_html__( 'Filter by Readability Score', 'wordpress-seo' ) . '</label>';
270282
echo '<select name="readability_filter" id="wpseo-readability-filter">';
271283

‎admin/class-premium-popup.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public function get_premium_message( $popup = true ) {
7878
$assets_uri = trailingslashit( plugin_dir_url( WPSEO_FILE ) );
7979

8080
/* translators: %s expands to Yoast SEO Premium */
81-
$cta_text = esc_html( sprintf( __( 'Get %s', 'wordpress-seo' ), 'Yoast SEO Premium' ) );
81+
$cta_text = esc_html( sprintf( __( 'Get %s', 'wordpress-seo' ), 'Yoast SEO Premium' ) );
82+
/* translators: Hidden accessibility text. */
8283
$new_tab_message = '<span class="screen-reader-text">' . esc_html__( '(Opens in a new browser tab)', 'wordpress-seo' ) . '</span>';
8384
$caret_icon = '<span aria-hidden="true" class="yoast-button-upsell__caret"></span>';
8485
$classes = '';

‎admin/class-premium-upsell-admin-block.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* @package WPSEO\Admin
66
*/
77

8+
use Yoast\WP\SEO\Promotions\Application\Promotion_Manager;
9+
810
/**
911
* Class WPSEO_Premium_Upsell_Admin_Block
1012
*/
@@ -66,7 +68,8 @@ public function render() {
6668
$class = $this->get_html_class();
6769

6870
/* translators: %s expands to Yoast SEO Premium */
69-
$button_text = sprintf( esc_html__( 'Get %s', 'wordpress-seo' ), 'Yoast SEO Premium' );
71+
$button_text = YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ? \esc_html__( 'Claim your 30% off now!', 'wordpress-seo' ) : sprintf( esc_html__( 'Get %s', 'wordpress-seo' ), 'Yoast SEO Premium' );
72+
/* translators: Hidden accessibility text. */
7073
$button_text .= '<span class="screen-reader-text">' . esc_html__( '(Opens in a new browser tab)', 'wordpress-seo' ) . '</span>' .
7174
'<span aria-hidden="true" class="yoast-button-upsell__caret"></span>';
7275

@@ -79,7 +82,14 @@ public function render() {
7982

8083
echo '<div class="' . esc_attr( $class ) . '">';
8184

82-
echo '<div>';
85+
if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) {
86+
$bf_label = \esc_html__( 'BLACK FRIDAY', 'wordpress-seo' );
87+
$sale_label = \esc_html__( '30% OFF', 'wordpress-seo' );
88+
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Already escaped above.
89+
echo "<div class='black-friday-container'><span>$bf_label</span> <span style='margin-left: auto;'>$sale_label</span> </div>";
90+
}
91+
92+
echo '<div class="' . esc_attr( $class . '--container' ) . '">';
8393
echo '<h2 class="' . esc_attr( $class . '--header' ) . '">' .
8494
sprintf(
8595
/* translators: %s expands to Yoast SEO Premium */

‎admin/class-suggested-plugins.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected function create_more_information_link( $url, $name ) {
132132
return sprintf(
133133
'<a href="%s" aria-label="%s" target="_blank" rel="noopener noreferrer">',
134134
$url,
135-
/* translators: %1$s expands to the dependency name. */
135+
/* translators: Hidden accessibility text; %1$s expands to the dependency name */
136136
sprintf( __( 'More information about %1$s', 'wordpress-seo' ), $name )
137137
);
138138
}

‎admin/class-yoast-form.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,10 +909,15 @@ public function toggle_switch( $variable, $values, $label, $help = '', $attr = [
909909

910910
$upsell_button = '';
911911
if ( $has_premium_upsell ) {
912-
$upsell_button = '<a class="yoast-button yoast-button--buy yoast-button--small" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2" href=' . esc_url( $attr['premium_upsell_url'] ) . ' target="_blank">' . esc_html__( 'Unlock with Premium!', 'wordpress-seo' ) . '<span class="screen-reader-text">' . esc_html__( '(Opens in a new browser tab)', 'wordpress-seo' ) . '</span>' .
913-
'<span aria-hidden="true" class="yoast-button--buy__caret"></span></a>';
912+
$upsell_button = '<a class="yoast-button yoast-button--buy yoast-button--small" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2" href=' .
913+
esc_url( $attr['premium_upsell_url'] ) . ' target="_blank">' .
914+
esc_html__( 'Unlock with Premium!', 'wordpress-seo' ) .
915+
/* translators: Hidden accessibility text. */
916+
'<span class="screen-reader-text">' . esc_html__( '(Opens in a new browser tab)', 'wordpress-seo' ) . '</span>' .
917+
'<span aria-hidden="true" class="yoast-button--buy__caret"></span></a>';
914918
}
915919

920+
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- All variable output is escaped above.
916921
echo '<a></a></div></fieldset><div class="clear"></div>' . $upsell_button . '</div>' . PHP_EOL . PHP_EOL;
917922
}
918923

‎admin/formatter/class-metabox-formatter.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ private function get_content_analysis_component_translations() {
240240
'content-analysis.highlight' => __( 'Highlight this result in the text', 'wordpress-seo' ),
241241
'content-analysis.nohighlight' => __( 'Remove highlight from the text', 'wordpress-seo' ),
242242
'content-analysis.disabledButton' => __( 'Marks are disabled in current view', 'wordpress-seo' ),
243+
/* translators: Hidden accessibility text. */
243244
'a11yNotice.opensInNewTab' => __( '(Opens in a new browser tab)', 'wordpress-seo' ),
244245
];
245246
}

‎admin/menu/class-admin-menu.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,10 @@ protected function get_notification_counter() {
114114
$notification_count = $notification_center->get_notification_count();
115115

116116
// Add main page.
117-
/* translators: %s: number of notifications */
117+
/* translators: Hidden accessibility text; %s: number of notifications. */
118118
$notifications = sprintf( _n( '%s notification', '%s notifications', $notification_count, 'wordpress-seo' ), number_format_i18n( $notification_count ) );
119119

120-
$counter = sprintf( '<span class="update-plugins count-%1$d"><span class="plugin-count" aria-hidden="true">%1$d</span><span class="screen-reader-text">%2$s</span></span>', $notification_count, $notifications );
121-
122-
return $counter;
120+
return sprintf( '<span class="update-plugins count-%1$d"><span class="plugin-count" aria-hidden="true">%1$d</span><span class="screen-reader-text">%2$s</span></span>', $notification_count, $notifications );
123121
}
124122

125123
/**

‎admin/menu/class-base-menu.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* @package WPSEO\Admin\Menu
66
*/
77

8+
use Yoast\WP\SEO\Promotions\Application\Promotion_Manager;
9+
810
/**
911
* Admin menu base class.
1012
*/
@@ -258,6 +260,10 @@ protected function get_license_page_title() {
258260
$title = __( 'Premium', 'wordpress-seo' );
259261
}
260262

263+
if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) && ! YoastSEO()->helpers->product->is_premium() ) {
264+
$title = __( 'Premium', 'wordpress-seo' ) . '<span class="yoast-menu-bf-sale-badge">' . __( '30% OFF', 'wordpress-seo' ) . '</span>';
265+
}
266+
261267
return $title;
262268
}
263269

‎admin/metabox/class-metabox.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -893,8 +893,7 @@ public function enqueue() {
893893
'has_taxonomies' => $this->current_post_type_has_taxonomies(),
894894
],
895895
'shortcodes' => [
896-
'wpseo_filter_shortcodes_nonce' => wp_create_nonce( 'wpseo-filter-shortcodes' ),
897-
'wpseo_shortcode_tags' => $this->get_valid_shortcode_tags(),
896+
'wpseo_shortcode_tags' => $this->get_valid_shortcode_tags(),
898897
],
899898
];
900899

@@ -931,7 +930,7 @@ public function enqueue() {
931930
'dismissedAlerts' => $dismissed_alerts,
932931
'currentPromotions' => YoastSEO()->classes->get( Yoast\WP\SEO\Promotions\Application\Promotion_Manager::class )->get_current_promotions(),
933932
'webinarIntroBlockEditorUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/webinar-intro-block-editor' ),
934-
'blackFridayBlockEditorUrl' => ( YoastSEO()->classes->get( Yoast\WP\SEO\Promotions\Application\Promotion_Manager::class )->is( 'black_friday_2023_checklist' ) ) ? WPSEO_Shortlinker::get( 'https://yoa.st/black-friday-checklist' ) : '',
933+
'blackFridayBlockEditorUrl' => ( YoastSEO()->classes->get( Yoast\WP\SEO\Promotions\Application\Promotion_Manager::class )->is( 'black-friday-2023-checklist' ) ) ? WPSEO_Shortlinker::get( 'https://yoa.st/black-friday-checklist' ) : '',
935934
'isJetpackBoostActive' => ( $is_block_editor ) ? YoastSEO()->classes->get( Jetpack_Boost_Active_Conditional::class )->is_met() : false,
936935
'isJetpackBoostNotPremium' => ( $is_block_editor ) ? YoastSEO()->classes->get( Jetpack_Boost_Not_Premium_Conditional::class )->is_met() : false,
937936
'isWooCommerceActive' => $woocommerce_active,

‎admin/taxonomy/class-taxonomy-columns.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@ public function add_columns( array $columns ) {
8484
$new_columns[ $column_name ] = $column_value;
8585

8686
if ( $column_name === 'description' && $this->analysis_seo->is_enabled() ) {
87-
$new_columns['wpseo-score'] = '<span class="yoast-tooltip yoast-tooltip-n yoast-tooltip-alt" data-label="' . esc_attr__( 'SEO score', 'wordpress-seo' ) . '"><span class="yoast-column-seo-score yoast-column-header-has-tooltip"><span class="screen-reader-text">' . __( 'SEO score', 'wordpress-seo' ) . '</span></span></span>';
87+
$new_columns['wpseo-score'] = '<span class="yoast-tooltip yoast-tooltip-n yoast-tooltip-alt" data-label="' . esc_attr__( 'SEO score', 'wordpress-seo' ) . '"><span class="yoast-column-seo-score yoast-column-header-has-tooltip"><span class="screen-reader-text">' .
88+
__( 'SEO score', 'wordpress-seo' ) . '</span></span></span>';
8889
}
8990

9091
if ( $column_name === 'description' && $this->analysis_readability->is_enabled() ) {
91-
$new_columns['wpseo-score-readability'] = '<span class="yoast-tooltip yoast-tooltip-n yoast-tooltip-alt" data-label="' . esc_attr__( 'Readability score', 'wordpress-seo' ) . '"><span class="yoast-column-readability yoast-column-header-has-tooltip"><span class="screen-reader-text">' . __( 'Readability score', 'wordpress-seo' ) . '</span></span></span>';
92+
$new_columns['wpseo-score-readability'] = '<span class="yoast-tooltip yoast-tooltip-n yoast-tooltip-alt" data-label="' . esc_attr__( 'Readability score', 'wordpress-seo' ) . '"><span class="yoast-column-readability yoast-column-header-has-tooltip"><span class="screen-reader-text">' .
93+
__( 'Readability score', 'wordpress-seo' ) . '</span></span></span>';
9294
}
9395
}
9496

‎admin/taxonomy/class-taxonomy.php

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ public function admin_enqueue_scripts() {
163163
'recommended_replace_vars' => $this->get_recommended_replace_vars(),
164164
'scope' => $this->determine_scope(),
165165
],
166+
'shortcodes' => [
167+
'wpseo_shortcode_tags' => $this->get_valid_shortcode_tags(),
168+
],
166169
],
167170
'worker' => [
168171
'url' => YoastSEO()->helpers->asset->get_asset_url( 'yoast-seo-analysis-worker' ),
@@ -209,16 +212,16 @@ public function update_term( $term_id, $tt_id, $taxonomy ) {
209212
foreach ( WPSEO_Taxonomy_Meta::$defaults_per_term as $key => $default ) {
210213
// phpcs:ignore WordPress.Security.NonceVerification.Missing -- Reason: Nonce is already checked by WordPress before executing this action.
211214
if ( isset( $_POST[ $key ] ) && is_string( $_POST[ $key ] ) ) {
212-
// phpcs:ignore WordPress.Security.NonceVerification.Missing -- Reason: Nonce is already checked by WordPress before executing this action.
213-
$new_meta_data[ $key ] = sanitize_text_field( wp_unslash( $_POST[ $key ] ) );
215+
// phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Reason: $data is getting sanitized later.
216+
$data = \wp_unslash( $_POST[ $key ] );
217+
$new_meta_data[ $key ] = ( $key !== 'wpseo_canonical' ) ? WPSEO_Utils::sanitize_text_field( $data ) : WPSEO_Utils::sanitize_url( $data );
214218
}
215219

216220
// If analysis is disabled remove that analysis score value from the DB.
217221
if ( $this->is_meta_value_disabled( $key ) ) {
218222
$new_meta_data[ $key ] = '';
219223
}
220224
}
221-
unset( $key, $default );
222225

223226
// Saving the values.
224227
WPSEO_Taxonomy_Meta::set_values( $term_id, $taxonomy, $new_meta_data );
@@ -446,4 +449,19 @@ private function get_recommended_replace_vars() {
446449

447450
return $recommended_replace_vars->get_recommended_replacevars_for( $page_type );
448451
}
452+
453+
/**
454+
* Returns an array with shortcode tags for all registered shortcodes.
455+
*
456+
* @return array
457+
*/
458+
private function get_valid_shortcode_tags() {
459+
$shortcode_tags = [];
460+
461+
foreach ( $GLOBALS['shortcode_tags'] as $tag => $description ) {
462+
$shortcode_tags[] = $tag;
463+
}
464+
465+
return $shortcode_tags;
466+
}
449467
}

‎admin/tracking/class-tracking-settings-data.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ class WPSEO_Tracking_Settings_Data implements WPSEO_Collection {
231231
'deny_search_crawling',
232232
'deny_wp_json_crawling',
233233
'deny_adsbot_crawling',
234+
'deny_ccbot_crawling',
235+
'deny_google_extended_crawling',
236+
'deny_gptbot_crawling',
234237
'last_known_no_unindexed',
235238
];
236239

‎admin/views/js-templates-primary-term.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<script type="text/html" id="tmpl-primary-term-ui">
1616
<?php
17-
/* translators: accessibility text. %1$s expands to the term title, %2$s to the taxonomy title. */
17+
/* translators: Hidden accessibility text; %1$s expands to the term title, %2$s to the taxonomy title. */
1818
$yoast_free_js_button_label = __( 'Make %1$s primary %2$s', 'wordpress-seo' );
1919
$yoast_free_js_button_label = sprintf(
2020
$yoast_free_js_button_label,

0 commit comments

Comments
 (0)