diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php index d6ba3ad7..a86e554d 100644 --- a/includes/admin/feedzy-rss-feeds-import.php +++ b/includes/admin/feedzy-rss-feeds-import.php @@ -834,8 +834,10 @@ public function manage_feedzy_import_columns( $column, $post_id ) { if ( ! $next ) { $next = Feedzy_Rss_Feeds_Util_Scheduler::is_scheduled( 'feedzy_cron' ); } - if ( $next ) { + if ( is_numeric( $next ) ) { echo wp_kses_post( human_time_diff( $next, time() ) ); + } elseif ( $next ) { + echo esc_html__( 'in-progress', 'feedzy-rss-feeds' ); } break; default: @@ -1469,6 +1471,8 @@ private function run_job( $job, $max ) { if ( feedzy_is_pro() ) { $default_thumbnail = get_post_meta( $job->ID, 'default_thumbnail_id', true ); $default_thumbnail = ! empty( $default_thumbnail ) ? explode( ',', (string) $default_thumbnail ) : $global_fallback_thumbnail; + } else { + $default_thumbnail = $global_fallback_thumbnail; } // Note: this implementation will only work if only one of the fields is allowed to provide diff --git a/includes/util/feedzy-rss-feeds-util-scheduler.php b/includes/util/feedzy-rss-feeds-util-scheduler.php index 20737408..6cf4662b 100644 --- a/includes/util/feedzy-rss-feeds-util-scheduler.php +++ b/includes/util/feedzy-rss-feeds-util-scheduler.php @@ -28,14 +28,13 @@ class Feedzy_Rss_Feeds_Util_Scheduler { * @return bool|int */ public static function is_scheduled( string $hook, array $args = array() ) { - if ( function_exists( 'as_has_scheduled_action' ) ) { - return as_has_scheduled_action( $hook, $args ); - } - if ( function_exists( 'as_next_scheduled_action' ) ) { // For older versions of AS. return as_next_scheduled_action( $hook, $args ); } + if ( function_exists( 'as_has_scheduled_action' ) ) { + return as_has_scheduled_action( $hook, $args ); + } return wp_next_scheduled( $hook, $args ); } diff --git a/includes/views/import-metabox-edit.php b/includes/views/import-metabox-edit.php index 94ac7566..4c0b74ae 100644 --- a/includes/views/import-metabox-edit.php +++ b/includes/views/import-metabox-edit.php @@ -674,9 +674,9 @@ class="fz-switch-toggle" type="checkbox" value="yes" > - -
- +
+ +
diff --git a/js/FeedzyLoop/components/FeedControl.js b/js/FeedzyLoop/components/FeedControl.js index 05a5b412..bfdd5049 100644 --- a/js/FeedzyLoop/components/FeedControl.js +++ b/js/FeedzyLoop/components/FeedControl.js @@ -1,6 +1,8 @@ /** * WordPress dependencies. */ +import { __ } from '@wordpress/i18n'; + import { useState, useEffect, useRef } from '@wordpress/element'; const FeedControl = ({ value, options, onChange }) => { @@ -80,7 +82,10 @@ const FeedControl = ({ value, options, onChange }) => { value={selectedOption ? selectedOption.label : inputValue} onChange={handleInputChange} onBlur={handleInputBlur} - placeholder="Enter URLs or select a category" + placeholder={__( + 'Enter URLs or select a Feed Group', + 'feedzy-rss-feeds' + )} disabled={selectedOption !== null} className="fz-input-field" /> @@ -89,7 +94,7 @@ const FeedControl = ({ value, options, onChange }) => {