",{id:e.id,class:"cooked-timer-block "+o}),l("",{class:"cooked-timer-step",text:e.step}).appendTo(o),l("",{class:"cooked-timer-desc",text:e.desc}).appendTo(o),l("
",{class:"cooked-timer-obj","data-seconds-left":e.seconds}).appendTo(o),l("",{class:"cooked-icon cooked-icon-times"}).appendTo(o),e=l("
",{class:"cooked-progress"});return l("").appendTo(e),e.appendTo(o),o}function n(o,e){var s=cooked_js_vars.timer_sound,c=new Audio(s),i=o.parents(".cooked-timer-block").attr("id"),d=o.data("seconds-left"),t=o.parents(".cooked-timer-block");o.startTimer({classNames:{hours:"cooked-timer-hours",minutes:"cooked-timer-minutes",seconds:"cooked-timer-seconds",clearDiv:"cooked-timer-clearDiv",timeout:"cooked-timer-timeout"},onComplete:function(){c.play(),o.addClass("cooked-timer-complete")}}),o.prepend(''),e&&(o.trigger("pause"),t.addClass("cooked-paused"),t.find("i.cooked-icon-pause").hide(),t.find("i.cooked-icon-play").css({display:"inline-block"}),t.addClass("cooked-paused"),l(this).parent().find("i.cooked-icon-play").css({display:"inline-block"})),r(t,10,10),o.on("update",function(e,o){r(t,o,d)}),o.on("complete",function(e,o){c.play(),t.find("i.cooked-icon-pause").hide(),t.find("i.cooked-icon-play").hide(),t.find(".cooked-timer-seconds").html("00")}),o.on("click","i.cooked-icon-pause",function(e){e.preventDefault(),l(this).hide(),t.addClass("cooked-paused"),l(this).parent().find("i.cooked-icon-play").css({display:"inline-block"}),o.trigger("pause")}),o.on("click","i.cooked-icon-play",function(e){e.preventDefault(),l(this).hide(),t.removeClass("cooked-paused cooked-complete"),l(this).parent().find("i.cooked-icon-pause").css({display:"inline-block"}),o.trigger("resume")}),o.on("click","i.cooked-icon-reverse",function(e){e.preventDefault(),t.removeClass("cooked-paused cooked-complete"),l(this).parent().find("i.cooked-icon-play").css({display:"inline-block"}),l(this).parent().find("i.cooked-icon-pause").hide(),o.remove(),l("#"+i).append(''),n(l("#"+i).find(".cooked-timer-obj"),!0)}),t.on("click","i.cooked-icon-times",function(e){var o;e.preventDefault(),1==l("#cooked-timers-wrap").find(".cooked-timer-block").length?l("#cooked-timers-wrap").removeClass("cooked-visible"):(o=7.5*(e=l("#cooked-timers-wrap").find(".cooked-timer-block").length-1),l("#cooked-timers-wrap").css({height:o+"em"}),t.removeClass("cooked-visible"),e==a&&l("#cooked-timers-wrap").removeClass("cooked-multiples")),setTimeout(function(){t.remove()},200)})}function r(e,o,s){o=100-o/s*100;e.find(".cooked-progress > span").css({width:o+"%"}),100<=o&&e.addClass("cooked-complete")}l(".cooked-servings").length&&l(".cooked-servings").find("select").on("change",function(e){e.preventDefault();var e=l(this).children("option:selected").val(),o=new URL(window.location.href);o.searchParams.set("servings",e),window.location.href=o.toString()}),$_Cooked_Recipe_Search.length&&(l("body").on("click",function(e){var o=!1;0{var o;e.value&&(o=encodeURIComponent(e.prefix),e=encodeURIComponent(e.value),s.push(o+"/"+e))}),e.search&&s.push("search/"+encodeURIComponent(e.search)),s.push("sort/"+encodeURIComponent(e.sort));e=s.filter(Boolean).join("/"),e=(new URL(cooked_js_vars.site_url).pathname+"/"+e).replace(/\/+/g,"/");window.location.href=e}),$_Cooked_Timers.length&&(a=1,d($_Cooked_Timers)),$_Cooked_FSM_Button.length&&(i=new NoSleep,$_Cooked_FSM_Button.on("click",function(e){e.preventDefault();var e=l(this).data("recipe-id"),e=l('.cooked-fsm[data-recipe-id="'+e+'"]'),o=(l("body").addClass("cooked-noscroll cooked-fsm-active"),e.clone().appendTo("body")),e=(setTimeout(function(){o.addClass("cooked-visible")},10),setTimeout(function(){o.addClass("cooked-active")},50),o.find(".cooked-timer > a")),s=o.find(".cooked-ingredient-checkbox");d(e),c(s),i.enable(),o.on("click",".cooked-close-fsm",function(e){e.preventDefault(),o.removeClass("cooked-active"),l("body").removeClass("cooked-noscroll cooked-fsm-active"),i.disable(),setTimeout(function(){o.remove()},350)})}),l("body").on("click",".cooked-fsm-mobile-nav > a",function(e){e.preventDefault();var e=l(this),o=e.data("nav-id"),s=e.parents(".cooked-fsm");s.find(".cooked-fsm-mobile-nav > a").removeClass("cooked-active"),s.find(".cooked-fsm-content").removeClass("cooked-active"),e.addClass("cooked-active"),("ingredients"==o?s.find(".cooked-fsm-content.cooked-fsm-ingredients"):(s.find(".cooked-fsm-content.cooked-fsm-directions-wrap").addClass("cooked-active"),s.find(".cooked-fsm-content.cooked-fsm-directions").addClass("cooked-active"),s.find(".cooked-fsm-content.cooked-fsm-notes"))).addClass("cooked-active")}))})})(jQuery);
\ No newline at end of file
+var cooked_loading=!1;(k=>{$_Cooked_Ingredient_Boxes=k(".cooked-ingredient-checkbox"),$_Cooked_Fotorama=k(".cooked-recipe-gallery"),$_Cooked_Ajax_List=k(".cooked-recipe-loader"),$_Cooked_Recipe_Search=k(".cooked-recipe-search"),$_Cooked_Timers=k(".cooked-timer > a"),$_Cooked_FSM_Button=k(".cooked-fsm-button"),$_Cooked_Fotorama.length&&$_Cooked_Fotorama.on("fotorama:ready",function(e,o){setTimeout(function(){$_Cooked_Fotorama.addClass("cooked-gallery-loaded")},100)}),k(document).ready(function(){$_Cooked_Fotorama.length&&$_Cooked_Fotorama.fotorama();{function c(e){e.on("click",function(e){var o=k(this);o.hasClass("cooked-checked")?(o.parent().removeClass("cooked-checked"),o.removeClass("cooked-checked")):(o.parent().addClass("cooked-checked"),o.addClass("cooked-checked"))})}$_Cooked_Ingredient_Boxes.length&&c($_Cooked_Ingredient_Boxes)}var n,i;function d(e){e.on("click",function(e){e.preventDefault();var o,s,e=k(this),c="cookedTimer-"+e.data("timer-id"),i=k("#cooked-timers-wrap").find(".cooked-timer-block").length;k("div#"+c).length?(k("div#"+c).css({background:"#eeeeee"}),setTimeout(function(){k("div#"+c).css({background:""})},200)):4==i?(k("#cooked-timers-wrap").css({transform:"translate3d(0,0.5em,0)"}),setTimeout(function(){k("#cooked-timers-wrap").css({transform:""})},200)):(o=7.5*(i+=1),s=e.parents(".cooked-single-direction").length?e.parents(".cooked-single-direction").data("step"):cooked_functions_i18n_js_vars.i18n_timer,s={id:c,seconds:e.data("seconds"),step:s,desc:e.data("desc")},k("#cooked-timers-wrap").length?(e=1==i?" cooked-visible":"",n",{id:"cooked-timers-wrap"}),i=t(s),e.append(i),k("body").append(e),a(k("#"+s.id).find(".cooked-timer-obj"),!1),setTimeout(function(){k("#cooked-timers-wrap").addClass("cooked-visible")},50)))})}function t(e,o="cooked-visible"){o=k("
",{id:e.id,class:"cooked-timer-block "+o}),k("",{class:"cooked-timer-step",text:e.step}).appendTo(o),k("",{class:"cooked-timer-desc",text:e.desc}).appendTo(o),k("
",{class:"cooked-timer-obj","data-seconds-left":e.seconds}).appendTo(o),k("",{class:"cooked-icon cooked-icon-times"}).appendTo(o),e=k("
",{class:"cooked-progress"});return k("").appendTo(e),e.appendTo(o),o}function a(o,e){var s=cooked_functions_js_vars.timer_sound,c=new Audio(s),i=o.parents(".cooked-timer-block").attr("id"),d=o.data("seconds-left"),t=o.parents(".cooked-timer-block");o.startTimer({classNames:{hours:"cooked-timer-hours",minutes:"cooked-timer-minutes",seconds:"cooked-timer-seconds",clearDiv:"cooked-timer-clearDiv",timeout:"cooked-timer-timeout"},onComplete:function(){c.play(),o.addClass("cooked-timer-complete")}}),o.prepend(''),e&&(o.trigger("pause"),t.addClass("cooked-paused"),t.find("i.cooked-icon-pause").hide(),t.find("i.cooked-icon-play").css({display:"inline-block"}),t.addClass("cooked-paused"),k(this).parent().find("i.cooked-icon-play").css({display:"inline-block"})),r(t,10,10),o.on("update",function(e,o){r(t,o,d)}),o.on("complete",function(e,o){c.play(),t.find("i.cooked-icon-pause").hide(),t.find("i.cooked-icon-play").hide(),t.find(".cooked-timer-seconds").html("00")}),o.on("click","i.cooked-icon-pause",function(e){e.preventDefault(),k(this).hide(),t.addClass("cooked-paused"),k(this).parent().find("i.cooked-icon-play").css({display:"inline-block"}),o.trigger("pause")}),o.on("click","i.cooked-icon-play",function(e){e.preventDefault(),k(this).hide(),t.removeClass("cooked-paused cooked-complete"),k(this).parent().find("i.cooked-icon-pause").css({display:"inline-block"}),o.trigger("resume")}),o.on("click","i.cooked-icon-reverse",function(e){e.preventDefault(),t.removeClass("cooked-paused cooked-complete"),k(this).parent().find("i.cooked-icon-play").css({display:"inline-block"}),k(this).parent().find("i.cooked-icon-pause").hide(),o.remove(),k("#"+i).append(''),a(k("#"+i).find(".cooked-timer-obj"),!0)}),t.on("click","i.cooked-icon-times",function(e){var o;e.preventDefault(),1==k("#cooked-timers-wrap").find(".cooked-timer-block").length?k("#cooked-timers-wrap").removeClass("cooked-visible"):(o=7.5*(e=k("#cooked-timers-wrap").find(".cooked-timer-block").length-1),k("#cooked-timers-wrap").css({height:o+"em"}),t.removeClass("cooked-visible"),e==n&&k("#cooked-timers-wrap").removeClass("cooked-multiples")),setTimeout(function(){t.remove()},200)})}function r(e,o,s){o=100-o/s*100;e.find(".cooked-progress > span").css({width:o+"%"}),100<=o&&e.addClass("cooked-complete")}k(".cooked-servings").length&&k(".cooked-servings").find("select").on("change",function(e){e.preventDefault();var e=k(this).children("option:selected").val(),o=new URL(window.location.href);o.searchParams.set("servings",e),window.location.href=o.toString()}),$_Cooked_Recipe_Search.length&&(k("body").on("click",function(e){var o=!1;0{var o;e.value&&(o=encodeURIComponent(e.prefix),e=encodeURIComponent(e.value),s.push(o+"/"+e))}),e.search&&s.push("search/"+encodeURIComponent(e.search)),s.push("sort/"+encodeURIComponent(e.sort));e=s.filter(Boolean).join("/"),e=(new URL(cooked_functions_js_vars.site_url).pathname+"/"+e).replace(/\/+/g,"/");window.location.href=e}),$_Cooked_Timers.length&&(n=1,d($_Cooked_Timers)),$_Cooked_FSM_Button.length&&(i=new NoSleep,$_Cooked_FSM_Button.on("click",function(e){e.preventDefault();var e=k(this).data("recipe-id"),e=k('.cooked-fsm[data-recipe-id="'+e+'"]'),o=(k("body").addClass("cooked-noscroll cooked-fsm-active"),e.clone().appendTo("body")),e=(setTimeout(function(){o.addClass("cooked-visible")},10),setTimeout(function(){o.addClass("cooked-active")},50),o.find(".cooked-timer > a")),s=o.find(".cooked-ingredient-checkbox");d(e),c(s),i.enable(),o.on("click",".cooked-close-fsm",function(e){e.preventDefault(),o.removeClass("cooked-active"),k("body").removeClass("cooked-noscroll cooked-fsm-active"),i.disable(),setTimeout(function(){o.remove()},350)})}),k("body").on("click",".cooked-fsm-mobile-nav > a",function(e){e.preventDefault();var e=k(this),o=e.data("nav-id"),s=e.parents(".cooked-fsm");s.find(".cooked-fsm-mobile-nav > a").removeClass("cooked-active"),s.find(".cooked-fsm-content").removeClass("cooked-active"),e.addClass("cooked-active"),("ingredients"==o?s.find(".cooked-fsm-content.cooked-fsm-ingredients"):(s.find(".cooked-fsm-content.cooked-fsm-directions-wrap").addClass("cooked-active"),s.find(".cooked-fsm-content.cooked-fsm-directions").addClass("cooked-active"),s.find(".cooked-fsm-content.cooked-fsm-notes"))).addClass("cooked-active")}))})})(jQuery);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index e0edf12..c6e1428 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
"recipe"
],
"homepage": "https://wordpress.org/plugins/cooked/",
- "version": "1.10.0",
+ "version": "1.11.0",
"type": "wordpress-plugin",
"license": "GPL-3.0-or-later",
"prefer-stable": true,
diff --git a/composer.lock b/composer.lock
index d1e0154..6d8ed34 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "5750fafddc7187a442992f3d3fc2e4cc",
+ "content-hash": "049658186415a78044c1e92fb33fc35a",
"packages": [
{
"name": "nxp/math-executor",
diff --git a/cooked.php b/cooked.php
index f2b7e21..2d5aa69 100644
--- a/cooked.php
+++ b/cooked.php
@@ -4,9 +4,9 @@
Plugin Name: Cooked - Recipe Management
Plugin URI: https://wordpress.org/plugins/cooked/
Description: A recipe plugin for WordPress.
-Author: Gora Tech
+Author: Gora Tech
Author URI: https://goratech.dev
-Version: 1.10.0
+Version: 1.11.0
Text Domain: cooked
Domain Path: languages
License: GPL2
@@ -30,7 +30,7 @@
require_once __DIR__ . '/vendor/autoload.php';
-define( 'COOKED_VERSION', '1.10.0' );
+define( 'COOKED_VERSION', '1.11.0' );
define( 'COOKED_DEV', false );
if ( ! class_exists( 'Cooked_Plugin' ) ) :
@@ -229,6 +229,7 @@ public static function instance() {
self::$instance->setup_constants();
add_action( 'init', [self::$instance, 'load_textdomain'] );
+ add_action( 'plugins_loaded', [self::$instance, 'check_plugin_update'] );
self::$instance->includes();
self::$instance->roles = new Cooked_Roles();
@@ -329,6 +330,23 @@ public function initialize_plugin_support() {
}
}
+ /**
+ * Check for plugin updates and run migrations if needed
+ *
+ * @since 1.10.0
+ */
+ public function check_plugin_update() {
+ $current_version = get_option('cooked_version', '0');
+
+ if (version_compare($current_version, COOKED_VERSION, '<')) {
+ // Run migrations
+ $this->migration->init();
+
+ // Update version in database
+ update_option('cooked_version', COOKED_VERSION);
+ }
+ }
+
/**
* Throw error on object clone.
*
diff --git a/includes/class.cooked-admin-enqueues.php b/includes/class.cooked-admin-enqueues.php
index ec4367a..dd611fe 100644
--- a/includes/class.cooked-admin-enqueues.php
+++ b/includes/class.cooked-admin-enqueues.php
@@ -124,10 +124,10 @@ public function admin_enqueues( $hook ) {
wp_enqueue_script( 'cooked-vue', COOKED_URL . 'assets/admin/js/vue/vue' . $min . '.js', [], COOKED_VERSION, false );
$wp_editor_roles_allowed = false;
- if (is_user_logged_in()) {
+ if ( is_user_logged_in() ) {
$user = wp_get_current_user();
- $user_role = $user->roles[0];
- $wp_editor_roles_allowed = isset( $_cooked_settings['recipe_wp_editor_roles'] ) && in_array( $user_role, $_cooked_settings['recipe_wp_editor_roles'] ) ? true : false;
+ $user_roles = $user->roles;
+ $wp_editor_roles_allowed = isset( $_cooked_settings['recipe_wp_editor_roles'] ) && ! empty( array_intersect( $user_roles, $_cooked_settings['recipe_wp_editor_roles'] ) ) ? true : false;
}
$cooked_js_vars = [
@@ -163,8 +163,8 @@ public function admin_enqueues( $hook ) {
wp_enqueue_style('cooked-tooltipster-theme', COOKED_URL . 'assets/admin/css/tooltipster/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-cooked' . $min . '.css', [], COOKED_VERSION, 'screen' );
// Cooked Admin Script
- wp_localize_script('cooked-functions', 'cooked_js_vars', $cooked_js_vars );
- wp_localize_script('cooked-migration', 'cooked_js_vars', $cooked_js_vars );
+ wp_localize_script('cooked-functions', 'cooked_functions_js_vars', $cooked_js_vars );
+ wp_localize_script('cooked-migration', 'cooked_migration_js_vars', $cooked_js_vars );
wp_enqueue_script('cooked-functions');
wp_enqueue_script('cooked-migration');
endif;
diff --git a/includes/class.cooked-enqueues.php b/includes/class.cooked-enqueues.php
index 4e9f681..6967a64 100644
--- a/includes/class.cooked-enqueues.php
+++ b/includes/class.cooked-enqueues.php
@@ -36,9 +36,10 @@ public function enqueues($hook) {
$cooked_js_vars = [
'ajax_url' => admin_url('admin-ajax.php'),
'timer_sound' => apply_filters('cooked_timer_sound_mp3', COOKED_URL . 'assets/audio/ding.mp3'),
- 'i18n_timer' => __('Timer', 'cooked'),
'permalink_structure' => get_option('permalink_structure'),
'site_url' => get_site_url(),
+ 'browse_page' => $browse_page_id,
+ 'front_page' => get_option( 'page_on_front' ),
'browse_recipes_slug' => $browse_recipes_slug,
'recipe_category_slug' => !isset($_cooked_settings['recipe_category_permalink']) ? 'recipe-category' : $_cooked_settings['recipe_category_permalink'],
'recipe_cooking_method_slug' => !isset($_cooked_settings['recipe_cooking_method_permalink']) ? 'cooking-method' : $_cooked_settings['recipe_cooking_method_permalink'],
@@ -47,6 +48,10 @@ public function enqueues($hook) {
'recipe_diet_slug' => !isset($_cooked_settings['recipe_diet_permalink']) ? 'diet' : $_cooked_settings['recipe_diet_permalink'],
];
+ $cooked_i18n_js_vars = [
+ 'i18n_timer' => __('Timer', 'cooked'),
+ ];
+
$min = COOKED_DEV ? '' : '.min';
wp_enqueue_style('cooked-essentials', COOKED_URL . 'assets/admin/css/essentials' . $min . '.css', [], COOKED_VERSION);
@@ -64,7 +69,8 @@ public function enqueues($hook) {
wp_enqueue_script('wp-sanitize');
wp_register_script('cooked-functions', COOKED_URL . 'assets/js/cooked-functions' . $min . '.js', ['jquery', 'wp-sanitize'], COOKED_VERSION);
- wp_localize_script('cooked-functions', 'cooked_js_vars', $cooked_js_vars);
+ wp_localize_script('cooked-functions', 'cooked_functions_i18n_js_vars', $cooked_i18n_js_vars);
+ wp_add_inline_script( 'cooked-functions', 'const cooked_functions_js_vars = ' . json_encode( $cooked_js_vars ) . ';', 'before' );
}
public function css_colors() {
diff --git a/includes/class.cooked-post-types.php b/includes/class.cooked-post-types.php
index 550f7ac..fd2dc6a 100644
--- a/includes/class.cooked-post-types.php
+++ b/includes/class.cooked-post-types.php
@@ -25,7 +25,6 @@ function __construct() {
add_action( 'init', [&$this, 'init'] );
add_filter( 'admin_init', [&$this, 'init_roles'] );
add_action( 'after_setup_theme', [&$this, 'image_sizes'] );
- // add_action( 'template_redirect', [&$this, 'redirects'] );
add_action( 'wp_head', [&$this, 'cooked_meta_tags'], 5 );
add_action( 'manage_cp_recipe_posts_custom_column', [&$this, 'custom_columns_data'], 10, 2 );
@@ -33,6 +32,7 @@ function __construct() {
add_filter( 'query_vars', [&$this, 'add_query_vars_filter'] );
add_filter( 'manage_cp_recipe_posts_columns', [&$this, 'custom_columns'] );
add_filter( 'nav_menu_css_class', [&$this, 'cooked_nav_classes'], 10, 2 );
+ add_filter( 'redirect_canonical', [&$this, 'disable_canonical_redirect'], 10, 2 );
// Taxonomy Titles
add_action( 'template_redirect', [&$this, 'remove_default_title_tag'] );
@@ -183,40 +183,6 @@ public function remove_default_title_tag() {
}
}
- public function redirects() {
- $_cooked_settings = Cooked_Settings::get();
- $parent_page = isset($_cooked_settings['browse_page']) && $_cooked_settings['browse_page'] ? $_cooked_settings['browse_page'] : false;
- $front_page = get_option( 'page_on_front' );
-
- if ( $parent_page ):
- if ( is_post_type_archive('cp_recipe') && !is_feed() ):
- if ( wp_redirect( get_permalink( $parent_page ) ) ):
- exit;
- endif;
- elseif ( is_tax('cp_recipe_category') ):
- global $wp_query;
- if ( isset($wp_query->query['cp_recipe_category']) && taxonomy_exists('cp_recipe_category') && term_exists( $wp_query->query['cp_recipe_category'], 'cp_recipe_category' )
- || isset($wp_query->query['taxonomy']) && $wp_query->query['taxonomy'] == 'cp_recipe_category' && taxonomy_exists('cp_recipe_category') && term_exists( $wp_query->query['term'], 'cp_recipe_category' ) ):
- if ( $parent_page != $front_page && get_option('permalink_structure') ):
- if ( wp_redirect( esc_url_raw( untrailingslashit( get_permalink( $parent_page ) ) . '/' . $_cooked_settings['recipe_category_permalink'] . '/' . ( isset( $wp_query->query['term'] ) ? $wp_query->query['term'] : $wp_query->query['cp_recipe_category'] ) ) ) ):
- exit;
- endif;
- elseif ( $parent_page == $front_page ):
- if ( wp_redirect( esc_url_raw( get_home_url() . '?cp_recipe_category=' . ( isset( $wp_query->query['term'] ) ? $wp_query->query['term'] : $wp_query->query['cp_recipe_category'] ) ) ) ):
- exit;
- endif;
- else:
- if ( wp_redirect( esc_url_raw( get_permalink( $parent_page ) . '&cp_recipe_category=' . ( isset( $wp_query->query['term'] ) ? $wp_query->query['term'] : $wp_query->query['cp_recipe_category'] ) ) ) ):
- exit;
- endif;
- endif;
- endif;
- else:
- do_action( 'cooked_redirects' );
- endif;
- endif;
- }
-
public static function activation() {
self::init();
self::init_roles();
@@ -302,6 +268,7 @@ public static function init() {
if ( !empty($_cooked_taxonomies) ) {
foreach ( $_cooked_taxonomies as $slug => $args ) {
register_taxonomy( $slug, ['cp_recipe'], $args );
+ add_rewrite_tag("%{$slug}%", '([^/]+)');
// Taxonomy search sort pagination
add_rewrite_rule(
@@ -513,4 +480,43 @@ public function add_display_post_states( $post_states, $post ) {
return $post_states;
}
+ /**
+ * Disable canonical redirects for Cooked URLs on the homepage
+ *
+ * @param string $redirect_url The redirect URL
+ * @param string $requested_url The originally requested URL
+ * @return string|bool The redirect URL or false to prevent redirect
+ */
+ public function disable_canonical_redirect($redirect_url, $requested_url) {
+ global $_cooked_settings;
+ $_cooked_taxonomies = Cooked_Taxonomies::get();
+
+ // Only process if this is the homepage
+ if (!is_front_page()) {
+ return $redirect_url;
+ }
+
+ // Check if any Cooked query vars are present
+ $cooked_query_vars = [
+ 'cooked_search_s',
+ 'cooked_browse_sort_by',
+ 'paged'
+ ];
+
+ // Add taxonomy query vars
+ if (!empty($_cooked_taxonomies)) {
+ foreach ( $_cooked_taxonomies as $slug => $args ) {
+ $cooked_query_vars[] = $slug;
+ }
+ }
+
+ foreach ($cooked_query_vars as $var) {
+ if (get_query_var($var)) {
+ return false;
+ }
+ }
+
+ return $redirect_url;
+ }
+
}
diff --git a/includes/class.cooked-recipe-meta.php b/includes/class.cooked-recipe-meta.php
index 3dcf727..ab1d9ac 100644
--- a/includes/class.cooked-recipe-meta.php
+++ b/includes/class.cooked-recipe-meta.php
@@ -28,10 +28,10 @@ public static function meta_cleanup( $recipe_settings ) {
$_recipe_settings = [];
$wp_editor_roles_allowed = false;
- if (is_user_logged_in()) {
+ if ( is_user_logged_in() ) {
$user = wp_get_current_user();
- $user_role = $user->roles[0];
- $wp_editor_roles_allowed = isset( $_cooked_settings['recipe_wp_editor_roles'] ) && in_array( $user_role, $_cooked_settings['recipe_wp_editor_roles'] ) ? true : false;
+ $user_roles = $user->roles;
+ $wp_editor_roles_allowed = isset( $_cooked_settings['recipe_wp_editor_roles'] ) && ! empty( array_intersect( $user_roles, $_cooked_settings['recipe_wp_editor_roles'] ) ) ? true : false;
}
if (!empty($recipe_settings)) {
@@ -251,10 +251,10 @@ function cooked_render_recipe_fields( $post_id ) {
$measurements = Cooked_Measurements::get();
$wp_editor_roles_allowed = false;
- if (is_user_logged_in()) {
+ if ( is_user_logged_in() ) {
$user = wp_get_current_user();
- $user_role = $user->roles[0];
- $wp_editor_roles_allowed = isset( $_cooked_settings['recipe_wp_editor_roles'] ) && in_array( $user_role, $_cooked_settings['recipe_wp_editor_roles'] ) ? true : false;
+ $user_roles = $user->roles;
+ $wp_editor_roles_allowed = isset( $_cooked_settings['recipe_wp_editor_roles'] ) && ! empty( array_intersect( $user_roles, $_cooked_settings['recipe_wp_editor_roles'] ) ) ? true : false;
}
/* $cooked_page_args = [
diff --git a/includes/class.cooked-recipes.php b/includes/class.cooked-recipes.php
index 95714e7..51c5f0c 100644
--- a/includes/class.cooked-recipes.php
+++ b/includes/class.cooked-recipes.php
@@ -319,7 +319,7 @@ public static function card( $rid, $width = false, $hide_image = false, $hide_ti
echo '';
endif;
@@ -632,14 +632,14 @@ public static function print_content() {
public static function fsm_content() {
return apply_filters( 'cooked_fsm_content', '
-
+
-
' . __('Ingredients', 'cooked') . '
[cooked-ingredients]
+ ';
diff --git a/includes/class.cooked-settings.php b/includes/class.cooked-settings.php
index 0baf070..cf52937 100644
--- a/includes/class.cooked-settings.php
+++ b/includes/class.cooked-settings.php
@@ -23,7 +23,10 @@ public function __construct() {
add_filter( 'admin_init', [&$this, 'init'] );
add_filter( 'init', [&$this, 'init'] );
add_action( 'save_post', [&$this, 'browse_page_saved'], 10, 1 );
- add_action( 'admin_notices', [&$this, 'cooked_settings_saved_admin_notice'] );
+ add_action( 'admin_notices', [ &$this, 'cooked_settings_saved_admin_notice' ] );
+
+ // Add action to check version and update settings at the end of page load
+ add_action( 'shutdown', [&$this, 'check_version_and_update'] );
}
public function browse_page_saved( $post_id ) {
@@ -45,7 +48,7 @@ public static function init() {
register_setting( 'cooked_settings_group', 'cooked_settings_saved' );
}
- // Add this new method to handle settings sanitization
+ // Add this new method to handle settings sanitization.
public static function sanitize_settings($settings) {
$cooked_tabs_fields = self::tabs_fields();
@@ -60,9 +63,13 @@ public static function sanitize_settings($settings) {
$settings[$field_name] = [];
} else {
// Remove any empty string values from checkbox arrays
- $settings[$field_name] = array_filter($settings[$field_name], function($value) {
- return $value !== '';
- });
+ if (!isset($settings[$field_name]) || !is_array($settings[$field_name])) {
+ $settings[$field_name] = [];
+ } else {
+ $settings[$field_name] = array_filter($settings[$field_name], function($value) {
+ return $value !== '';
+ });
+ }
}
}
}
@@ -89,50 +96,55 @@ public static function reset() {
}
public static function get() {
- $update_settings = false;
$_cooked_settings = get_option( 'cooked_settings' );
- $cooked_settings_saved = get_option( 'cooked_settings_saved', false );
- $_cooked_settings_version = get_option( 'cooked_settings_version', '1.0.0' );
-
- $version_compare = version_compare( $_cooked_settings_version, COOKED_VERSION );
// Get defaults for fields that are not set yet.
$cooked_tabs_fields = self::tabs_fields();
+
if ( isset($cooked_tabs_fields) && !empty($cooked_tabs_fields) ) {
foreach ( $cooked_tabs_fields as $tab ) {
if ( isset($tab['fields']) && !empty($tab['fields']) ) {
foreach ( $tab['fields'] as $name => $field ) {
if ( $field['type'] == 'nonce' || $field['type'] == 'misc_button' ) continue;
- if ( !$cooked_settings_saved || ( $cooked_settings_saved && $version_compare < 0 ) ) {
- if ( $field['type'] === 'checkboxes' ) {
- $_cooked_settings[$name] = isset($_cooked_settings[$name]) ? $_cooked_settings[$name] : ( isset( $field['default'] ) ? $field['default'] : [] );
- } else {
- $_cooked_settings[$name] = isset($_cooked_settings[$name]) ? $_cooked_settings[$name] : ( isset( $field['default'] ) ? $field['default'] : false );
- }
-
- // Update the settings only if the version has changed.
- $update_settings = true;
+ if ( $field['type'] === 'checkboxes' ) {
+ $_cooked_settings[$name] = isset($_cooked_settings[$name]) ? $_cooked_settings[$name] : ( isset( $field['default'] ) ? $field['default'] : [] );
+ } else {
+ $_cooked_settings[$name] = isset($_cooked_settings[$name]) ? $_cooked_settings[$name] : ( isset( $field['default'] ) ? $field['default'] : false );
}
}
}
}
-
}
- if ( $update_settings ) {
+ return apply_filters( 'cooked_get_settings', $_cooked_settings );
+ }
+
+ public static function check_version_and_update() {
+ global $_cooked_settings;
+
+ $cooked_settings_saved = get_option( 'cooked_settings_saved', false );
+ $_cooked_settings_version = get_option( 'cooked_settings_version', '1.0.0' );
+ $_cooked_pro_settings_version = get_option( 'cooked_pro_settings_version', '1.0.0' );
+
+ // Check both versions
+ $cooked_version_compare = version_compare( $_cooked_settings_version, COOKED_VERSION );
+ $cooked_pro_version_compare = defined('COOKED_PRO_VERSION') ? version_compare( $_cooked_pro_settings_version, COOKED_PRO_VERSION ) : 0;
+
+ // Update if either version has changed or settings haven't been saved before
+ if ( !$cooked_settings_saved || $cooked_version_compare < 0 || $cooked_pro_version_compare < 0 ) {
update_option( 'cooked_settings', $_cooked_settings );
+ // Update both version numbers
+ update_option( 'cooked_settings_version', COOKED_VERSION );
+ if ( defined('COOKED_PRO_VERSION') ) {
+ update_option( 'cooked_pro_settings_version', COOKED_PRO_VERSION );
+ }
+
if ( self::needs_rewrite_flush( $_cooked_settings_version ) ) {
flush_rewrite_rules();
}
}
-
- if ( $version_compare < 0 ) {
- update_option( 'cooked_settings_version', COOKED_VERSION );
- }
-
- return apply_filters( 'cooked_get_settings', $_cooked_settings );
}
private static function needs_rewrite_flush( $old_version ) {
@@ -218,7 +230,19 @@ public static function tabs_fields() {
'title' => __('Global Recipe Toggles', 'cooked'),
'desc' => __('You can quickly hide or show different recipe elements (site-wide) with these checkboxes.', 'cooked'),
'type' => 'checkboxes',
- 'default' => apply_filters('cooked_recipe_info_display_options_defaults', ['author', 'taxonomies', 'difficulty_level', 'excerpt', 'timing_prep', 'timing_cook', 'timing_total', 'servings']),
+ 'default' => apply_filters(
+ 'cooked_recipe_info_display_options_defaults',
+ [
+ 'author',
+ 'taxonomies',
+ 'difficulty_level',
+ 'excerpt',
+ 'timing_prep',
+ 'timing_cook',
+ 'timing_total',
+ 'servings'
+ ]
+ ),
'options' => apply_filters(
'cooked_recipe_info_display_options',
[
@@ -278,7 +302,7 @@ public static function tabs_fields() {
'browse_default_cp_recipe_category' => [
'title' => __('Default Category', 'cooked'),
/* translators: a description on how to set the default recipe category for the [cooked-browse] shortcode. */
- 'desc' => sprintf(__('Optionally set the default recipe category for your %s shortcode display.', 'cooked'), '[cooked-browse]'),
+ 'desc' => sprintf(__('Optionally set the default recipe category for your %s shortcode display.', 'cooked'), '';
+ echo '\n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-04-01T19:40:24-04:00\n"
+"POT-Creation-Date: 2025-06-03T13:28:52-04:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.11.0\n"
+"X-Generator: WP-CLI 2.12.0\n"
"X-Domain: cooked\n"
#. Plugin Name of the plugin
@@ -39,6 +39,11 @@ msgstr ""
msgid "https://goratech.dev"
msgstr ""
+#: cooked.php:283
+msgctxt "Page title"
+msgid "Browse Recipes"
+msgstr ""
+
#: includes/class.cooked-admin-enqueues.php:137
msgid "remaining"
msgstr ""
@@ -90,6 +95,7 @@ msgstr ""
#. translators: confirmation for migrating all ### recipes, where ### displays the total number for the migration.
#: includes/class.cooked-admin-enqueues.php:149
+#, php-format
msgid "Please confirm that you are ready to migrate all %s recipes."
msgstr ""
@@ -99,15 +105,15 @@ msgstr ""
#: includes/class.cooked-admin-menus.php:36
#: includes/class.cooked-admin-menus.php:59
-#: includes/class.cooked-post-types.php:454
-#: includes/class.cooked-post-types.php:466
-#: includes/class.cooked-users.php:125
+#: includes/class.cooked-post-types.php:421
+#: includes/class.cooked-post-types.php:433
+#: includes/class.cooked-users.php:144
msgid "Recipes"
msgstr ""
#: includes/class.cooked-admin-menus.php:37
#: includes/class.cooked-admin-menus.php:61
-#: includes/class.cooked-post-types.php:456
+#: includes/class.cooked-post-types.php:423
msgid "Add New"
msgstr ""
@@ -115,7 +121,7 @@ msgstr ""
#: includes/class.cooked-admin-menus.php:45
#: includes/class.cooked-admin-menus.php:65
#: includes/class.cooked-recipe-meta.php:94
-#: includes/class.cooked-shortcodes.php:148
+#: includes/class.cooked-shortcodes.php:149
#: templates/admin/welcome.php:18
msgid "Settings"
msgstr ""
@@ -134,7 +140,7 @@ msgid "Upgrade to Pro"
msgstr ""
#: includes/class.cooked-admin-menus.php:60
-#: includes/class.cooked-post-types.php:461
+#: includes/class.cooked-post-types.php:428
msgid "All Recipes"
msgstr ""
@@ -170,17 +176,19 @@ msgstr ""
msgid "Error importing recipe."
msgstr ""
-#: includes/class.cooked-enqueues.php:39
+#: includes/class.cooked-enqueues.php:52
#: includes/class.cooked-recipe-meta.php:1309
msgid "Timer"
msgstr ""
#. translators: a title for the "What's new in Cooked?" section.
#: includes/class.cooked-functions.php:96
+#, php-format
msgid "What's new in %s?"
msgstr ""
#: includes/class.cooked-functions.php:120
+#: includes/class.cooked-shortcodes.php:644
msgid "Print"
msgstr ""
@@ -198,7 +206,7 @@ msgstr ""
#: includes/class.cooked-functions.php:125
#: includes/class.cooked-recipe-meta.php:1254
-#: includes/class.cooked-settings.php:228
+#: includes/class.cooked-settings.php:253
msgid "Excerpt"
msgstr ""
@@ -209,8 +217,8 @@ msgstr ""
#: includes/class.cooked-functions.php:129
#: includes/class.cooked-recipe-meta.php:1278
#: includes/class.cooked-recipes.php:643
-#: includes/class.cooked-settings.php:229
-#: includes/class.cooked-shortcodes.php:760
+#: includes/class.cooked-settings.php:254
+#: includes/class.cooked-shortcodes.php:763
msgid "Notes"
msgstr ""
@@ -221,6 +229,7 @@ msgstr ""
#. translators: for displaying singular or plural versions depending on the number of recipes.
#: includes/class.cooked-import.php:42
+#, php-format
msgid "There is %1$s recipe that should be imported from %2$s."
msgid_plural "There are %1$s recipes that should be imported from %2$s."
msgstr[0] ""
@@ -292,7 +301,7 @@ msgid "Begin Import"
msgstr ""
#: includes/class.cooked-import.php:119
-#: includes/class.cooked-settings.php:584
+#: includes/class.cooked-settings.php:625
msgid "reload"
msgstr ""
@@ -588,7 +597,8 @@ msgid "cans"
msgstr ""
#: includes/class.cooked-measurements.php:202
-#: includes/class.cooked-settings.php:233
+#: includes/class.cooked-recipes.php:799
+#: includes/class.cooked-settings.php:258
msgid "Servings"
msgstr ""
@@ -764,6 +774,7 @@ msgstr ""
#: includes/class.cooked-measurements.php:703
#: includes/class.cooked-measurements.php:714
#: includes/class.cooked-measurements.php:732
+#, php-format
msgid "%d min"
msgstr ""
@@ -771,33 +782,39 @@ msgstr ""
#: includes/class.cooked-measurements.php:703
#: includes/class.cooked-measurements.php:714
#: includes/class.cooked-measurements.php:732
+#, php-format
msgid "%d mins"
msgstr ""
#. translators: singular and plural number of hours (shorthand)
#: includes/class.cooked-measurements.php:712
#: includes/class.cooked-measurements.php:730
+#, php-format
msgid "%d hr"
msgstr ""
#. translators: singular and plural number of hours (shorthand)
#: includes/class.cooked-measurements.php:712
#: includes/class.cooked-measurements.php:730
+#, php-format
msgid "%d hrs"
msgstr ""
#. translators: singular and plural number of days
#: includes/class.cooked-measurements.php:728
+#, php-format
msgid "%d day"
msgstr ""
#. translators: singular and plural number of days
#: includes/class.cooked-measurements.php:728
+#, php-format
msgid "%d days"
msgstr ""
#. translators: for displaying singular or plural versions depending on the number of recipes.
#: includes/class.cooked-migration.php:47
+#, php-format
msgid "There is %1$s recipe that should be migrated from %2$s to take advantage of new features and reliability."
msgid_plural "There are %1$s recipes that should be migrated from %2$s to take advantage of new features and reliability."
msgstr[0] ""
@@ -833,6 +850,7 @@ msgstr ""
#. translators: for displaying singular or plural versions depending on the number of recipes.
#: includes/class.cooked-migration.php:90
+#, php-format
msgid "There is %1$s recipe that is from an older version of Cooked. Please %2$s to migrate this recipe."
msgid_plural "There are %1$s recipes that are from an older version of Cooked. Please %2$s to migrate these recipes."
msgstr[0] ""
@@ -851,47 +869,47 @@ msgstr ""
msgid "Photo"
msgstr ""
-#: includes/class.cooked-post-types.php:436
+#: includes/class.cooked-post-types.php:403
msgid "Recipe Archive"
msgstr ""
-#: includes/class.cooked-post-types.php:455
+#: includes/class.cooked-post-types.php:422
msgid "Recipe"
msgstr ""
-#: includes/class.cooked-post-types.php:457
+#: includes/class.cooked-post-types.php:424
msgid "Add New Recipe"
msgstr ""
-#: includes/class.cooked-post-types.php:458
+#: includes/class.cooked-post-types.php:425
msgid "New Recipe"
msgstr ""
-#: includes/class.cooked-post-types.php:459
+#: includes/class.cooked-post-types.php:426
msgid "Edit Recipe"
msgstr ""
-#: includes/class.cooked-post-types.php:460
+#: includes/class.cooked-post-types.php:427
msgid "View Recipe"
msgstr ""
-#: includes/class.cooked-post-types.php:462
+#: includes/class.cooked-post-types.php:429
msgid "Search Recipes"
msgstr ""
-#: includes/class.cooked-post-types.php:463
+#: includes/class.cooked-post-types.php:430
msgid "No recipes found."
msgstr ""
-#: includes/class.cooked-post-types.php:464
+#: includes/class.cooked-post-types.php:431
msgid "No recipes found in trash."
msgstr ""
-#: includes/class.cooked-post-types.php:492
+#: includes/class.cooked-post-types.php:459
msgid "Recipe title ..."
msgstr ""
-#: includes/class.cooked-post-types.php:510
+#: includes/class.cooked-post-types.php:477
msgid "Cooked Browse Recipes Page"
msgstr ""
@@ -931,6 +949,7 @@ msgstr ""
#. translators: for displaying singular or plural versions depending on the number of recipes.
#: includes/class.cooked-recipe-meta.php:305
+#, php-format
msgid "It looks like this recipe is from a different version of %s. Please review and click \"Update\" to save it."
msgstr ""
@@ -987,15 +1006,15 @@ msgid "This description is used for SEO purposes and is optional. By default, Co
msgstr ""
#: includes/class.cooked-recipe-meta.php:380
-#: includes/class.cooked-settings.php:227
+#: includes/class.cooked-settings.php:252
msgid "Difficulty Level"
msgstr ""
#: includes/class.cooked-recipe-meta.php:389
#: includes/class.cooked-recipe-meta.php:1037
-#: includes/class.cooked-settings.php:230
-#: includes/class.cooked-shortcodes.php:447
-#: includes/class.cooked-shortcodes.php:656
+#: includes/class.cooked-settings.php:255
+#: includes/class.cooked-shortcodes.php:448
+#: includes/class.cooked-shortcodes.php:659
msgid "Prep Time"
msgstr ""
@@ -1007,18 +1026,18 @@ msgstr ""
#: includes/class.cooked-recipe-meta.php:394
#: includes/class.cooked-recipe-meta.php:1038
-#: includes/class.cooked-settings.php:231
-#: includes/class.cooked-shortcodes.php:448
-#: includes/class.cooked-shortcodes.php:665
+#: includes/class.cooked-settings.php:256
+#: includes/class.cooked-shortcodes.php:449
+#: includes/class.cooked-shortcodes.php:668
msgid "Cook Time"
msgstr ""
#: includes/class.cooked-recipe-meta.php:399
#: includes/class.cooked-recipe-meta.php:1039
-#: includes/class.cooked-settings.php:232
-#: includes/class.cooked-shortcodes.php:449
-#: includes/class.cooked-shortcodes.php:676
-#: includes/class.cooked-shortcodes.php:683
+#: includes/class.cooked-settings.php:257
+#: includes/class.cooked-shortcodes.php:450
+#: includes/class.cooked-shortcodes.php:679
+#: includes/class.cooked-shortcodes.php:686
msgid "Total Time"
msgstr ""
@@ -1080,27 +1099,27 @@ msgid "Nutrition Information"
msgstr ""
#: includes/class.cooked-recipe-meta.php:839
-#: includes/class.cooked-shortcodes.php:1045
+#: includes/class.cooked-shortcodes.php:1048
msgid "Nutrition Facts"
msgstr ""
#: includes/class.cooked-recipe-meta.php:857
-#: includes/class.cooked-shortcodes.php:1013
+#: includes/class.cooked-shortcodes.php:1016
msgid "Amount per serving"
msgstr ""
#: includes/class.cooked-recipe-meta.php:867
-#: includes/class.cooked-shortcodes.php:1023
+#: includes/class.cooked-shortcodes.php:1026
msgid "% Daily Value *"
msgstr ""
#: includes/class.cooked-recipe-meta.php:886
-#: includes/class.cooked-shortcodes.php:955
+#: includes/class.cooked-shortcodes.php:958
msgid "Includes"
msgstr ""
#: includes/class.cooked-recipe-meta.php:918
-#: includes/class.cooked-shortcodes.php:1049
+#: includes/class.cooked-shortcodes.php:1052
msgid "The % Daily Value (DV) tells you how much a nutrient in a serving of food contributes to a daily diet. 2,000 calories a day is used for general nutrition advice."
msgstr ""
@@ -1114,11 +1133,13 @@ msgstr ""
#. translators: a title for the video section of the recipe editor, where users can paste a YouToub or Vimeo URL into the field below.
#: includes/class.cooked-recipe-meta.php:961
+#, php-format
msgid "%1$s or %2$s Video"
msgstr ""
#. translators: a message describing how to display a video from YouTube or Vimeo.
#: includes/class.cooked-recipe-meta.php:965
+#, php-format
msgid "If you would like to display a video as the first item in your gallery, you can paste a valid %1$s or %2$s URL below."
msgstr ""
@@ -1138,6 +1159,7 @@ msgstr ""
#. translators: "left and right" section title
#: includes/class.cooked-recipe-meta.php:1011
#: includes/class.cooked-recipe-meta.php:1021
+#, php-format
msgid "\"%1$s\" and \"%2$s\""
msgstr ""
@@ -1162,15 +1184,15 @@ msgid "Available Variables"
msgstr ""
#: includes/class.cooked-recipe-meta.php:1036
-#: includes/class.cooked-settings.php:225
-#: includes/class.cooked-shortcodes.php:444
-#: includes/class.cooked-shortcodes.php:609
+#: includes/class.cooked-settings.php:250
+#: includes/class.cooked-shortcodes.php:445
+#: includes/class.cooked-shortcodes.php:612
msgid "Author"
msgstr ""
#: includes/class.cooked-recipe-meta.php:1040
-#: includes/class.cooked-shortcodes.php:445
-#: includes/class.cooked-shortcodes.php:620
+#: includes/class.cooked-shortcodes.php:446
+#: includes/class.cooked-shortcodes.php:623
msgid "Difficulty"
msgstr ""
@@ -1179,9 +1201,9 @@ msgid "Servings Switcher"
msgstr ""
#: includes/class.cooked-recipe-meta.php:1042
-#: includes/class.cooked-settings.php:226
-#: includes/class.cooked-shortcodes.php:703
+#: includes/class.cooked-settings.php:251
#: includes/class.cooked-shortcodes.php:706
+#: includes/class.cooked-shortcodes.php:709
#: includes/class.cooked-taxonomies.php:39
msgid "Category"
msgstr ""
@@ -1270,21 +1292,25 @@ msgstr ""
#. translators: related to the width of slideshows: "80% or 300px" section title
#: includes/class.cooked-recipe-meta.php:1223
+#, php-format
msgid "ex: \"%1$s\" or \"%2$s\""
msgstr ""
#. translators: related to the image ratio for slideshows: "ex: 800/600" section title
#: includes/class.cooked-recipe-meta.php:1228
+#, php-format
msgid "ex: \"%s\""
msgstr ""
#. translators: related to the navigation style for slideshows: "dots, thumbs or false" section title
#: includes/class.cooked-recipe-meta.php:1233
+#, php-format
msgid "\"%1$s\", \"%2$s\", or \"%3$s\""
msgstr ""
#. translators: related to allowing full screen for slideshows: "true or false" section title
#: includes/class.cooked-recipe-meta.php:1238
+#, php-format
msgid "\"%1$s\" or \"%2$s\""
msgstr ""
@@ -1314,6 +1340,7 @@ msgstr ""
#. translators: "seconds, minutes and hours" section title
#: includes/class.cooked-recipe-meta.php:1319
+#, php-format
msgid "\"%1$s\", \"%2$s\" and \"%3$s\""
msgstr ""
@@ -1346,11 +1373,13 @@ msgstr ""
#: includes/class.cooked-recipes.php:268
#: includes/class.cooked-recipes.php:322
#: templates/front/recipe-single.php:47
+#, php-format
msgid "By %s"
msgstr ""
#. translators: For showing "All" of a taxonomy (ex: "All Burgers")
#: includes/class.cooked-recipes.php:384
+#, php-format
msgid "All %s"
msgstr ""
@@ -1384,6 +1413,7 @@ msgstr ""
#. translators: singular and plural quarter "serving" size
#: includes/class.cooked-recipes.php:766
+#, php-format
msgid "Quarter (%s Serving)"
msgid_plural "Quarter (%s Servings)"
msgstr[0] ""
@@ -1391,6 +1421,7 @@ msgstr[1] ""
#. translators: singular and plural quarter "serving" size
#: includes/class.cooked-recipes.php:769
+#, php-format
msgid "Half (%s Serving)"
msgid_plural "Half (%s Servings)"
msgstr[0] ""
@@ -1398,6 +1429,7 @@ msgstr[1] ""
#. translators: singular and plural quarter "serving" size
#: includes/class.cooked-recipes.php:772
+#, php-format
msgid "Default (%s Serving)"
msgid_plural "Default (%s Servings)"
msgstr[0] ""
@@ -1405,72 +1437,80 @@ msgstr[1] ""
#. translators: singular and plural quarter "serving" size
#: includes/class.cooked-recipes.php:775
+#, php-format
msgid "Double (%s Servings)"
msgstr ""
#. translators: singular and plural quarter "serving" size
#: includes/class.cooked-recipes.php:778
+#, php-format
msgid "Triple (%s Servings)"
msgstr ""
#: includes/class.cooked-recipes.php:792
-#: includes/class.cooked-shortcodes.php:446
+#: includes/class.cooked-shortcodes.php:447
msgid "Yields"
msgstr ""
#. translators: singular and plural "serving" sizes
#: includes/class.cooked-recipes.php:796
-#: includes/class.cooked-recipes.php:806
+#: includes/class.cooked-recipes.php:807
+#, php-format
msgid "%s Serving"
msgid_plural "%s Servings"
msgstr[0] ""
msgstr[1] ""
#. translators: singular and plural "steps"
-#: includes/class.cooked-recipes.php:914
+#: includes/class.cooked-recipes.php:921
#: includes/class.cooked-seo.php:83
+#, php-format
msgid "Step %d"
msgstr ""
-#: includes/class.cooked-recipes.php:969
+#: includes/class.cooked-recipes.php:976
msgid "Browse"
msgstr ""
-#: includes/class.cooked-recipes.php:986
-#: includes/class.cooked-settings.php:166
+#: includes/class.cooked-recipes.php:993
+#: includes/class.cooked-settings.php:178
msgid "No categories"
msgstr ""
-#: includes/class.cooked-recipes.php:989
-#: includes/class.cooked-settings.php:213
+#: includes/class.cooked-recipes.php:996
+#: includes/class.cooked-settings.php:226
#: includes/class.cooked-taxonomies.php:38
#: includes/class.cooked-taxonomies.php:48
msgid "Categories"
msgstr ""
-#: includes/class.cooked-recipes.php:991
+#: includes/class.cooked-recipes.php:998
#: includes/class.cooked-taxonomies.php:41
#: includes/widgets/recipe-categories.php:48
msgid "All Categories"
msgstr ""
-#: includes/class.cooked-recipes.php:1061
+#: includes/class.cooked-recipes.php:1068
msgid "Find a recipe..."
msgstr ""
-#: includes/class.cooked-recipes.php:1076
+#: includes/class.cooked-recipes.php:1070
+msgid "Search"
+msgstr ""
+
+#: includes/class.cooked-recipes.php:1083
msgid "Newest first"
msgstr ""
-#: includes/class.cooked-recipes.php:1080
+#: includes/class.cooked-recipes.php:1087
msgid "Oldest first"
msgstr ""
-#: includes/class.cooked-recipes.php:1084
+#: includes/class.cooked-recipes.php:1091
msgid "Alphabetical (A-Z)"
msgstr ""
-#: includes/class.cooked-recipes.php:1088
+#: includes/class.cooked-recipes.php:1095
msgid "Alphabetical (Z-A)"
msgstr ""
@@ -1478,325 +1518,362 @@ msgstr ""
msgid "Recipe Editor"
msgstr ""
-#: includes/class.cooked-settings.php:80
+#: includes/class.cooked-settings.php:87
msgid "Cooked settings has been updated!"
msgstr ""
-#: includes/class.cooked-settings.php:165
-msgid "Choose a page..."
-msgstr ""
-
-#: includes/class.cooked-settings.php:165
-msgid "No pages"
-msgstr ""
-
-#: includes/class.cooked-settings.php:166
+#: includes/class.cooked-settings.php:178
msgid "No default"
msgstr ""
-#: includes/class.cooked-settings.php:186
+#: includes/class.cooked-settings.php:198
msgid "General"
msgstr ""
-#: includes/class.cooked-settings.php:190
+#: includes/class.cooked-settings.php:202
msgid "Browse/Search Recipes Page"
msgstr ""
#. translators: a description on how to add the [cooked-browse] shortcode to a page
-#: includes/class.cooked-settings.php:192
+#: includes/class.cooked-settings.php:204
+#, php-format
msgid "Create a page with the %s shortcode on it, then choose it from this dropdown."
msgstr ""
-#: includes/class.cooked-settings.php:198
+#: includes/class.cooked-settings.php:211
msgid "Recipes Per Page"
msgstr ""
#. translators: a description on how to choose the default number of recipes per page.
-#: includes/class.cooked-settings.php:200
+#: includes/class.cooked-settings.php:213
+#, php-format
msgid "Choose the default (set via the %s panel) or choose a different number here."
msgstr ""
#. translators: a description on how to choose the default number of recipes per page.
-#: includes/class.cooked-settings.php:200
+#: includes/class.cooked-settings.php:213
msgid "Settings > Reading"
msgstr ""
-#: includes/class.cooked-settings.php:206
+#: includes/class.cooked-settings.php:219
msgid "Recipe Taxonomies"
msgstr ""
-#: includes/class.cooked-settings.php:207
+#: includes/class.cooked-settings.php:220
msgid "Choose which taxonomies you want to enable for your recipes."
msgstr ""
-#: includes/class.cooked-settings.php:218
+#: includes/class.cooked-settings.php:231
msgid "Global Recipe Toggles"
msgstr ""
-#: includes/class.cooked-settings.php:219
+#: includes/class.cooked-settings.php:232
msgid "You can quickly hide or show different recipe elements (site-wide) with these checkboxes."
msgstr ""
-#: includes/class.cooked-settings.php:238
+#: includes/class.cooked-settings.php:263
msgid "Carbs Format"
msgstr ""
-#: includes/class.cooked-settings.php:239
+#: includes/class.cooked-settings.php:264
msgid "You can display carbs as \"Total\" or \"Net\"."
msgstr ""
-#: includes/class.cooked-settings.php:245
+#: includes/class.cooked-settings.php:270
msgid "Total Carbs"
msgstr ""
-#: includes/class.cooked-settings.php:246
+#: includes/class.cooked-settings.php:271
msgid "Net Carbs"
msgstr ""
-#: includes/class.cooked-settings.php:251
+#: includes/class.cooked-settings.php:276
msgid "Author Name Format"
msgstr ""
-#: includes/class.cooked-settings.php:252
+#: includes/class.cooked-settings.php:277
msgid "You can show the full author's name or just a part of it."
msgstr ""
-#: includes/class.cooked-settings.php:258
+#: includes/class.cooked-settings.php:283
msgid "Full name"
msgstr ""
-#: includes/class.cooked-settings.php:259
+#: includes/class.cooked-settings.php:284
msgid "Full first name w/last name initial"
msgstr ""
-#: includes/class.cooked-settings.php:260
+#: includes/class.cooked-settings.php:285
msgid "First name initial w/full last name"
msgstr ""
-#: includes/class.cooked-settings.php:261
+#: includes/class.cooked-settings.php:286
msgid "First name only"
msgstr ""
-#: includes/class.cooked-settings.php:266
+#: includes/class.cooked-settings.php:291
msgid "Author Links"
msgstr ""
-#: includes/class.cooked-settings.php:267
+#: includes/class.cooked-settings.php:292
msgid "If you do not want the author names to link to the author recipe listings, you can disable them here."
msgstr ""
-#: includes/class.cooked-settings.php:274
+#: includes/class.cooked-settings.php:299
msgid "Disable Author Links"
msgstr ""
-#: includes/class.cooked-settings.php:279
+#: includes/class.cooked-settings.php:304
msgid "Default Category"
msgstr ""
#. translators: a description on how to set the default recipe category for the [cooked-browse] shortcode.
-#: includes/class.cooked-settings.php:281
+#: includes/class.cooked-settings.php:306
+#, php-format
msgid "Optionally set the default recipe category for your %s shortcode display."
msgstr ""
-#: includes/class.cooked-settings.php:287
+#: includes/class.cooked-settings.php:312
msgid "Default Sort Order"
msgstr ""
#. translators: a description on how to set the default sort order for the [cooked-browse] shortcode.
-#: includes/class.cooked-settings.php:289
+#: includes/class.cooked-settings.php:314
+#, php-format
msgid "Set the default sort order for your %s shortcode display."
msgstr ""
-#: includes/class.cooked-settings.php:295
+#: includes/class.cooked-settings.php:320
msgid "Newest First"
msgstr ""
-#: includes/class.cooked-settings.php:296
+#: includes/class.cooked-settings.php:321
msgid "Oldest First"
msgstr ""
-#: includes/class.cooked-settings.php:297
+#: includes/class.cooked-settings.php:322
msgid "Alphabetical"
msgstr ""
-#: includes/class.cooked-settings.php:298
+#: includes/class.cooked-settings.php:323
msgid "Alphabetical (reversed)"
msgstr ""
-#: includes/class.cooked-settings.php:303
+#: includes/class.cooked-settings.php:328
+msgid "Section Heading Default HTML Tag"
+msgstr ""
+
+#. translators: a description on how to set the default sort order for the [cooked-browse] shortcode.
+#: includes/class.cooked-settings.php:330
+msgid "Set the default HTML tag for your section headings."
+msgstr ""
+
+#: includes/class.cooked-settings.php:336
+msgid "div"
+msgstr ""
+
+#: includes/class.cooked-settings.php:337
+msgid "h2"
+msgstr ""
+
+#: includes/class.cooked-settings.php:338
+msgid "h3"
+msgstr ""
+
+#: includes/class.cooked-settings.php:339
+msgid "h4"
+msgstr ""
+
+#: includes/class.cooked-settings.php:340
+msgid "h5"
+msgstr ""
+
+#: includes/class.cooked-settings.php:341
+msgid "h6"
+msgstr ""
+
+#: includes/class.cooked-settings.php:346
msgid "WP Editor Roles"
msgstr ""
-#: includes/class.cooked-settings.php:304
+#: includes/class.cooked-settings.php:347
msgid "Choose which user roles can use the WP Editor for the Excerpt, Directions & Notes fields."
msgstr ""
-#: includes/class.cooked-settings.php:310
+#: includes/class.cooked-settings.php:353
msgid "Advanced Settings"
msgstr ""
#. translators: an option to only show recipes with the [cooked-recipe] shortcode.
-#: includes/class.cooked-settings.php:320
+#: includes/class.cooked-settings.php:363
msgid "Disable Public Recipes"
msgstr ""
#. translators: an option to only show recipes with the [cooked-recipe] shortcode.
-#: includes/class.cooked-settings.php:320
+#: includes/class.cooked-settings.php:363
+#, php-format
msgid "Only show recipes using the %s shortcode."
msgstr ""
#. translators: an option to disable "meta" tags.
-#: includes/class.cooked-settings.php:322
+#: includes/class.cooked-settings.php:365
+#, php-format
msgid "Disable %s Tags"
msgstr ""
#. translators: an option to disable "meta" tags.
-#: includes/class.cooked-settings.php:322
+#: includes/class.cooked-settings.php:365
msgid "Prevents duplicates when tags already exist."
msgstr ""
-#: includes/class.cooked-settings.php:323
+#: includes/class.cooked-settings.php:366
msgid "Disable \"Servings Switcher\""
msgstr ""
-#: includes/class.cooked-settings.php:323
+#: includes/class.cooked-settings.php:366
msgid "Removes the servings dropdown on recipes."
msgstr ""
-#: includes/class.cooked-settings.php:324
+#: includes/class.cooked-settings.php:367
msgid "Disable Recipe Schema Output"
msgstr ""
-#: includes/class.cooked-settings.php:324
+#: includes/class.cooked-settings.php:367
msgid "You should only do this if you're using something else to output schema information."
msgstr ""
-#: includes/class.cooked-settings.php:325
+#: includes/class.cooked-settings.php:368
msgid "Disable Recipe Archive Page"
msgstr ""
-#: includes/class.cooked-settings.php:325
+#: includes/class.cooked-settings.php:368
msgid "Prevents the recipe archive from being displayed."
msgstr ""
-#: includes/class.cooked-settings.php:332
+#: includes/class.cooked-settings.php:375
msgid "Design"
msgstr ""
-#: includes/class.cooked-settings.php:336
+#: includes/class.cooked-settings.php:379
msgid "Dark Mode"
msgstr ""
-#: includes/class.cooked-settings.php:337
+#: includes/class.cooked-settings.php:380
msgid "If your site has a dark background, you should enable \"Dark Mode\" so that Cooked can match this style."
msgstr ""
-#: includes/class.cooked-settings.php:343
+#: includes/class.cooked-settings.php:386
msgid "Enable \"Dark Mode\""
msgstr ""
-#: includes/class.cooked-settings.php:348
+#: includes/class.cooked-settings.php:391
msgid "Author Images"
msgstr ""
-#: includes/class.cooked-settings.php:349
+#: includes/class.cooked-settings.php:392
msgid "If you do not want to display the author images (avatars), you can disable them here."
msgstr ""
-#: includes/class.cooked-settings.php:356
+#: includes/class.cooked-settings.php:399
msgid "Hide Author Images"
msgstr ""
-#: includes/class.cooked-settings.php:361
+#: includes/class.cooked-settings.php:404
msgid "Main Color"
msgstr ""
-#: includes/class.cooked-settings.php:362
+#: includes/class.cooked-settings.php:405
msgid "Used on buttons, cooking timer, etc."
msgstr ""
-#: includes/class.cooked-settings.php:368
+#: includes/class.cooked-settings.php:411
msgid "Main Color (on hover)"
msgstr ""
-#: includes/class.cooked-settings.php:369
+#: includes/class.cooked-settings.php:412
msgid "Used when hovering over buttons."
msgstr ""
-#: includes/class.cooked-settings.php:375
+#: includes/class.cooked-settings.php:418
msgid "First Responsive Breakpoint"
msgstr ""
-#: includes/class.cooked-settings.php:376
+#: includes/class.cooked-settings.php:419
msgid "Set the first responsive breakpoint. Best for large tablets."
msgstr ""
-#: includes/class.cooked-settings.php:382
+#: includes/class.cooked-settings.php:425
msgid "Second Responsive Breakpoint"
msgstr ""
-#: includes/class.cooked-settings.php:383
+#: includes/class.cooked-settings.php:426
msgid "Set the second responsive breakpoint. Best for small tablets."
msgstr ""
-#: includes/class.cooked-settings.php:389
+#: includes/class.cooked-settings.php:432
msgid "Third Responsive Breakpoint"
msgstr ""
-#: includes/class.cooked-settings.php:390
+#: includes/class.cooked-settings.php:433
msgid "Set the third responsive breakpoint. Best for phones and other small devices."
msgstr ""
-#: includes/class.cooked-settings.php:398
+#: includes/class.cooked-settings.php:441
msgid "Permalinks"
msgstr ""
-#: includes/class.cooked-settings.php:402
+#: includes/class.cooked-settings.php:445
msgid "Recipe Permalink"
msgstr ""
-#: includes/class.cooked-settings.php:405
+#: includes/class.cooked-settings.php:448
msgid "recipe-name"
msgstr ""
-#: includes/class.cooked-settings.php:409
+#: includes/class.cooked-settings.php:452
msgid "Recipe Author Permalink"
msgstr ""
-#: includes/class.cooked-settings.php:412
+#: includes/class.cooked-settings.php:455
msgid "author-name"
msgstr ""
-#: includes/class.cooked-settings.php:416
+#: includes/class.cooked-settings.php:459
msgid "Recipe Category Permalink"
msgstr ""
-#: includes/class.cooked-settings.php:419
+#: includes/class.cooked-settings.php:462
msgid "recipe-category-name"
msgstr ""
#. translators: posts_per_page default
-#: includes/class.cooked-settings.php:430
+#: includes/class.cooked-settings.php:473
+#, php-format
msgid "WordPress Default %s"
msgstr ""
-#: includes/class.cooked-settings.php:435
+#: includes/class.cooked-settings.php:478
msgid "Show All (no pagination)"
msgstr ""
-#: includes/class.cooked-settings.php:579
+#: includes/class.cooked-settings.php:620
msgid "Begin Migration"
msgstr ""
#. translators: referring to the bottom of the Settings page.
-#: includes/class.cooked-shortcodes.php:148
+#: includes/class.cooked-shortcodes.php:149
+#, php-format
msgid "Public recipes are currently disabled. You can change this at the bottom of the %s page."
msgstr ""
-#: includes/class.cooked-shortcodes.php:296
+#: includes/class.cooked-shortcodes.php:297
msgid "(recipe not found or in draft status)"
msgstr ""
+#: includes/class.cooked-shortcodes.php:650
+msgid "Fullscreen"
+msgstr ""
+
#: includes/class.cooked-taxonomies.php:40
msgid "Search Categories"
msgstr ""
@@ -1832,6 +1909,7 @@ msgstr ""
#. translators: for displaying singular or plural versions depending on the number.
#: includes/class.cooked-taxonomies.php:136
+#, php-format
msgid "%s Recipe"
msgid_plural "%s Recipes"
msgstr[0] ""
@@ -1954,11 +2032,13 @@ msgstr ""
#. translators: referring to "Cooked Pro"
#: templates/admin/pro.php:10
+#, php-format
msgid "Ready for %s?"
msgstr ""
#. translators: referring to "Cooked Pro"
#: templates/admin/pro.php:14
+#, php-format
msgid "The %s upgrade adds loads of new features like ratings, favorites, user profiles, automatic nutrition information and more. Check out the list below for all of the details."
msgstr ""
@@ -2028,11 +2108,13 @@ msgstr ""
#. translators: referring to "Cooked Pro"
#: templates/admin/pro.php:48
+#, php-format
msgid "Get %s"
msgstr ""
#. translators: referring to the "COOKED10" coupon code to get "10%" off Cooked Pro
#: templates/admin/pro.php:52
+#, php-format
msgid "Use coupon code %1$s for %2$s off!"
msgstr ""
@@ -2047,10 +2129,12 @@ msgstr ""
#. translators: referring to "Cooked"
#: templates/admin/welcome.php:10
+#, php-format
msgid "Thanks for using %s!"
msgstr ""
#: templates/admin/welcome.php:16
+#, php-format
msgid "If this is your first time using %1$s, head over to the %2$s page for some initial configuration. You can also check out the %3$s if you get stuck or contact me on %4$s. If you just recently updated, you can find out what's new below."
msgstr ""
@@ -2077,6 +2161,7 @@ msgstr ""
#. translators: referring to the author (ex: Recipes by John Smith)
#: templates/front/recipe-list.php:37
+#, php-format
msgid "Recipes by %s"
msgstr ""
diff --git a/package-lock.json b/package-lock.json
index c20b2a1..94494b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "cooked",
- "version": "1.10.0",
+ "version": "1.11.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cooked",
- "version": "1.10.0",
+ "version": "1.11.0",
"license": "ISC",
"devDependencies": {
"@playwright/test": "^1.48.2",
@@ -411,23 +411,24 @@
}
},
"node_modules/@paulirish/trace_engine": {
- "version": "0.0.50",
- "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.50.tgz",
- "integrity": "sha512-ktkbISnr0T9dkOxtnEadjYsbArMcvX2Wp8zwgyIP6KW0eOk2Oe2s49BY4v0qdE3uQdVv/GDdQ6MnoIFuYNJ9pg==",
+ "version": "0.0.53",
+ "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.53.tgz",
+ "integrity": "sha512-PUl/vlfo08Oj804VI5nDPeSk9vyslnBlVzDDwFt8SUVxY8+KdGMkra/vrXjEEHe8gb7+RqVTfOIlGw0nyrEelA==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
+ "legacy-javascript": "latest",
"third-party-web": "latest"
}
},
"node_modules/@playwright/test": {
- "version": "1.51.1",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.1.tgz",
- "integrity": "sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==",
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz",
+ "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "playwright": "1.51.1"
+ "playwright": "1.52.0"
},
"bin": {
"playwright": "cli.js"
@@ -437,17 +438,17 @@
}
},
"node_modules/@puppeteer/browsers": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.9.0.tgz",
- "integrity": "sha512-8+xM+cFydYET4X/5/3yZMHs7sjS6c9I6H5I3xJdb6cinzxWUT/I2QVw4avxCQ8QDndwdHkG/FiSZIrCjAbaKvQ==",
+ "version": "2.10.5",
+ "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.10.5.tgz",
+ "integrity": "sha512-eifa0o+i8dERnngJwKrfp3dEq7ia5XFyoqB17S4gK8GhsQE4/P8nxOfQSE0zQHxzzLo/cmF+7+ywEQ7wK7Fb+w==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "debug": "^4.4.0",
+ "debug": "^4.4.1",
"extract-zip": "^2.0.1",
"progress": "^2.0.3",
"proxy-agent": "^6.5.0",
- "semver": "^7.7.1",
+ "semver": "^7.7.2",
"tar-fs": "^3.0.8",
"yargs": "^17.7.2"
},
@@ -474,9 +475,9 @@
}
},
"node_modules/@puppeteer/browsers/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -499,9 +500,9 @@
"license": "MIT"
},
"node_modules/@puppeteer/browsers/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"dev": true,
"license": "ISC",
"bin": {
@@ -623,13 +624,13 @@
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "22.13.17",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz",
- "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==",
+ "version": "22.15.29",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.29.tgz",
+ "integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "undici-types": "~6.20.0"
+ "undici-types": "~6.21.0"
}
},
"node_modules/@types/yauzl": {
@@ -644,9 +645,9 @@
}
},
"node_modules/@wordpress/e2e-test-utils-playwright": {
- "version": "1.21.0",
- "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils-playwright/-/e2e-test-utils-playwright-1.21.0.tgz",
- "integrity": "sha512-SeGRA7skkST9TB56yHeY8pNBN5iNdtz3bc2j9gSim7U73/BgbC4LZPVAK6NfRJlckhJHofp92PC9aExheWSJTQ==",
+ "version": "1.24.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils-playwright/-/e2e-test-utils-playwright-1.24.0.tgz",
+ "integrity": "sha512-0XKT/tfXyE8tyo7DFKd0QNdnP/19v68ujetEjeCiPe2vKbaleGBP0XS3ehpRmcuO+YtezAyvwXCtnvlKAdNPtA==",
"dev": true,
"license": "GPL-2.0-or-later",
"dependencies": {
@@ -874,9 +875,9 @@
"optional": true
},
"node_modules/bare-fs": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.2.tgz",
- "integrity": "sha512-S5mmkMesiduMqnz51Bfh0Et9EX0aTCJxhsI4bvzFFLs8Z1AV8RDHadfY5CyLwdoLHgXbNBEN1gQcbEtGwuvixw==",
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
+ "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
"dev": true,
"license": "Apache-2.0",
"optional": true,
@@ -1147,9 +1148,9 @@
}
},
"node_modules/chrome-launcher": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
- "integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.2.0.tgz",
+ "integrity": "sha512-JbuGuBNss258bvGil7FT4HKdC3SC2K7UAEUqiPy3ACS3Yxo3hAW6bvFpCu2HsIJLgTqxgEX6BkujvzZfLpUD0Q==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
@@ -1159,16 +1160,16 @@
"lighthouse-logger": "^2.0.1"
},
"bin": {
- "print-chrome-path": "bin/print-chrome-path.js"
+ "print-chrome-path": "bin/print-chrome-path.cjs"
},
"engines": {
"node": ">=12.13.0"
}
},
"node_modules/chromium-bidi": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-3.0.0.tgz",
- "integrity": "sha512-ZOGRDAhBMX1uxL2Cm2TDuhImbrsEz5A/tTcVU6RpXEWaTNUNwsHW6njUXizh51Ir6iqHbKAfhA2XK33uBcLo5A==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-5.1.0.tgz",
+ "integrity": "sha512-9MSRhWRVoRPDG0TgzkHrshFSJJNZzfY5UFqUMuksg7zL1yoZIZ3jLB0YAgHclbiAxPI86pBnwDX1tbzoiV8aFw==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
@@ -1214,13 +1215,6 @@
"node": ">=0.8"
}
},
- "node_modules/clone-stats": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
- "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1416,9 +1410,9 @@
}
},
"node_modules/devtools-protocol": {
- "version": "0.0.1436416",
- "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1436416.tgz",
- "integrity": "sha512-iGLhz2WOrlBLcTcoVsFy5dPPUqILG6cc8MITYd5lV6i38gWG14bMXRH/d8G5KITrWHBnbsOnWHfc9Qs4/jej9Q==",
+ "version": "0.0.1467305",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1467305.tgz",
+ "integrity": "sha512-LxwMLqBoPPGpMdRL4NkLFRNy3QLp6Uqa7GNp1v6JaBheop2QrB9Q7q0A/q/CYYP9sBfZdHOyszVx4gc9zyk7ow==",
"dev": true,
"license": "BSD-3-Clause"
},
@@ -1690,9 +1684,9 @@
}
},
"node_modules/extract-zip/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1989,9 +1983,9 @@
}
},
"node_modules/get-uri/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2027,9 +2021,9 @@
}
},
"node_modules/glob-stream": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz",
- "integrity": "sha512-R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==",
+ "version": "8.0.3",
+ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz",
+ "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2139,16 +2133,16 @@
"license": "ISC"
},
"node_modules/gulp": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz",
- "integrity": "sha512-S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz",
+ "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==",
"dev": true,
"license": "MIT",
"dependencies": {
"glob-watcher": "^6.0.0",
- "gulp-cli": "^3.0.0",
+ "gulp-cli": "^3.1.0",
"undertaker": "^2.0.0",
- "vinyl-fs": "^4.0.0"
+ "vinyl-fs": "^4.0.2"
},
"bin": {
"gulp": "bin/gulp.js"
@@ -2171,9 +2165,9 @@
}
},
"node_modules/gulp-cli": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz",
- "integrity": "sha512-RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz",
+ "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2182,7 +2176,7 @@
"copy-props": "^4.0.0",
"gulplog": "^2.2.0",
"interpret": "^3.1.1",
- "liftoff": "^5.0.0",
+ "liftoff": "^5.0.1",
"mute-stdout": "^2.0.0",
"replace-homedir": "^2.0.0",
"semver-greatest-satisfied-range": "^2.0.0",
@@ -2461,9 +2455,9 @@
}
},
"node_modules/http-proxy-agent/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2500,9 +2494,9 @@
}
},
"node_modules/https-proxy-agent/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2573,9 +2567,9 @@
"license": "MIT"
},
"node_modules/immutable": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz",
- "integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==",
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
+ "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
"dev": true,
"license": "MIT"
},
@@ -2932,6 +2926,13 @@
"node": ">=10.13.0"
}
},
+ "node_modules/legacy-javascript": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/legacy-javascript/-/legacy-javascript-0.0.1.tgz",
+ "integrity": "sha512-lPyntS4/aS7jpuvOlitZDFifBCb4W8L/3QU0PLbUTUj+zYah8rfVjYic88yG7ZKTxhS5h9iz7duT8oUXKszLhg==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
"node_modules/lie": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
@@ -2943,9 +2944,9 @@
}
},
"node_modules/liftoff": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.0.tgz",
- "integrity": "sha512-a5BQjbCHnB+cy+gsro8lXJ4kZluzOijzJ1UVVfyJYZC+IP2pLv1h4+aysQeKuTmyO8NAqfyQAk4HWaP/HjcKTg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz",
+ "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2962,19 +2963,19 @@
}
},
"node_modules/lighthouse": {
- "version": "12.5.1",
- "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-12.5.1.tgz",
- "integrity": "sha512-ooOIqtBxOEnuX3yKtc8WiMPI/fPqHtXHaXU4ey87icRcY5I2B9+imk8i6U7duIO+yrU0WwbIwhmCs8s/FFNRgA==",
+ "version": "12.6.1",
+ "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-12.6.1.tgz",
+ "integrity": "sha512-85WDkjcXAVdlFem9Y6SSxqoKiz/89UsDZhLpeLJIsJ4LlHxw047XTZhlFJmjYCB7K5S1erSBAf5cYLcfyNbH3A==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "@paulirish/trace_engine": "0.0.50",
+ "@paulirish/trace_engine": "0.0.53",
"@sentry/node": "^7.0.0",
"axe-core": "^4.10.3",
- "chrome-launcher": "^1.1.2",
+ "chrome-launcher": "^1.2.0",
"configstore": "^5.0.1",
"csp_evaluator": "1.1.5",
- "devtools-protocol": "0.0.1436416",
+ "devtools-protocol": "0.0.1467305",
"enquirer": "^2.3.6",
"http-link-header": "^1.1.1",
"intl-messageformat": "^10.5.3",
@@ -2987,11 +2988,11 @@
"metaviewport-parser": "0.3.0",
"open": "^8.4.0",
"parse-cache-control": "1.0.1",
- "puppeteer-core": "^24.4.0",
+ "puppeteer-core": "^24.10.0",
"robots-parser": "^3.0.1",
"semver": "^5.3.0",
"speedline-core": "^1.4.3",
- "third-party-web": "^0.26.5",
+ "third-party-web": "^0.26.6",
"tldts-icann": "^6.1.16",
"ws": "^7.0.0",
"yargs": "^17.3.1",
@@ -3003,7 +3004,7 @@
"smokehouse": "cli/test/smokehouse/frontends/smokehouse-bin.js"
},
"engines": {
- "node": ">=18.16"
+ "node": ">=18.20"
}
},
"node_modules/lighthouse-logger": {
@@ -3163,9 +3164,9 @@
}
},
"node_modules/marky": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
- "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/marky/-/marky-1.3.0.tgz",
+ "integrity": "sha512-ocnPZQLNpvbedwTy9kNrQEsknEfgvcLMvOtz3sFeWApDq1MXH1TqkCIx58xlpESsfwQOnuBO9beyQuNGzVvuhQ==",
"dev": true,
"license": "Apache-2.0"
},
@@ -3390,9 +3391,9 @@
}
},
"node_modules/pac-proxy-agent/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3550,13 +3551,13 @@
}
},
"node_modules/playwright": {
- "version": "1.51.1",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.1.tgz",
- "integrity": "sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==",
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
+ "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "playwright-core": "1.51.1"
+ "playwright-core": "1.52.0"
},
"bin": {
"playwright": "cli.js"
@@ -3569,9 +3570,9 @@
}
},
"node_modules/playwright-core": {
- "version": "1.51.1",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.1.tgz",
- "integrity": "sha512-/crRMj8+j/Nq5s8QcvegseuyeZPxpQCZb6HNk3Sos3BlZyAknRjoyJPFWkpNn8v0+P3WiwqFF8P+zQo4eqiNuw==",
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
+ "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
"dev": true,
"license": "Apache-2.0",
"bin": {
@@ -3663,9 +3664,9 @@
}
},
"node_modules/proxy-agent/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3706,27 +3707,27 @@
}
},
"node_modules/puppeteer-core": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.5.0.tgz",
- "integrity": "sha512-vqibSk7xGOoqOlPUk3H+Iz02b4jCEd5QxaiuXclqyyBrJ6ZK22mXkg9HBSpyZePq6vKWh5ZAqUilSnbF2bv4Jg==",
+ "version": "24.10.0",
+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.10.0.tgz",
+ "integrity": "sha512-xX0QJRc8t19iAwRDsAOR38Q/Zx/W6WVzJCEhKCAwp2XMsaWqfNtQ+rBfQW9PlF+Op24d7c8Zlgq9YNmbnA7hdQ==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "@puppeteer/browsers": "2.9.0",
- "chromium-bidi": "3.0.0",
- "debug": "^4.4.0",
- "devtools-protocol": "0.0.1413902",
+ "@puppeteer/browsers": "2.10.5",
+ "chromium-bidi": "5.1.0",
+ "debug": "^4.4.1",
+ "devtools-protocol": "0.0.1452169",
"typed-query-selector": "^2.12.0",
- "ws": "^8.18.1"
+ "ws": "^8.18.2"
},
"engines": {
"node": ">=18"
}
},
"node_modules/puppeteer-core/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3742,9 +3743,9 @@
}
},
"node_modules/puppeteer-core/node_modules/devtools-protocol": {
- "version": "0.0.1413902",
- "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1413902.tgz",
- "integrity": "sha512-yRtvFD8Oyk7C9Os3GmnFZLu53yAfsnyw1s+mLmHHUK0GQEc9zthHWvS1r67Zqzm5t7v56PILHIVZ7kmFMaL2yQ==",
+ "version": "0.0.1452169",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1452169.tgz",
+ "integrity": "sha512-FOFDVMGrAUNp0dDKsAU1TorWJUx2JOU1k9xdgBKKJF3IBh/Uhl2yswG5r3TEAOrCiGY2QRp1e6LVDQrCsTKO4g==",
"dev": true,
"license": "BSD-3-Clause"
},
@@ -3756,9 +3757,9 @@
"license": "MIT"
},
"node_modules/puppeteer-core/node_modules/ws": {
- "version": "8.18.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
- "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+ "version": "8.18.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
+ "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -3953,9 +3954,9 @@
"license": "MIT"
},
"node_modules/sass": {
- "version": "1.86.1",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.1.tgz",
- "integrity": "sha512-Yaok4XELL1L9Im/ZUClKu//D2OP1rOljKj0Gf34a+GzLbMveOzL7CfqYo+JUa5Xt1nhTCW+OcKp/FtR7/iqj1w==",
+ "version": "1.89.1",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.1.tgz",
+ "integrity": "sha512-eMLLkl+qz7tx/0cJ9wI+w09GQ2zodTkcE/aVfywwdlRcI3EO19xGnbmJwg/JMIm+5MxVJ6outddLZ4Von4E++Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4098,9 +4099,9 @@
}
},
"node_modules/socks-proxy-agent/node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4192,9 +4193,9 @@
"license": "MIT"
},
"node_modules/streamx": {
- "version": "2.22.0",
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
- "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
+ "version": "2.22.1",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
+ "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4291,9 +4292,9 @@
}
},
"node_modules/tar-fs": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
- "integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
+ "version": "3.0.9",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
+ "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4338,9 +4339,9 @@
}
},
"node_modules/third-party-web": {
- "version": "0.26.5",
- "resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.26.5.tgz",
- "integrity": "sha512-tDuKQJUTfjvi9Fcrs1s6YAQAB9mzhTSbBZMfNgtWNmJlHuoFeXO6dzBFdGeCWRvYL50jQGK0jPsBZYxqZQJ2SA==",
+ "version": "0.26.6",
+ "resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.26.6.tgz",
+ "integrity": "sha512-GsjP92xycMK8qLTcQCacgzvffYzEqe29wyz3zdKVXlfRD5Kz1NatCTOZEeDaSd6uCZXvGd2CNVtQ89RNIhJWvA==",
"dev": true,
"license": "MIT"
},
@@ -4355,20 +4356,20 @@
}
},
"node_modules/tldts-core": {
- "version": "6.1.85",
- "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz",
- "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==",
+ "version": "6.1.86",
+ "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
+ "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
"dev": true,
"license": "MIT"
},
"node_modules/tldts-icann": {
- "version": "6.1.85",
- "resolved": "https://registry.npmjs.org/tldts-icann/-/tldts-icann-6.1.85.tgz",
- "integrity": "sha512-LIL8koGz5n2ni5wym7qw5vjeZxCgh5uI0Vs4LQu6M8k1IoknMttui/WTVI58jXBqRRSx76IniSJdeZDVFdALdw==",
+ "version": "6.1.86",
+ "resolved": "https://registry.npmjs.org/tldts-icann/-/tldts-icann-6.1.86.tgz",
+ "integrity": "sha512-NFxmRT2lAEMcCOBgeZ0NuM0zsK/xgmNajnY6n4S1mwAKocft2s2ise1O3nQxrH3c+uY6hgHUV9GGNVp7tUE4Sg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "tldts-core": "^6.1.85"
+ "tldts-core": "^6.1.86"
}
},
"node_modules/to-regex-range": {
@@ -4471,9 +4472,9 @@
}
},
"node_modules/undici-types": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
- "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+ "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
"dev": true,
"license": "MIT"
},
@@ -4538,14 +4539,13 @@
}
},
"node_modules/vinyl": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
- "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+ "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
"dev": true,
"license": "MIT",
"dependencies": {
"clone": "^2.1.2",
- "clone-stats": "^1.0.0",
"remove-trailing-separator": "^1.1.0",
"replace-ext": "^2.0.0",
"teex": "^1.0.1"
@@ -4569,14 +4569,14 @@
}
},
"node_modules/vinyl-fs": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
- "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz",
+ "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==",
"dev": true,
"license": "MIT",
"dependencies": {
"fs-mkdirp-stream": "^2.0.1",
- "glob-stream": "^8.0.0",
+ "glob-stream": "^8.0.3",
"graceful-fs": "^4.2.11",
"iconv-lite": "^0.6.3",
"is-valid-glob": "^1.0.0",
@@ -4587,7 +4587,7 @@
"streamx": "^2.14.0",
"to-through": "^3.0.0",
"value-or-function": "^4.0.0",
- "vinyl": "^3.0.0",
+ "vinyl": "^3.0.1",
"vinyl-sourcemap": "^2.0.0"
},
"engines": {
@@ -4793,9 +4793,9 @@
}
},
"node_modules/zod": {
- "version": "3.24.2",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
- "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
+ "version": "3.25.49",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.49.tgz",
+ "integrity": "sha512-JMMPMy9ZBk3XFEdbM3iL1brx4NUSejd6xr3ELrrGEfGb355gjhiAWtG3K5o+AViV/3ZfkIrCzXsZn6SbLwTR8Q==",
"dev": true,
"license": "MIT",
"funding": {
diff --git a/package.json b/package.json
index 1c68d69..5bb1844 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cooked",
- "version": "1.10.0",
+ "version": "1.11.0",
"description": "Cooked is the absolute best way to create & display recipes with WordPress. SEO optimized (rich snippets), galleries, cooking timers, printable recipes and much more.",
"main": "index.js",
"scripts": {
diff --git a/readme.txt b/readme.txt
index 71cb50b..d1f4174 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
Contributors: xjsv, boxystudio
Tags: recipe, recipes, food, cooking, nutrition
Requires at least: 4.7
-Tested up to: 6.7.1
-Stable tag: 1.10.0
+Tested up to: 6.8.1
+Stable tag: 1.11.0
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -76,10 +76,21 @@ Be sure to check the [Cooked Documentation](https://github.com/XjSv/Cooked/wiki)
== Upgrade Notice ==
-Version 1.10.0 includes a major change to recipe post statuses - now using WordPress default statuses (publish, pending, draft, trash) instead of custom statuses. This change improves performance and plugin compatibility. Also includes improvements to SEO with nofollow/noindex for print pages, new heading options for Directions/Ingredients sections, and various bug fixes.
+Version 1.11.0 includes bug fixes for user roles and PHP issues, new heading tag options, improved Browse Recipe filters, and accessibility enhancements.
== Changelog ==
+= 1.11.0 =
+* **FIX:** Fixed a bug when users have multiple roles where the WP Editor does not appear in the recipe edit screen.
+* **NEW:** Added the 'cooked_format_author_name' developer filter for customizing how author names are displayed via code. View the [Cooked Documentation](https://github.com/XjSv/Cooked/wiki/Author-Name) for more information.
+* **NEW:** Added 'Default Heading Tags' settings option to allow users to choose between H2, H3, H4, H5, H6 or Div for the Directions and Ingredients sections.
+* **FIX:** Fixed a couple of PHP related issues.
+* **FIX:** Fixed a bug with the Browse Recipe filters that would not work when the Browse Recipe Page is set as the Homepage.
+* **FIX:** Fixed a bug with default values not loading when introducing a new settings field and the settings page was not saved yet.
+* **TWEAK:** Changed the way the cooked migration is checked for better performance.
+* **TWEAK:** Accessibility improvements throughout the plugin.
+* **TWEAK:** Settings UI improvements.
+
= 1.10.0 =
* **TWEAK:** Simplified recipe status options to match standard WordPress statuses (publish, pending, draft, trash) for better performance and plugin compatibility.
* **TWEAK:** Improved SEO by preventing print pages from being indexed in search engines.
diff --git a/templates/front/recipe-single.php b/templates/front/recipe-single.php
index 988307a..91b5907 100644
--- a/templates/front/recipe-single.php
+++ b/templates/front/recipe-single.php
@@ -44,7 +44,7 @@
echo '';
endif;
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 5c5edb4..9c07ee1 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -14,10 +14,7 @@
echo $err;
}
}
- trigger_error(
- $err,
- E_USER_ERROR
- );
+ throw new RuntimeException($err);
}
require_once __DIR__ . '/composer/autoload_real.php';
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 6d29bff..2052022 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -26,6 +26,12 @@
*/
class InstalledVersions
{
+ /**
+ * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+ * @internal
+ */
+ private static $selfDir = null;
+
/**
* @var mixed[]|null
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null
@@ -322,6 +328,18 @@ public static function reload($data)
self::$installedIsLocalDir = false;
}
+ /**
+ * @return string
+ */
+ private static function getSelfDir()
+ {
+ if (self::$selfDir === null) {
+ self::$selfDir = strtr(__DIR__, '\\', '/');
+ }
+
+ return self::$selfDir;
+ }
+
/**
* @return array[]
* @psalm-return list}>
@@ -336,7 +354,7 @@ private static function getInstalled()
$copiedLocalDir = false;
if (self::$canGetVendors) {
- $selfDir = strtr(__DIR__, '\\', '/');
+ $selfDir = self::getSelfDir();
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
$vendorDir = strtr($vendorDir, '\\', '/');
if (isset(self::$installedByVendor[$vendorDir])) {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 3bda73a..cb9dc10 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
array(
'name' => 'xjsv/cooked',
- 'pretty_version' => '1.10.0',
- 'version' => '1.10.0.0',
+ 'pretty_version' => '1.11.0',
+ 'version' => '1.11.0.0',
'reference' => null,
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
@@ -20,8 +20,8 @@
'dev_requirement' => false,
),
'xjsv/cooked' => array(
- 'pretty_version' => '1.10.0',
- 'version' => '1.10.0.0',
+ 'pretty_version' => '1.11.0',
+ 'version' => '1.11.0.0',
'reference' => null,
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
[cooked-browse]'),
'type' => 'select',
'default' => 0,
'options' => $categories_array
@@ -286,7 +310,7 @@ public static function tabs_fields() {
'browse_default_sort' => [
'title' => __('Default Sort Order', 'cooked'),
/* translators: a description on how to set the default sort order for the [cooked-browse] shortcode. */
- 'desc' => sprintf(__('Set the default sort order for your %s shortcode display.', 'cooked'), '[cooked-browse]'),
+ 'desc' => sprintf(__('Set the default sort order for your %s shortcode display.', 'cooked'), '[cooked-browse]'),
'type' => 'select',
'default' => 'date_desc',
'options' => apply_filters(
@@ -299,11 +323,29 @@ public static function tabs_fields() {
]
)
],
+ 'section_heading_default_html_tag' => [
+ 'title' => __('Section Heading Default HTML Tag', 'cooked'),
+ /* translators: a description on how to set the default sort order for the [cooked-browse] shortcode. */
+ 'desc' => __('Set the default HTML tag for your section headings.', 'cooked'),
+ 'type' => 'select',
+ 'default' => 'div',
+ 'options' => apply_filters(
+ 'cooked_settings_section_heading_default_html_tag_options',
+ [
+ 'div' => __('div', 'cooked'),
+ 'h2' => __('h2', 'cooked'),
+ 'h3' => __('h3', 'cooked'),
+ 'h4' => __('h4', 'cooked'),
+ 'h5' => __('h5', 'cooked'),
+ 'h6' => __('h6', 'cooked'),
+ ]
+ )
+ ],
'recipe_wp_editor_roles' => [
'title' => __('WP Editor Roles', 'cooked'),
'desc' => __('Choose which user roles can use the WP Editor for the Excerpt, Directions & Notes fields.', 'cooked'),
'type' => 'checkboxes',
- 'default' => apply_filters('cooked_add_recipe_wp_editor_roles_defaults', ['administrator', 'editor', 'cooked_recipe_editor']),
+ 'default' => apply_filters('cooked_recipe_wp_editor_roles_defaults', ['administrator', 'editor', 'cooked_recipe_editor']),
'options' => $role_options
],
'advanced' => [
diff --git a/includes/class.cooked-shortcodes.php b/includes/class.cooked-shortcodes.php
index 3f0ff25..62d7f44 100644
--- a/includes/class.cooked-shortcodes.php
+++ b/includes/class.cooked-shortcodes.php
@@ -134,10 +134,11 @@ public function cooked_timer( $atts, $content = null ) {
}
$timer_id = md5( $seconds . $desc . $content ) . '_' . $cooked_timer_identifier;
+ $desc = $desc ? wp_strip_all_tags( $desc ) : wp_strip_all_tags( $content );
wp_enqueue_script( 'cooked-timer' );
- return ' ' . wp_kses_post( $content ) . '';
+ return ' ' . wp_kses_post( $content ) . '';
}
public function cooked_browse_shortcode( $sc_atts, $content = null ) {
@@ -567,6 +568,7 @@ public function cooked_info_shortcode($atts, $content = null) {
function cooked_kses_servings_switcher($tags) {
$tags['select'] = [
'name' => true,
+ 'id' => true,
'class' => true,
];
$tags['option'] = [
@@ -594,6 +596,7 @@ public static function cooked_info_author() {
if ( !empty($author['id']) ) {
$author_slug = !empty($author['name']) ? sanitize_title($author['name']) : false;
+ // @TODO: Convert the homepage link to use pretty URLs.
$permalink = $front_page_id != $browse_page_id && get_option('permalink_structure') ? esc_url( untrailingslashit( $browse_page_url ) . '/' . $_cooked_settings['recipe_author_permalink'] . '/' . $author['id'] . '/' . trailingslashit( $author_slug ) ) : esc_url( trailingslashit( get_home_url() ) . 'index.php?page_id=' . $_cooked_settings['browse_page'] . '&recipe_author=' . $author['id'] );
$permalink = apply_filters( 'cooked_author_permalink', $permalink, $author['id'] );
} else {
@@ -606,7 +609,7 @@ public static function cooked_info_author() {
echo '';
wp_reset_postdata();
@@ -638,13 +641,13 @@ public static function cooked_info_print() {
$query_args['print'] = 1;
$servings = (float)esc_html( get_query_var( 'servings', false ) );
$query_args['servings'] = !empty($servings) ? $servings : false;
- echo '';
+ echo '';
}
public static function cooked_info_fullscreen() {
global $recipe_settings, $_cooked_settings;
- echo '';
+ echo '';
wp_enqueue_script('cooked-nosleep');
}
@@ -793,7 +796,7 @@ public function cooked_image_shortcode($atts, $content = null) {
if (has_post_thumbnail($recipe)) :
echo '';
- echo get_the_post_thumbnail( $recipe,'cooked-large' );
+ echo get_the_post_thumbnail( $recipe, 'cooked-large' );
echo '
';
endif;
@@ -890,17 +893,17 @@ public function cooked_nutrition_shortcode($atts, $content = null) {
// Start output buffer for top facts.
ob_start();
- echo '';
foreach ( $top_facts as $slug => $nf ):
if ( $slug === 'serving_size' ):
- echo '' . esc_html($nf['name']) . ' ';
+ echo ' ';
+ echo '
';
// Get top facts content from buffer.
$top_facts_content = ob_get_clean();
@@ -1045,7 +1048,7 @@ public function cooked_nutrition_shortcode($atts, $content = null) {
echo '' . esc_html($nf['name']) . ' ';
echo '
';
else:
echo '' . esc_html( isset($nutrition_facts[$slug]) ? $nutrition_facts[$slug] : '' ) . '
'; - echo ''; + echo '' . $servings_change . ' ' . esc_html(strtolower($nf['name'])) . '
'; endif; endforeach; - echo '' . __('Nutrition Facts', 'cooked') . '
';
echo wp_kses_post( $nutrition_facts_content );
if ( isset($main_facts_content) && $main_facts_content || isset($bottom_facts_content) && $bottom_facts_content ):
- echo '';
+ echo '';
echo '* ' . __('The % Daily Value (DV) tells you how much a nutrient in a serving of food contributes to a daily diet. 2,000 calories a day is used for general nutrition advice.','cooked') . '
'; endif; diff --git a/includes/class.cooked-taxonomies.php b/includes/class.cooked-taxonomies.php index f3ed45b..f2cf640 100644 --- a/includes/class.cooked-taxonomies.php +++ b/includes/class.cooked-taxonomies.php @@ -159,14 +159,14 @@ public static function term_link_filter( $url, $term, $taxonomy ) { $custom_cooked_tax_setting = 'recipe_category_permalink'; } - // $browse_page_id = $_cooked_settings['browse_page']; - // $browse_page_link = get_permalink($browse_page_id); - // $url_test = $browse_page_link . '?taxonomy=' . $taxonomy . '&term=' . $term->slug; - if ( $parent_page_browse_page != $front_page && get_option('permalink_structure') ) { $url = esc_url_raw( untrailingslashit( get_permalink( $parent_page_browse_page ) ) . '/' . $_cooked_settings[$custom_cooked_tax_setting] . '/' . $term->slug ); } elseif ( $parent_page_browse_page == $front_page ) { - $url = esc_url_raw( get_home_url() . '?' . $taxonomy . '=' . ( isset( $term->slug ) ? $term->slug : $taxonomy ) ); + if ( get_option('permalink_structure') ) { + $url = esc_url_raw( get_home_url() . '/' . $_cooked_settings[$custom_cooked_tax_setting] . '/' . $term->slug ); + } else { + $url = esc_url_raw( get_home_url() . '?' . $taxonomy . '=' . ( isset( $term->slug ) ? $term->slug : $taxonomy ) ); + } } else { $url = esc_url_raw( get_permalink( $parent_page_browse_page ) . '&' . $taxonomy . '=' . ( isset( $term->slug ) ? $term->slug : $taxonomy ) ); } diff --git a/includes/class.cooked-users.php b/includes/class.cooked-users.php index 497e9bb..0b29e06 100644 --- a/includes/class.cooked-users.php +++ b/includes/class.cooked-users.php @@ -19,7 +19,7 @@ */ class Cooked_Users { - function __construct(){ + function __construct() { add_action( 'init', [&$this, 'recipe_author_rewrite'], 10 ); add_filter( 'manage_users_columns', [&$this, 'recipe_count_column'] ); @@ -98,9 +98,24 @@ public static function format_author_name( $name, $format = false ) { $format = 'full'; endif; + $filtered = apply_filters( 'cooked_format_author_name', $name, $format ); + + // If the filter returns an array with a second element true, treat as safe. + if ( is_array( $filtered ) && isset( $filtered[1] ) && $filtered[1] === true ) { + $name = $filtered[0]; + $safe = true; + } else { + $name = is_array( $filtered ) ? $filtered[0] : $filtered; + $safe = false; + } + switch ( $format ) { case 'full': - return $name; + if ( $safe ) { + return $name; + } else { + return esc_html( $name ); + } case 'first_last_initial': $name = explode( ' ', $name ); if ( isset($name[1]) ): @@ -118,7 +133,11 @@ public static function format_author_name( $name, $format = false ) { return esc_html( $name[0] ); } - return esc_html( $name ); + if ( $safe ) { + return $name; + } else { + return esc_html( $name ); + } } function recipe_count_column($column_headers) { @@ -141,7 +160,6 @@ function recipe_count_column_value( $value, $column_name, $user_id ) { return $value; } - function pre_user_query( $query ) { global $wpdb, $current_screen; diff --git a/languages/cooked.po b/languages/cooked.po index 712819c..06dd516 100644 --- a/languages/cooked.po +++ b/languages/cooked.po @@ -87,6 +87,7 @@ msgstr "" #. translators: confirmation for migrating all ### recipes, where ### displays the total number for the migration. #: includes/class.cooked-admin-enqueues.php:149 +#, php-format msgid "Please confirm that you are ready to migrate all %s recipes." msgstr "" @@ -96,15 +97,15 @@ msgstr "" #: includes/class.cooked-admin-menus.php:36 #: includes/class.cooked-admin-menus.php:59 -#: includes/class.cooked-post-types.php:454 -#: includes/class.cooked-post-types.php:466 -#: includes/class.cooked-users.php:125 +#: includes/class.cooked-post-types.php:421 +#: includes/class.cooked-post-types.php:433 +#: includes/class.cooked-users.php:144 msgid "Recipes" msgstr "" #: includes/class.cooked-admin-menus.php:37 #: includes/class.cooked-admin-menus.php:61 -#: includes/class.cooked-post-types.php:456 +#: includes/class.cooked-post-types.php:423 msgid "Add New" msgstr "" @@ -112,7 +113,7 @@ msgstr "" #: includes/class.cooked-admin-menus.php:45 #: includes/class.cooked-admin-menus.php:65 #: includes/class.cooked-recipe-meta.php:94 -#: includes/class.cooked-shortcodes.php:148 +#: includes/class.cooked-shortcodes.php:149 #: templates/admin/welcome.php:18 msgid "Settings" msgstr "" @@ -131,7 +132,7 @@ msgid "Upgrade to Pro" msgstr "" #: includes/class.cooked-admin-menus.php:60 -#: includes/class.cooked-post-types.php:461 +#: includes/class.cooked-post-types.php:428 msgid "All Recipes" msgstr "" @@ -167,17 +168,19 @@ msgstr "" msgid "Error importing recipe." msgstr "" -#: includes/class.cooked-enqueues.php:39 +#: includes/class.cooked-enqueues.php:52 #: includes/class.cooked-recipe-meta.php:1309 msgid "Timer" msgstr "" #. translators: a title for the "What's new in Cooked?" section. #: includes/class.cooked-functions.php:96 +#, php-format msgid "What's new in %s?" msgstr "" #: includes/class.cooked-functions.php:120 +#: includes/class.cooked-shortcodes.php:644 msgid "Print" msgstr "" @@ -195,7 +198,7 @@ msgstr "" #: includes/class.cooked-functions.php:125 #: includes/class.cooked-recipe-meta.php:1254 -#: includes/class.cooked-settings.php:228 +#: includes/class.cooked-settings.php:253 msgid "Excerpt" msgstr "" @@ -206,8 +209,8 @@ msgstr "" #: includes/class.cooked-functions.php:129 #: includes/class.cooked-recipe-meta.php:1278 #: includes/class.cooked-recipes.php:643 -#: includes/class.cooked-settings.php:229 -#: includes/class.cooked-shortcodes.php:760 +#: includes/class.cooked-settings.php:254 +#: includes/class.cooked-shortcodes.php:763 msgid "Notes" msgstr "" @@ -218,6 +221,7 @@ msgstr "" #. translators: for displaying singular or plural versions depending on the number of recipes. #: includes/class.cooked-import.php:42 +#, php-format msgid "There is %1$s recipe that should be imported from %2$s." msgid_plural "There are %1$s recipes that should be imported from %2$s." msgstr[0] "" @@ -289,7 +293,7 @@ msgid "Begin Import" msgstr "" #: includes/class.cooked-import.php:119 -#: includes/class.cooked-settings.php:584 +#: includes/class.cooked-settings.php:625 msgid "reload" msgstr "" @@ -572,7 +576,8 @@ msgid "cans" msgstr "" #: includes/class.cooked-measurements.php:202 -#: includes/class.cooked-settings.php:233 +#: includes/class.cooked-recipes.php:799 +#: includes/class.cooked-settings.php:258 msgid "Servings" msgstr "" @@ -748,6 +753,7 @@ msgstr "" #: includes/class.cooked-measurements.php:703 #: includes/class.cooked-measurements.php:714 #: includes/class.cooked-measurements.php:732 +#, php-format msgid "%d min" msgstr "" @@ -755,33 +761,39 @@ msgstr "" #: includes/class.cooked-measurements.php:703 #: includes/class.cooked-measurements.php:714 #: includes/class.cooked-measurements.php:732 +#, php-format msgid "%d mins" msgstr "" #. translators: singular and plural number of hours (shorthand) #: includes/class.cooked-measurements.php:712 #: includes/class.cooked-measurements.php:730 +#, php-format msgid "%d hr" msgstr "" #. translators: singular and plural number of hours (shorthand) #: includes/class.cooked-measurements.php:712 #: includes/class.cooked-measurements.php:730 +#, php-format msgid "%d hrs" msgstr "" #. translators: singular and plural number of days #: includes/class.cooked-measurements.php:728 +#, php-format msgid "%d day" msgstr "" #. translators: singular and plural number of days #: includes/class.cooked-measurements.php:728 +#, php-format msgid "%d days" msgstr "" #. translators: for displaying singular or plural versions depending on the number of recipes. #: includes/class.cooked-migration.php:47 +#, php-format msgid "There is %1$s recipe that should be migrated from %2$s to take advantage of new features and reliability." msgid_plural "There are %1$s recipes that should be migrated from %2$s to take advantage of new features and reliability." msgstr[0] "" @@ -817,6 +829,7 @@ msgstr "" #. translators: for displaying singular or plural versions depending on the number of recipes. #: includes/class.cooked-migration.php:90 +#, php-format msgid "There is %1$s recipe that is from an older version of Cooked. Please %2$s to migrate this recipe." msgid_plural "There are %1$s recipes that are from an older version of Cooked. Please %2$s to migrate these recipes." msgstr[0] "" @@ -835,47 +848,47 @@ msgstr "" msgid "Photo" msgstr "" -#: includes/class.cooked-post-types.php:436 +#: includes/class.cooked-post-types.php:403 msgid "Recipe Archive" msgstr "" -#: includes/class.cooked-post-types.php:455 +#: includes/class.cooked-post-types.php:422 msgid "Recipe" msgstr "" -#: includes/class.cooked-post-types.php:457 +#: includes/class.cooked-post-types.php:424 msgid "Add New Recipe" msgstr "" -#: includes/class.cooked-post-types.php:458 +#: includes/class.cooked-post-types.php:425 msgid "New Recipe" msgstr "" -#: includes/class.cooked-post-types.php:459 +#: includes/class.cooked-post-types.php:426 msgid "Edit Recipe" msgstr "" -#: includes/class.cooked-post-types.php:460 +#: includes/class.cooked-post-types.php:427 msgid "View Recipe" msgstr "" -#: includes/class.cooked-post-types.php:462 +#: includes/class.cooked-post-types.php:429 msgid "Search Recipes" msgstr "" -#: includes/class.cooked-post-types.php:463 +#: includes/class.cooked-post-types.php:430 msgid "No recipes found." msgstr "" -#: includes/class.cooked-post-types.php:464 +#: includes/class.cooked-post-types.php:431 msgid "No recipes found in trash." msgstr "" -#: includes/class.cooked-post-types.php:492 +#: includes/class.cooked-post-types.php:459 msgid "Recipe title ..." msgstr "" -#: includes/class.cooked-post-types.php:510 +#: includes/class.cooked-post-types.php:477 msgid "Cooked Browse Recipes Page" msgstr "" @@ -915,6 +928,7 @@ msgstr "" #. translators: for displaying singular or plural versions depending on the number of recipes. #: includes/class.cooked-recipe-meta.php:305 +#, php-format msgid "It looks like this recipe is from a different version of %s. Please review and click \"Update\" to save it." msgstr "" @@ -971,15 +985,15 @@ msgid "This description is used for SEO purposes and is optional. By default, Co msgstr "" #: includes/class.cooked-recipe-meta.php:380 -#: includes/class.cooked-settings.php:227 +#: includes/class.cooked-settings.php:252 msgid "Difficulty Level" msgstr "" #: includes/class.cooked-recipe-meta.php:389 #: includes/class.cooked-recipe-meta.php:1037 -#: includes/class.cooked-settings.php:230 -#: includes/class.cooked-shortcodes.php:447 -#: includes/class.cooked-shortcodes.php:656 +#: includes/class.cooked-settings.php:255 +#: includes/class.cooked-shortcodes.php:448 +#: includes/class.cooked-shortcodes.php:659 msgid "Prep Time" msgstr "" @@ -991,18 +1005,18 @@ msgstr "" #: includes/class.cooked-recipe-meta.php:394 #: includes/class.cooked-recipe-meta.php:1038 -#: includes/class.cooked-settings.php:231 -#: includes/class.cooked-shortcodes.php:448 -#: includes/class.cooked-shortcodes.php:665 +#: includes/class.cooked-settings.php:256 +#: includes/class.cooked-shortcodes.php:449 +#: includes/class.cooked-shortcodes.php:668 msgid "Cook Time" msgstr "" #: includes/class.cooked-recipe-meta.php:399 #: includes/class.cooked-recipe-meta.php:1039 -#: includes/class.cooked-settings.php:232 -#: includes/class.cooked-shortcodes.php:449 -#: includes/class.cooked-shortcodes.php:676 -#: includes/class.cooked-shortcodes.php:683 +#: includes/class.cooked-settings.php:257 +#: includes/class.cooked-shortcodes.php:450 +#: includes/class.cooked-shortcodes.php:679 +#: includes/class.cooked-shortcodes.php:686 msgid "Total Time" msgstr "" @@ -1057,27 +1071,27 @@ msgid "Nutrition Information" msgstr "" #: includes/class.cooked-recipe-meta.php:839 -#: includes/class.cooked-shortcodes.php:1045 +#: includes/class.cooked-shortcodes.php:1048 msgid "Nutrition Facts" msgstr "" #: includes/class.cooked-recipe-meta.php:857 -#: includes/class.cooked-shortcodes.php:1013 +#: includes/class.cooked-shortcodes.php:1016 msgid "Amount per serving" msgstr "" #: includes/class.cooked-recipe-meta.php:867 -#: includes/class.cooked-shortcodes.php:1023 +#: includes/class.cooked-shortcodes.php:1026 msgid "% Daily Value *" msgstr "" #: includes/class.cooked-recipe-meta.php:886 -#: includes/class.cooked-shortcodes.php:955 +#: includes/class.cooked-shortcodes.php:958 msgid "Includes" msgstr "" #: includes/class.cooked-recipe-meta.php:918 -#: includes/class.cooked-shortcodes.php:1049 +#: includes/class.cooked-shortcodes.php:1052 msgid "The % Daily Value (DV) tells you how much a nutrient in a serving of food contributes to a daily diet. 2,000 calories a day is used for general nutrition advice." msgstr "" @@ -1091,11 +1105,13 @@ msgstr "" #. translators: a title for the video section of the recipe editor, where users can paste a YouToub or Vimeo URL into the field below. #: includes/class.cooked-recipe-meta.php:961 +#, php-format msgid "%1$s or %2$s Video" msgstr "" #. translators: a message describing how to display a video from YouTube or Vimeo. #: includes/class.cooked-recipe-meta.php:965 +#, php-format msgid "If you would like to display a video as the first item in your gallery, you can paste a valid %1$s or %2$s URL below." msgstr "" @@ -1115,6 +1131,7 @@ msgstr "" #. translators: "left and right" section title #: includes/class.cooked-recipe-meta.php:1011 #: includes/class.cooked-recipe-meta.php:1021 +#, php-format msgid "\"%1$s\" and \"%2$s\"" msgstr "" @@ -1139,15 +1156,15 @@ msgid "Available Variables" msgstr "" #: includes/class.cooked-recipe-meta.php:1036 -#: includes/class.cooked-settings.php:225 -#: includes/class.cooked-shortcodes.php:444 -#: includes/class.cooked-shortcodes.php:609 +#: includes/class.cooked-settings.php:250 +#: includes/class.cooked-shortcodes.php:445 +#: includes/class.cooked-shortcodes.php:612 msgid "Author" msgstr "" #: includes/class.cooked-recipe-meta.php:1040 -#: includes/class.cooked-shortcodes.php:445 -#: includes/class.cooked-shortcodes.php:620 +#: includes/class.cooked-shortcodes.php:446 +#: includes/class.cooked-shortcodes.php:623 msgid "Difficulty" msgstr "" @@ -1156,9 +1173,9 @@ msgid "Servings Switcher" msgstr "" #: includes/class.cooked-recipe-meta.php:1042 -#: includes/class.cooked-settings.php:226 -#: includes/class.cooked-shortcodes.php:703 +#: includes/class.cooked-settings.php:251 #: includes/class.cooked-shortcodes.php:706 +#: includes/class.cooked-shortcodes.php:709 #: includes/class.cooked-taxonomies.php:39 msgid "Category" msgstr "" @@ -1247,21 +1264,25 @@ msgstr "" #. translators: related to the width of slideshows: "80% or 300px" section title #: includes/class.cooked-recipe-meta.php:1223 +#, php-format msgid "ex: \"%1$s\" or \"%2$s\"" msgstr "" #. translators: related to the image ratio for slideshows: "ex: 800/600" section title #: includes/class.cooked-recipe-meta.php:1228 +#, php-format msgid "ex: \"%s\"" msgstr "" #. translators: related to the navigation style for slideshows: "dots, thumbs or false" section title #: includes/class.cooked-recipe-meta.php:1233 +#, php-format msgid "\"%1$s\", \"%2$s\", or \"%3$s\"" msgstr "" #. translators: related to allowing full screen for slideshows: "true or false" section title #: includes/class.cooked-recipe-meta.php:1238 +#, php-format msgid "\"%1$s\" or \"%2$s\"" msgstr "" @@ -1291,6 +1312,7 @@ msgstr "" #. translators: "seconds, minutes and hours" section title #: includes/class.cooked-recipe-meta.php:1319 +#, php-format msgid "\"%1$s\", \"%2$s\" and \"%3$s\"" msgstr "" @@ -1323,11 +1345,13 @@ msgstr "" #: includes/class.cooked-recipes.php:268 #: includes/class.cooked-recipes.php:322 #: templates/front/recipe-single.php:47 +#, php-format msgid "By %s" msgstr "" #. translators: For showing "All" of a taxonomy (ex: "All Burgers") #: includes/class.cooked-recipes.php:384 +#, php-format msgid "All %s" msgstr "" @@ -1361,6 +1385,7 @@ msgstr "" #. translators: singular and plural quarter "serving" size #: includes/class.cooked-recipes.php:766 +#, php-format msgid "Quarter (%s Serving)" msgid_plural "Quarter (%s Servings)" msgstr[0] "" @@ -1368,6 +1393,7 @@ msgstr[1] "" #. translators: singular and plural quarter "serving" size #: includes/class.cooked-recipes.php:769 +#, php-format msgid "Half (%s Serving)" msgid_plural "Half (%s Servings)" msgstr[0] "" @@ -1375,6 +1401,7 @@ msgstr[1] "" #. translators: singular and plural quarter "serving" size #: includes/class.cooked-recipes.php:772 +#, php-format msgid "Default (%s Serving)" msgid_plural "Default (%s Servings)" msgstr[0] "" @@ -1382,72 +1409,76 @@ msgstr[1] "" #. translators: singular and plural quarter "serving" size #: includes/class.cooked-recipes.php:775 +#, php-format msgid "Double (%s Servings)" msgstr "" #. translators: singular and plural quarter "serving" size #: includes/class.cooked-recipes.php:778 +#, php-format msgid "Triple (%s Servings)" msgstr "" #: includes/class.cooked-recipes.php:792 -#: includes/class.cooked-shortcodes.php:446 +#: includes/class.cooked-shortcodes.php:447 msgid "Yields" msgstr "" #. translators: singular and plural "serving" sizes #: includes/class.cooked-recipes.php:796 -#: includes/class.cooked-recipes.php:806 +#: includes/class.cooked-recipes.php:807 +#, php-format msgid "%s Serving" msgid_plural "%s Servings" msgstr[0] "" msgstr[1] "" #. translators: singular and plural "steps" -#: includes/class.cooked-recipes.php:914 +#: includes/class.cooked-recipes.php:921 #: includes/class.cooked-seo.php:83 +#, php-format msgid "Step %d" msgstr "" -#: includes/class.cooked-recipes.php:969 +#: includes/class.cooked-recipes.php:976 msgid "Browse" msgstr "" -#: includes/class.cooked-recipes.php:986 -#: includes/class.cooked-settings.php:166 +#: includes/class.cooked-recipes.php:993 +#: includes/class.cooked-settings.php:178 msgid "No categories" msgstr "" -#: includes/class.cooked-recipes.php:989 -#: includes/class.cooked-settings.php:213 +#: includes/class.cooked-recipes.php:996 +#: includes/class.cooked-settings.php:226 #: includes/class.cooked-taxonomies.php:38 #: includes/class.cooked-taxonomies.php:48 msgid "Categories" msgstr "" -#: includes/class.cooked-recipes.php:991 +#: includes/class.cooked-recipes.php:998 #: includes/class.cooked-taxonomies.php:41 #: includes/widgets/recipe-categories.php:48 msgid "All Categories" msgstr "" -#: includes/class.cooked-recipes.php:1061 +#: includes/class.cooked-recipes.php:1068 msgid "Find a recipe..." msgstr "" -#: includes/class.cooked-recipes.php:1076 +#: includes/class.cooked-recipes.php:1083 msgid "Newest first" msgstr "" -#: includes/class.cooked-recipes.php:1080 +#: includes/class.cooked-recipes.php:1087 msgid "Oldest first" msgstr "" -#: includes/class.cooked-recipes.php:1084 +#: includes/class.cooked-recipes.php:1091 msgid "Alphabetical (A-Z)" msgstr "" -#: includes/class.cooked-recipes.php:1088 +#: includes/class.cooked-recipes.php:1095 msgid "Alphabetical (Z-A)" msgstr "" @@ -1455,314 +1486,322 @@ msgstr "" msgid "Recipe Editor" msgstr "" -#: includes/class.cooked-settings.php:80 +#: includes/class.cooked-settings.php:87 msgid "Cooked settings has been updated!" msgstr "" -#: includes/class.cooked-settings.php:166 +#: includes/class.cooked-settings.php:178 msgid "No default" msgstr "" -#: includes/class.cooked-settings.php:186 +#: includes/class.cooked-settings.php:198 msgid "General" msgstr "" -#: includes/class.cooked-settings.php:190 +#: includes/class.cooked-settings.php:202 msgid "Browse/Search Recipes Page" msgstr "" #. translators: a description on how to add the [cooked-browse] shortcode to a page -#: includes/class.cooked-settings.php:192 +#: includes/class.cooked-settings.php:204 +#, php-format msgid "Create a page with the %s shortcode on it, then choose it from this dropdown." msgstr "" -#: includes/class.cooked-settings.php:198 +#: includes/class.cooked-settings.php:211 msgid "Recipes Per Page" msgstr "" #. translators: a description on how to choose the default number of recipes per page. -#: includes/class.cooked-settings.php:200 +#: includes/class.cooked-settings.php:213 +#, php-format msgid "Choose the default (set via the %s panel) or choose a different number here." msgstr "" #. translators: a description on how to choose the default number of recipes per page. -#: includes/class.cooked-settings.php:200 +#: includes/class.cooked-settings.php:213 msgid "Settings > Reading" msgstr "" -#: includes/class.cooked-settings.php:206 +#: includes/class.cooked-settings.php:219 msgid "Recipe Taxonomies" msgstr "" -#: includes/class.cooked-settings.php:207 +#: includes/class.cooked-settings.php:220 msgid "Choose which taxonomies you want to enable for your recipes." msgstr "" -#: includes/class.cooked-settings.php:218 +#: includes/class.cooked-settings.php:231 msgid "Global Recipe Toggles" msgstr "" -#: includes/class.cooked-settings.php:219 +#: includes/class.cooked-settings.php:232 msgid "You can quickly hide or show different recipe elements (site-wide) with these checkboxes." msgstr "" -#: includes/class.cooked-settings.php:238 +#: includes/class.cooked-settings.php:263 msgid "Carbs Format" msgstr "" -#: includes/class.cooked-settings.php:239 +#: includes/class.cooked-settings.php:264 msgid "You can display carbs as \"Total\" or \"Net\"." msgstr "" -#: includes/class.cooked-settings.php:245 +#: includes/class.cooked-settings.php:270 msgid "Total Carbs" msgstr "" -#: includes/class.cooked-settings.php:246 +#: includes/class.cooked-settings.php:271 msgid "Net Carbs" msgstr "" -#: includes/class.cooked-settings.php:251 +#: includes/class.cooked-settings.php:276 msgid "Author Name Format" msgstr "" -#: includes/class.cooked-settings.php:252 +#: includes/class.cooked-settings.php:277 msgid "You can show the full author's name or just a part of it." msgstr "" -#: includes/class.cooked-settings.php:258 +#: includes/class.cooked-settings.php:283 msgid "Full name" msgstr "" -#: includes/class.cooked-settings.php:259 +#: includes/class.cooked-settings.php:284 msgid "Full first name w/last name initial" msgstr "" -#: includes/class.cooked-settings.php:260 +#: includes/class.cooked-settings.php:285 msgid "First name initial w/full last name" msgstr "" -#: includes/class.cooked-settings.php:261 +#: includes/class.cooked-settings.php:286 msgid "First name only" msgstr "" -#: includes/class.cooked-settings.php:266 +#: includes/class.cooked-settings.php:291 msgid "Author Links" msgstr "" -#: includes/class.cooked-settings.php:267 +#: includes/class.cooked-settings.php:292 msgid "If you do not want the author names to link to the author recipe listings, you can disable them here." msgstr "" -#: includes/class.cooked-settings.php:274 +#: includes/class.cooked-settings.php:299 msgid "Disable Author Links" msgstr "" -#: includes/class.cooked-settings.php:279 +#: includes/class.cooked-settings.php:304 msgid "Default Category" msgstr "" #. translators: a description on how to set the default recipe category for the [cooked-browse] shortcode. -#: includes/class.cooked-settings.php:281 +#: includes/class.cooked-settings.php:306 +#, php-format msgid "Optionally set the default recipe category for your %s shortcode display." msgstr "" -#: includes/class.cooked-settings.php:287 +#: includes/class.cooked-settings.php:312 msgid "Default Sort Order" msgstr "" #. translators: a description on how to set the default sort order for the [cooked-browse] shortcode. -#: includes/class.cooked-settings.php:289 +#: includes/class.cooked-settings.php:314 +#, php-format msgid "Set the default sort order for your %s shortcode display." msgstr "" -#: includes/class.cooked-settings.php:295 +#: includes/class.cooked-settings.php:320 msgid "Newest First" msgstr "" -#: includes/class.cooked-settings.php:296 +#: includes/class.cooked-settings.php:321 msgid "Oldest First" msgstr "" -#: includes/class.cooked-settings.php:297 +#: includes/class.cooked-settings.php:322 msgid "Alphabetical" msgstr "" -#: includes/class.cooked-settings.php:298 +#: includes/class.cooked-settings.php:323 msgid "Alphabetical (reversed)" msgstr "" -#: includes/class.cooked-settings.php:303 +#: includes/class.cooked-settings.php:346 msgid "WP Editor Roles" msgstr "" -#: includes/class.cooked-settings.php:304 +#: includes/class.cooked-settings.php:347 msgid "Choose which user roles can use the WP Editor for the Excerpt, Directions & Notes fields." msgstr "" -#: includes/class.cooked-settings.php:310 +#: includes/class.cooked-settings.php:353 msgid "Advanced Settings" msgstr "" #. translators: an option to only show recipes with the [cooked-recipe] shortcode. -#: includes/class.cooked-settings.php:320 +#: includes/class.cooked-settings.php:363 msgid "Disable Public Recipes" msgstr "" #. translators: an option to only show recipes with the [cooked-recipe] shortcode. -#: includes/class.cooked-settings.php:320 +#: includes/class.cooked-settings.php:363 +#, php-format msgid "Only show recipes using the %s shortcode." msgstr "" #. translators: an option to disable "meta" tags. -#: includes/class.cooked-settings.php:322 +#: includes/class.cooked-settings.php:365 +#, php-format msgid "Disable %s Tags" msgstr "" #. translators: an option to disable "meta" tags. -#: includes/class.cooked-settings.php:322 +#: includes/class.cooked-settings.php:365 msgid "Prevents duplicates when tags already exist." msgstr "" -#: includes/class.cooked-settings.php:323 +#: includes/class.cooked-settings.php:366 msgid "Disable \"Servings Switcher\"" msgstr "" -#: includes/class.cooked-settings.php:323 +#: includes/class.cooked-settings.php:366 msgid "Removes the servings dropdown on recipes." msgstr "" -#: includes/class.cooked-settings.php:324 +#: includes/class.cooked-settings.php:367 msgid "Disable Recipe Schema Output" msgstr "" -#: includes/class.cooked-settings.php:324 +#: includes/class.cooked-settings.php:367 msgid "You should only do this if you're using something else to output schema information." msgstr "" -#: includes/class.cooked-settings.php:325 +#: includes/class.cooked-settings.php:368 msgid "Disable Recipe Archive Page" msgstr "" -#: includes/class.cooked-settings.php:325 +#: includes/class.cooked-settings.php:368 msgid "Prevents the recipe archive from being displayed." msgstr "" -#: includes/class.cooked-settings.php:332 +#: includes/class.cooked-settings.php:375 msgid "Design" msgstr "" -#: includes/class.cooked-settings.php:336 +#: includes/class.cooked-settings.php:379 msgid "Dark Mode" msgstr "" -#: includes/class.cooked-settings.php:337 +#: includes/class.cooked-settings.php:380 msgid "If your site has a dark background, you should enable \"Dark Mode\" so that Cooked can match this style." msgstr "" -#: includes/class.cooked-settings.php:343 +#: includes/class.cooked-settings.php:386 msgid "Enable \"Dark Mode\"" msgstr "" -#: includes/class.cooked-settings.php:348 +#: includes/class.cooked-settings.php:391 msgid "Author Images" msgstr "" -#: includes/class.cooked-settings.php:349 +#: includes/class.cooked-settings.php:392 msgid "If you do not want to display the author images (avatars), you can disable them here." msgstr "" -#: includes/class.cooked-settings.php:356 +#: includes/class.cooked-settings.php:399 msgid "Hide Author Images" msgstr "" -#: includes/class.cooked-settings.php:361 +#: includes/class.cooked-settings.php:404 msgid "Main Color" msgstr "" -#: includes/class.cooked-settings.php:362 +#: includes/class.cooked-settings.php:405 msgid "Used on buttons, cooking timer, etc." msgstr "" -#: includes/class.cooked-settings.php:368 +#: includes/class.cooked-settings.php:411 msgid "Main Color (on hover)" msgstr "" -#: includes/class.cooked-settings.php:369 +#: includes/class.cooked-settings.php:412 msgid "Used when hovering over buttons." msgstr "" -#: includes/class.cooked-settings.php:375 +#: includes/class.cooked-settings.php:418 msgid "First Responsive Breakpoint" msgstr "" -#: includes/class.cooked-settings.php:376 +#: includes/class.cooked-settings.php:419 msgid "Set the first responsive breakpoint. Best for large tablets." msgstr "" -#: includes/class.cooked-settings.php:382 +#: includes/class.cooked-settings.php:425 msgid "Second Responsive Breakpoint" msgstr "" -#: includes/class.cooked-settings.php:383 +#: includes/class.cooked-settings.php:426 msgid "Set the second responsive breakpoint. Best for small tablets." msgstr "" -#: includes/class.cooked-settings.php:389 +#: includes/class.cooked-settings.php:432 msgid "Third Responsive Breakpoint" msgstr "" -#: includes/class.cooked-settings.php:390 +#: includes/class.cooked-settings.php:433 msgid "Set the third responsive breakpoint. Best for phones and other small devices." msgstr "" -#: includes/class.cooked-settings.php:398 +#: includes/class.cooked-settings.php:441 msgid "Permalinks" msgstr "" -#: includes/class.cooked-settings.php:402 +#: includes/class.cooked-settings.php:445 msgid "Recipe Permalink" msgstr "" -#: includes/class.cooked-settings.php:405 +#: includes/class.cooked-settings.php:448 msgid "recipe-name" msgstr "" -#: includes/class.cooked-settings.php:409 +#: includes/class.cooked-settings.php:452 msgid "Recipe Author Permalink" msgstr "" -#: includes/class.cooked-settings.php:412 +#: includes/class.cooked-settings.php:455 msgid "author-name" msgstr "" -#: includes/class.cooked-settings.php:416 +#: includes/class.cooked-settings.php:459 msgid "Recipe Category Permalink" msgstr "" -#: includes/class.cooked-settings.php:419 +#: includes/class.cooked-settings.php:462 msgid "recipe-category-name" msgstr "" #. translators: posts_per_page default -#: includes/class.cooked-settings.php:430 +#: includes/class.cooked-settings.php:473 +#, php-format msgid "WordPress Default %s" msgstr "" -#: includes/class.cooked-settings.php:435 +#: includes/class.cooked-settings.php:478 msgid "Show All (no pagination)" msgstr "" -#: includes/class.cooked-settings.php:579 +#: includes/class.cooked-settings.php:620 msgid "Begin Migration" msgstr "" #. translators: referring to the bottom of the Settings page. -#: includes/class.cooked-shortcodes.php:148 +#: includes/class.cooked-shortcodes.php:149 +#, php-format msgid "Public recipes are currently disabled. You can change this at the bottom of the %s page." msgstr "" -#: includes/class.cooked-shortcodes.php:296 +#: includes/class.cooked-shortcodes.php:297 msgid "(recipe not found or in draft status)" msgstr "" @@ -1801,6 +1840,7 @@ msgstr "" #. translators: for displaying singular or plural versions depending on the number. #: includes/class.cooked-taxonomies.php:136 +#, php-format msgid "%s Recipe" msgid_plural "%s Recipes" msgstr[0] "" @@ -1923,11 +1963,13 @@ msgstr "" #. translators: referring to "Cooked Pro" #: templates/admin/pro.php:10 +#, php-format msgid "Ready for %s?" msgstr "" #. translators: referring to "Cooked Pro" #: templates/admin/pro.php:14 +#, php-format msgid "The %s upgrade adds loads of new features like ratings, favorites, user profiles, automatic nutrition information and more. Check out the list below for all of the details." msgstr "" @@ -1997,11 +2039,13 @@ msgstr "" #. translators: referring to "Cooked Pro" #: templates/admin/pro.php:48 +#, php-format msgid "Get %s" msgstr "" #. translators: referring to the "COOKED10" coupon code to get "10%" off Cooked Pro #: templates/admin/pro.php:52 +#, php-format msgid "Use coupon code %1$s for %2$s off!" msgstr "" @@ -2016,10 +2060,12 @@ msgstr "" #. translators: referring to "Cooked" #: templates/admin/welcome.php:10 +#, php-format msgid "Thanks for using %s!" msgstr "" #: templates/admin/welcome.php:16 +#, php-format msgid "If this is your first time using %1$s, head over to the %2$s page for some initial configuration. You can also check out the %3$s if you get stuck or contact me on %4$s. If you just recently updated, you can find out what's new below." msgstr "" @@ -2046,6 +2092,7 @@ msgstr "" #. translators: referring to the author (ex: Recipes by John Smith) #: templates/front/recipe-list.php:37 +#, php-format msgid "Recipes by %s" msgstr "" @@ -2060,14 +2107,6 @@ msgstr "" msgid "Heading Element:" msgstr "" -#: includes/class.cooked-settings.php:165 -msgid "Choose a page..." -msgstr "" - -#: includes/class.cooked-settings.php:165 -msgid "No pages" -msgstr "" - #: includes/class.cooked-measurements.php:85 #: includes/class.cooked-measurements.php:86 msgid "dl" @@ -2080,3 +2119,49 @@ msgstr "" #: includes/class.cooked-measurements.php:88 msgid "deciliters" msgstr "" + +#: cooked.php:283 +msgctxt "Page title" +msgid "Browse Recipes" +msgstr "" + +#: includes/class.cooked-settings.php:328 +msgid "Section Heading Default HTML Tag" +msgstr "" + +#. translators: a description on how to set the default sort order for the [cooked-browse] shortcode. +#: includes/class.cooked-settings.php:330 +msgid "Set the default HTML tag for your section headings." +msgstr "" + +#: includes/class.cooked-settings.php:336 +msgid "div" +msgstr "" + +#: includes/class.cooked-settings.php:337 +msgid "h2" +msgstr "" + +#: includes/class.cooked-settings.php:338 +msgid "h3" +msgstr "" + +#: includes/class.cooked-settings.php:339 +msgid "h4" +msgstr "" + +#: includes/class.cooked-settings.php:340 +msgid "h5" +msgstr "" + +#: includes/class.cooked-settings.php:341 +msgid "h6" +msgstr "" + +#: includes/class.cooked-recipes.php:1070 +msgid "Search" +msgstr "" + +#: includes/class.cooked-shortcodes.php:650 +msgid "Fullscreen" +msgstr "" diff --git a/languages/cooked.pot b/languages/cooked.pot index 5610b4e..6545f5a 100644 --- a/languages/cooked.pot +++ b/languages/cooked.pot @@ -2,16 +2,16 @@ # This file is distributed under the GPL2. msgid "" msgstr "" -"Project-Id-Version: Cooked - Recipe Management 1.10.0\n" +"Project-Id-Version: Cooked - Recipe Management 1.11.0\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/cooked\n" "Last-Translator: FULL NAME