Merged in feature/MAW-855-import-code-into-aws (pull request #2)
code import from pantheon * code import from pantheon
This commit is contained in:
@@ -10,6 +10,7 @@ use Yoast\WP\SEO\Helpers\Score_Icon_Helper;
|
||||
use Yoast\WP\SEO\Integrations\Support_Integration;
|
||||
use Yoast\WP\SEO\Models\Indexable;
|
||||
use Yoast\WP\SEO\Presenters\Admin\Premium_Badge_Presenter;
|
||||
use Yoast\WP\SEO\Promotions\Application\Promotion_Manager;
|
||||
use Yoast\WP\SEO\Repositories\Indexable_Repository;
|
||||
|
||||
/**
|
||||
@@ -156,6 +157,7 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
if ( is_null( $this->is_seo_enabled ) ) {
|
||||
$this->is_seo_enabled = ( new WPSEO_Metabox_Analysis_SEO() )->is_enabled();
|
||||
}
|
||||
|
||||
return $this->is_seo_enabled;
|
||||
}
|
||||
|
||||
@@ -168,6 +170,7 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
if ( is_null( $this->is_readability_enabled ) ) {
|
||||
$this->is_readability_enabled = ( new WPSEO_Metabox_Analysis_Readability() )->is_enabled();
|
||||
}
|
||||
|
||||
return $this->is_readability_enabled;
|
||||
}
|
||||
|
||||
@@ -180,6 +183,7 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
if ( is_null( $this->current_indexable ) ) {
|
||||
$this->current_indexable = $this->indexable_repository->for_current_page();
|
||||
}
|
||||
|
||||
return $this->current_indexable;
|
||||
}
|
||||
|
||||
@@ -237,7 +241,8 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
[
|
||||
'parent' => self::MENU_IDENTIFIER,
|
||||
'id' => 'wpseo-seo-score',
|
||||
'title' => __( 'SEO score', 'wordpress-seo' ) . ': ' . $this->score_icon_helper->for_seo( $indexable, 'adminbar-sub-menu-score' )->present(),
|
||||
'title' => __( 'SEO score', 'wordpress-seo' ) . ': ' . $this->score_icon_helper->for_seo( $indexable, 'adminbar-sub-menu-score' )
|
||||
->present(),
|
||||
'meta' => [ 'tabindex' => '0' ],
|
||||
]
|
||||
);
|
||||
@@ -248,7 +253,8 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
[
|
||||
'parent' => self::MENU_IDENTIFIER,
|
||||
'id' => 'wpseo-readability-score',
|
||||
'title' => __( 'Readability', 'wordpress-seo' ) . ': ' . $this->score_icon_helper->for_readability( $indexable->readability_score, 'adminbar-sub-menu-score' )->present(),
|
||||
'title' => __( 'Readability', 'wordpress-seo' ) . ': ' . $this->score_icon_helper->for_readability( $indexable->readability_score, 'adminbar-sub-menu-score' )
|
||||
->present(),
|
||||
'meta' => [ 'tabindex' => '0' ],
|
||||
]
|
||||
);
|
||||
@@ -585,15 +591,23 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
* @return void
|
||||
*/
|
||||
protected function add_premium_link( WP_Admin_Bar $wp_admin_bar ) {
|
||||
$sale_percentage = '';
|
||||
if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) {
|
||||
$sale_percentage = sprintf(
|
||||
'<span class="admin-bar-premium-promotion">%1$s</span>',
|
||||
__( '-30%', 'wordpress-seo' )
|
||||
);
|
||||
}
|
||||
$wp_admin_bar->add_menu(
|
||||
[
|
||||
'parent' => self::MENU_IDENTIFIER,
|
||||
'id' => 'wpseo-get-premium',
|
||||
// Circumvent an issue in the WP admin bar API in order to pass `data` attributes. See https://core.trac.wordpress.org/ticket/38636.
|
||||
'title' => sprintf(
|
||||
'<a href="%1$s" target="_blank" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2" style="padding:0;">%2$s »</a>',
|
||||
'<a href="%1$s" target="_blank" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2" style="padding:0;">%2$s » %3$s</a>',
|
||||
$this->shortlinker->build_shortlink( 'https://yoa.st/admin-bar-get-premium' ),
|
||||
__( 'Get Yoast SEO Premium', 'wordpress-seo' )
|
||||
__( 'Get Yoast SEO Premium', 'wordpress-seo' ),
|
||||
$sale_percentage
|
||||
),
|
||||
'meta' => [
|
||||
'tabindex' => '0',
|
||||
@@ -850,7 +864,7 @@ class WPSEO_Admin_Bar_Menu implements WPSEO_WordPress_Integration {
|
||||
return '';
|
||||
}
|
||||
|
||||
/* translators: %s: number of notifications */
|
||||
/* translators: Hidden accessibility text; %s: number of notifications. */
|
||||
$counter_screen_reader_text = sprintf( _n( '%s notification', '%s notifications', $notification_count, 'wordpress-seo' ), number_format_i18n( $notification_count ) );
|
||||
|
||||
return sprintf( ' <div class="wp-core-ui wp-ui-notification yoast-issue-counter"><span class="yoast-issues-count" aria-hidden="true">%d</span><span class="screen-reader-text">%s</span></div>', $notification_count, $counter_screen_reader_text );
|
||||
|
||||
Reference in New Issue
Block a user