Skip to content

Commit 9b9febe

Browse files
HardeepAsraniHardeepAsrani
committed
Various Improvements
- #937 - #1003 - #1012 - #981
1 parent bd3134b commit 9b9febe

File tree

7 files changed

+38
-29
lines changed

7 files changed

+38
-29
lines changed

‎includes/admin/feedzy-rss-feeds-admin.php

+13-13
Original file line numberDiff line numberDiff line change
@@ -277,16 +277,16 @@ public function enqueue_scripts() {
277277
*/
278278
public function register_post_type() {
279279
$labels = array(
280-
'name' => __( 'Feed Categories', 'feedzy-rss-feeds' ),
281-
'singular_name' => __( 'Feed Category', 'feedzy-rss-feeds' ),
282-
'add_new' => __( 'Add Category', 'feedzy-rss-feeds' ),
283-
'add_new_item' => __( 'Add Category', 'feedzy-rss-feeds' ),
284-
'edit_item' => __( 'Edit Category', 'feedzy-rss-feeds' ),
285-
'new_item' => __( 'New Feed Category', 'feedzy-rss-feeds' ),
286-
'view_item' => __( 'View Category', 'feedzy-rss-feeds' ),
287-
'search_items' => __( 'Search Category', 'feedzy-rss-feeds' ),
288-
'not_found' => __( 'No categories found', 'feedzy-rss-feeds' ),
289-
'not_found_in_trash' => __( 'No categories in the trash', 'feedzy-rss-feeds' ),
280+
'name' => __( 'Feed Groups', 'feedzy-rss-feeds' ),
281+
'singular_name' => __( 'Feed Group', 'feedzy-rss-feeds' ),
282+
'add_new' => __( 'Add Group', 'feedzy-rss-feeds' ),
283+
'add_new_item' => __( 'Add Group', 'feedzy-rss-feeds' ),
284+
'edit_item' => __( 'Edit Group', 'feedzy-rss-feeds' ),
285+
'new_item' => __( 'New Feed Group', 'feedzy-rss-feeds' ),
286+
'view_item' => __( 'View Group', 'feedzy-rss-feeds' ),
287+
'search_items' => __( 'Search Group', 'feedzy-rss-feeds' ),
288+
'not_found' => __( 'No groups found', 'feedzy-rss-feeds' ),
289+
'not_found_in_trash' => __( 'No groups in the trash', 'feedzy-rss-feeds' ),
290290
);
291291
$supports = array(
292292
'title',
@@ -346,7 +346,7 @@ public function register_admin_capabilities() {
346346
public function add_feedzy_post_type_metaboxes() {
347347
add_meta_box(
348348
'feedzy_category_feeds',
349-
__( 'Category Feeds', 'feedzy-rss-feeds' ),
349+
__( 'Group Feeds', 'feedzy-rss-feeds' ),
350350
array(
351351
$this,
352352
'feedzy_category_feed',
@@ -413,7 +413,7 @@ public function feedzy_category_feed() {
413413
. '</strong><br/><br/>'
414414
. $invalid
415415
. '<textarea name="feedzy_category_feed" rows="15" class="widefat" placeholder="' . __( 'Place your URL\'s here followed by a comma.', 'feedzy-rss-feeds' ) . '" >' . $feed . '</textarea>
416-
<p><a href="' . esc_url( 'https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation#categories' ) . '" target="_blank">' . __( 'Learn how to organize feeds in Categories', 'feedzy-rss-feeds' ) . '</a></p>
416+
<p><a href="' . esc_url( 'https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation#categories' ) . '" target="_blank">' . __( 'Learn how to organize feeds in Groups', 'feedzy-rss-feeds' ) . '</a></p>
417417
';
418418
echo wp_kses( $output, apply_filters( 'feedzy_wp_kses_allowed_html', array() ) );
419419
}
@@ -482,7 +482,7 @@ public function save_feedzy_post_type_meta( $post_id, $post ) {
482482
* @return array
483483
*/
484484
public function feedzy_category_columns( $columns ) {
485-
$columns['title'] = __( 'Category Title', 'feedzy-rss-feeds' );
485+
$columns['title'] = __( 'Group Title', 'feedzy-rss-feeds' );
486486
if ( $new_columns = $this->array_insert_before( 'date', $columns, 'slug', __( 'Slug', 'feedzy-rss-feeds' ) ) ) {
487487
$columns = $new_columns;
488488
} else {

‎includes/admin/feedzy-rss-feeds-import.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -668,10 +668,10 @@ public function manage_feedzy_import_columns( $column, $post_id ) {
668668
if ( in_array( $src_path, $amazon_hosts, true ) ) {
669669
$src = sprintf( '%s: %s%s%s', __( 'Amazon Product Advertising API', 'feedzy-rss-feeds' ), '<a>', $src, '</a>' );
670670
} else {
671-
$src = sprintf( '%s: %s%s%s', __( 'Feed Category', 'feedzy-rss-feeds' ), '<a href="' . admin_url( 'edit.php?post_type=feedzy_categories' ) . '" target="_blank">', $src, '</a>' );
671+
$src = sprintf( '%s: %s%s%s', __( 'Feed Group', 'feedzy-rss-feeds' ), '<a href="' . admin_url( 'edit.php?post_type=feedzy_categories' ) . '" target="_blank">', $src, '</a>' );
672672
}
673673
} else {
674-
$src = sprintf( '%s: %s%s%s', __( 'Feed Category', 'feedzy-rss-feeds' ), '<a href="' . admin_url( 'edit.php?post_type=feedzy_categories' ) . '" target="_blank">', $src, '</a>' );
674+
$src = sprintf( '%s: %s%s%s', __( 'Feed Group', 'feedzy-rss-feeds' ), '<a href="' . admin_url( 'edit.php?post_type=feedzy_categories' ) . '" target="_blank">', $src, '</a>' );
675675
}
676676
} else {
677677
// else link it to the feed but shorten it if it is too long.
@@ -1230,10 +1230,13 @@ public function run_cron( $max = 100 ) {
12301230
$max = 10;
12311231
}
12321232
global $post;
1233-
$args = array(
1234-
'post_type' => 'feedzy_imports',
1235-
'post_status' => 'publish',
1236-
'numberposts' => 99,
1233+
$args = apply_filters(
1234+
'feedzy_run_cron_get_posts_args',
1235+
array(
1236+
'post_type' => 'feedzy_imports',
1237+
'post_status' => 'publish',
1238+
'numberposts' => 99,
1239+
)
12371240
);
12381241

12391242
$feedzy_imports = get_posts( $args );

‎includes/layouts/settings.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,22 @@
88

99
$help_btn_url = 'https://docs.themeisle.com/category/712-feedzy';
1010

11-
if ( 'headers' === $active_tab ) {
11+
if ( 'general' === $active_tab ) {
12+
$help_btn_url = 'https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation#general';
13+
} elseif ( 'headers' === $active_tab ) {
1214
$help_btn_url = 'https://docs.themeisle.com/article/713-how-to-change-user-agent-in-feedzy';
1315
} elseif ( 'proxy' === $active_tab ) {
1416
$help_btn_url = 'https://docs.themeisle.com/article/714-how-to-use-proxy-settings-in-feezy';
1517
} elseif ( 'misc' === $active_tab ) {
1618
$help_btn_url = 'https://docs.themeisle.com/article/841-how-to-add-canonical-tags-for-imported-posts';
19+
} elseif ( 'openai' === $active_tab ) {
20+
$help_btn_url = 'https://docs.themeisle.com/article/1962-how-to-paraphrase-using-chatgpt-in-feed-to-post';
1721
} elseif ( 'wordai' === $active_tab ) {
1822
$help_btn_url = 'https://docs.themeisle.com/article/746-how-to-use-wordai-to-rephrase-rss-content-in-feedzy#wordai';
1923
} elseif ( 'spinnerchief' === $active_tab ) {
2024
$help_btn_url = 'https://docs.themeisle.com/article/746-how-to-use-wordai-to-rephrase-rss-content-in-feedzy#spinner';
25+
} elseif ( 'amazon-product-advertising' === $active_tab ) {
26+
$help_btn_url = 'https://docs.themeisle.com/article/1745-how-to-display-amazon-products-using-feedzy';
2127
}
2228
?>
2329
<?php if ( $this->notice ) { ?>

‎includes/layouts/setup-wizard.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
sprintf(
128128
// translators: %1$s and %2$s are HTML tags for the link to the demo URL.
129129
__( 'No Feed URL? %1$s Click here %2$s to use demo URL', 'feedzy-rss-feeds' ),
130-
'<a target="_blank" class="feed-demo-link" href="' . esc_url( 'https://www.codeinwp.com/feed/' ) . '" >',
130+
'<a target="_blank" class="feed-demo-link" href="' . esc_url( 'https://wpshout.com/feed/' ) . '" >',
131131
'</a>'
132132
)
133133
);

‎includes/views/import-metabox-edit.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class="dashicons dashicons-external"></i></a>
8181
<div class="dropdown">
8282
<button type="button" class="btn btn-outline-primary dropdown-toggle" aria-haspopup="true"
8383
aria-expanded="false">
84-
<?php esc_html_e( 'Use Feed Category', 'feedzy-rss-feeds' ); ?> <span
84+
<?php esc_html_e( 'Use Feed Group', 'feedzy-rss-feeds' ); ?> <span
8585
class="dashicons dashicons-arrow-down-alt2"></span>
8686
</button>
8787
<div class="dropdown-menu dropdown-menu-right">
@@ -95,8 +95,8 @@ class="dashicons dashicons-arrow-down-alt2"></span>
9595
} else {
9696
?>
9797
<div class="no-data p-8">
98-
<div class="help-text"><?php esc_html_e( 'You don&#8217;t have any categories, yet.', 'feedzy-rss-feeds' ); ?></div>
99-
<div class="cta-text"><a href="<?php echo esc_url( add_query_arg( 'post_type', 'feedzy_categories', admin_url( 'post-new.php' ) ) ); ?>" target="_blank"><?php esc_html_e( 'Add a Category', 'feedzy-rss-feeds' ); ?></a></div>
98+
<div class="help-text"><?php esc_html_e( 'You don&#8217;t have any groups, yet.', 'feedzy-rss-feeds' ); ?></div>
99+
<div class="cta-text"><a href="<?php echo esc_url( add_query_arg( 'post_type', 'feedzy_categories', admin_url( 'post-new.php' ) ) ); ?>" target="_blank"><?php esc_html_e( 'Add a Group', 'feedzy-rss-feeds' ); ?></a></div>
100100
</div>
101101
<?php
102102
}
@@ -645,7 +645,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
645645
</div>
646646
<div class="help-text">
647647
<?php
648-
esc_html_e( 'Add magic tags to extract custom elements from your feed. This will work only for single-feeds, not feed categories.', 'feedzy-rss-feeds' );
648+
esc_html_e( 'Add magic tags to extract custom elements from your feed. This will work only for single-feeds, not feed groups.', 'feedzy-rss-feeds' );
649649
?>
650650
</div>
651651
</div>

‎js/FeedzyBlock/Editor.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ class Editor extends Component {
405405
<TextControl
406406
type="url"
407407
className="feedzy-source"
408-
placeholder={ __( 'Enter URL or category of your feed here...', 'feedzy-rss-feeds' ) }
408+
placeholder={ __( 'Enter URL or group of your feed here...', 'feedzy-rss-feeds' ) }
409409
onChange={ this.onChangeFeed }
410410
onKeyUp={ this.handleKeyUp }
411411
value={ this.props.attributes.feeds }
@@ -437,8 +437,8 @@ class Editor extends Component {
437437
),
438438
( this.state.error ) && <div>{ __( 'Feed URL is invalid or unreachable by WordPress SimplePie and will NOT display items.', 'feedzy-rss-feeds') }</div>,
439439
<p>
440-
{ __( 'Enter the full URL of the feed source you wish to display here, or the name of a category you\'ve created. Also you can add multiple URLs just separate them with a comma. You can manage your categories feed from', 'feedzy-rss-feeds') }
441-
<a href="edit.php?post_type=feedzy_categories" title={ __( 'feedzy categories ', 'feedzy-rss-feeds' ) } target="_blank">{ __( 'here ', 'feedzy-rss-feeds' ) }</a>
440+
{ __( 'Enter the full URL of the feed source you wish to display here, or the name of a group you\'ve created. Also you can add multiple URLs just separate them with a comma. You can manage your groups feed from ', 'feedzy-rss-feeds') }
441+
<a href="edit.php?post_type=feedzy_categories" title={ __( 'Feedzy Groups ', 'feedzy-rss-feeds' ) } target="_blank">{ __( 'here ', 'feedzy-rss-feeds' ) }</a>
442442
</p>
443443
] }
444444
</Placeholder>

‎js/Onboarding/import-onboarding.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const Onboarding = () => {
5959
},
6060
{
6161
target: '.fz-input-group-left .fz-input-icon',
62-
content: __( 'Add here your RSS feed URL which Feedzy will use to fetch the content from. You can use Feedzy\'s Feed categories too.', 'feedzy-rss-feeds' ),
62+
content: __( 'Add here your RSS feed URL which Feedzy will use to fetch the content from. You can use Feedzy\'s Feed Groups too.', 'feedzy-rss-feeds' ),
6363
},
6464
{
6565
target: '#fz-import-filters',

0 commit comments

Comments
 (0)