Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,6 @@ input.fz-switch-toggle[type=checkbox]:checked:before{
outline: 0;
cursor: pointer;
text-decoration: none;
text-transform: capitalize;
-webkit-transition: all 0.3s ease-in-out;
-moz-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
Expand Down Expand Up @@ -1564,7 +1563,6 @@ input.fz-switch-toggle[type=checkbox]:checked:before{
background: transparent;
border-color: #4268CF;
color: #4268CF;
text-transform: capitalize;
-webkit-transition: all 0.3s ease-in-out;
-moz-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
Expand Down Expand Up @@ -2250,7 +2248,6 @@ li.draggable-item .components-panel__body-toggle.components-button{
}
.fz-content-action div .tagify__tag-text {
padding-right: 10px;
text-transform: capitalize;
}
.popover-action-list ul li.fz-action-disabled {
cursor: not-allowed !important;
Expand Down
22 changes: 22 additions & 0 deletions feedzy-rss-feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,28 @@ function ( $labels ) {
);
}

if ( isset( $labels['about_us'] ) ) {
$labels['about_us'] = array_merge(
$labels['about_us'],
array(
'title' => __( 'About Us', 'feedzy-rss-feeds' ),
'heroHeader' => __( 'Our Story', 'feedzy-rss-feeds' ),
'heroTextFirst' => __( 'Themeisle was founded in 2012 by a group of passionate developers who wanted to create beautiful and functional WordPress themes and plugins. Since then, we have grown into a team of over 20 dedicated professionals who are committed to delivering the best possible products to our customers.', 'feedzy-rss-feeds' ),
'heroTextSecond' => __( 'At Themeisle, we offer a wide range of WordPress themes and plugins that are designed to meet the needs of both beginners and advanced users. Our products are feature-rich, easy to use, and are designed to help you create beautiful and functional websites.', 'feedzy-rss-feeds' ),
'teamImageCaption' => __( 'Our team in WCEU2022 in Portugal', 'feedzy-rss-feeds' ),
'newsHeading' => __( 'Stay connected for news & updates!', 'feedzy-rss-feeds' ),
'emailPlaceholder' => __( 'Your email address', 'feedzy-rss-feeds' ),
'signMeUp' => __( 'Sign me up', 'feedzy-rss-feeds' ),
'installNow' => __( 'Install Now', 'feedzy-rss-feeds' ),
'activate' => __( 'Activate', 'feedzy-rss-feeds' ),
'learnMore' => __( 'Learn More', 'feedzy-rss-feeds' ),
'installed' => __( 'Installed', 'feedzy-rss-feeds' ),
'notInstalled' => __( 'Not Installed', 'feedzy-rss-feeds' ),
'active' => __( 'Active', 'feedzy-rss-feeds' ),
)
);
}

return $labels;
}
);
2 changes: 1 addition & 1 deletion includes/admin/feedzy-rss-feeds-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ public function feedzy_category_feed() {
<strong>' .
sprintf(
// translators: %1$s and %2$s are placeholders for HTML anchor tags.
__( 'Please be aware that multiple feeds, when mashed together, may sometimes not work as expected as explained %1$s here %2$s.', 'feedzy-rss-feeds' ),
__( 'Please be aware that multiple feeds, when mashed together, may sometimes not work as expected as explained %1$shere%2$s.', 'feedzy-rss-feeds' ),
'<a href="' . esc_url( 'https://simplepie.org/wiki/faq/typical_multifeed_gotchas' ) . '" target="_blank">',
'</a>'
)
Expand Down
57 changes: 46 additions & 11 deletions includes/admin/feedzy-rss-feeds-import.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,12 @@ public function upsell_content( $content, $area, $location ) {
<div class="only-pro-content">
<div class="only-pro-container">
<div class="only-pro-inner upgrade-alert">
' . __( 'This feature is available in the Pro version. Unlock more features, by', 'feedzy-rss-feeds' ) . '
<a target="_blank" href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, $area, $location ) ) ) . '" title="' . __( 'Buy Now', 'feedzy-rss-feeds' ) . '">' . __( 'upgrading to Feedzy Pro', 'feedzy-rss-feeds' ) . '</a>
' . sprintf(
// translators: %1$s and %2$s are HTML tags for the link to the upsell URL.
__( 'This feature is available in the Pro version. Unlock more features, by %1$supgrading to Feedzy Pro%2$s', 'feedzy-rss-feeds' ),
'<a target="_blank" href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, $area, $location ) ) ) . '" title="' . __( 'Buy Now', 'feedzy-rss-feeds' ) . '">',
'</a>'
) . '
</div>
</div>
</div>';
Expand Down Expand Up @@ -434,8 +438,14 @@ public function feedzy_import_feed_options() {
'posts_per_page' => 100,
);
$feed_categories = get_posts( $args );
$post_types = get_post_types( '', 'names' );
$post_types = array_diff( $post_types, array( 'feedzy_imports', 'feedzy_categories' ) );
$post_types = get_post_types( '', 'objects' );
$post_types = array_diff_key(
$post_types,
array(
'feedzy_imports' => array(),
'feedzy_categories' => array(),
)
);
$published_status = array( 'publish', 'draft' );

$authors = get_users( array( 'number' => 100 ) );
Expand Down Expand Up @@ -929,11 +939,27 @@ public function manage_feedzy_import_columns( $column, $post_id ) {
$then = new DateTime();
$then = $then->setTimestamp( $last );
$in = $now->diff( $then );
$msg = sprintf(
// translators: %1$d: number of hours, %2$d: number of minutes.
__( 'Ran %1$d hours %2$d minutes ago', 'feedzy-rss-feeds' ),
$in->format( '%h' ),
$in->format( '%i' )

$hours = (int) $in->format( '%h' );
$minutes = (int) $in->format( '%i' );

$hours_text = sprintf(
// translators: %d: number of hours.
_n( '%d hour', '%d hours', $hours, 'feedzy-rss-feeds' ),
$hours
);

$minutes_text = sprintf(
// translators: %d: number of minutes.
_n( '%d minute', '%d minutes', $minutes, 'feedzy-rss-feeds' ),
$minutes
);

$msg = sprintf(
// translators: %1$s: hours text, %2$s: minutes text.
__( 'Ran %1$s %2$s ago', 'feedzy-rss-feeds' ),
$hours_text,
$minutes_text
);
}

Expand Down Expand Up @@ -2724,7 +2750,12 @@ function ( $term ) {
Feedzy_Rss_Feeds_Log::error(
sprintf(
// translators: %1$d is the number of items without images, %2$d is the total number of items imported.
__( 'Unable to find an image for %1$d out of %2$d items imported', 'feedzy-rss-feeds' ),
_n(
'Unable to find an image for %1$d out of %2$d item imported',
'Unable to find an image for %1$d out of %2$d items imported',
$count,
'feedzy-rss-feeds'
),
$import_image_errors,
$count
),
Expand Down Expand Up @@ -3663,7 +3694,11 @@ public function add_import_actions( $actions, $post ) {
} elseif ( 1 === intval( get_post_meta( $post->ID, 'feedzy', true ) ) ) {
// show an unclickable action that mentions that it is imported by us so that users are aware.
$feedzy_job_id = get_post_meta( $post->ID, 'feedzy_job', true );
$actions['feedzy'] = sprintf( '(%s %s)', __( 'Imported by Feedzy from', 'feedzy-rss-feeds' ), get_the_title( $feedzy_job_id ) );
$actions['feedzy'] = sprintf(
// translators: %s is the title of job.
__( 'Imported by Feedzy from %s', 'feedzy-rss-feeds' ),
get_the_title( $feedzy_job_id )
);
}

return $actions;
Expand Down
30 changes: 10 additions & 20 deletions includes/admin/feedzy-rss-feeds-ui-lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,17 @@ public static function get_form_defaults() {
*/
public static function get_form_elements() {
$meta = sprintf(
// translators: 1: <code> tag for author, 2: closing </code> tag, 3: <code> tag for date, 4: closing </code> tag, 5: <code> tag for time, 6: closing </code> tag, 7: <a> tag for documentation link, 8: closing </a> tag.
__( 'Should we display additional meta fields out of %1$s author %2$s, %3$s date %4$s and %5$s time %6$s? (comma-separated list, in order of display). View documentation %7$s here %8$s.', 'feedzy-rss-feeds' ),
'<code>',
'</code>',
'<code>',
'</code>',
// translators: 1: <code> tag for author, 2: closing </code> tag, 3: <a> tag for documentation link, 4: closing </a> tag.
__( 'Should we display additional meta fields out of %1$sauthor%2$s, %3$sdate%4$s and %5$stime%6$s? (comma-separated list, in order of display). View documentation %3$shere%4$s.', 'feedzy-rss-feeds' ),
'<code>',
'</code>',
'<a href="' . esc_url( 'https://docs.themeisle.com/article/1089-how-to-display-author-date-or-time-from-the-feed' ) . '" target="_new">',
'</a>'
);
if ( has_filter( 'feedzy_retrieve_categories' ) ) {
$meta = sprintf(
// translators: 1: <code> tag for author, 2: closing </code> tag, 3: <code> tag for date, 4: closing </code> tag, 5: <code> tag for time, 6: closing </code> tag, 7: <code> tag for categories, 8: closing </code> tag, 9: <a> tag for documentation link, 10: closing </a> tag.
__( 'Should we display additional meta fields out of %1$s author%2$s, %3$s date%4$s, %5$s time %6$s and %7$s categories %8$s? (comma-separated list). View documentation %9$s here %10$s.', 'feedzy-rss-feeds' ),
'<code>',
'</code>',
'<code>',
'</code>',
'<code>',
'</code>',
// translators: %1$s is <code> tag, %2$s is closing </code> tag, %3$s is <a> tag for documentation link, %4$s: closing </a> tag.
__( 'Should we display additional meta fields out of %1$sauthor%2$s, %1$sdate%2$s, %1$stime%2$s and %1$scategories%2$s? (comma-separated list). View documentation %3$shere%4$s.', 'feedzy-rss-feeds' ),
'<code>',
'</code>',
'<a href="' . esc_url( 'https://docs.themeisle.com/article/1089-how-to-display-author-date-or-time-from-the-feed' ) . '" target="_new">',
Expand All @@ -120,7 +110,7 @@ public static function get_form_elements() {

$multiple = sprintf(
// translators: 1: <code> tag for source, 2: closing </code> tag.
__( 'When using multiple sources, should we display additional meta fields? %1$s source %2$s (feed title).', 'feedzy-rss-feeds' ),
__( 'When using multiple sources, should we display additional meta fields?%1$ssource%2$s(feed title).', 'feedzy-rss-feeds' ),
'<code>',
'</code>'
);
Expand All @@ -134,7 +124,7 @@ public static function get_form_elements() {
__( 'The feed(s) URL (comma-separated list).', 'feedzy-rss-feeds' ) . ' ' .
sprintf(
// translators: 1: <a> tag opening, 2: </a> tag closing.
__( 'Click %1$s here %2$s to check if feed is valid.', 'feedzy-rss-feeds' ),
__( 'Click %1$shere%2$s to check if feed is valid.', 'feedzy-rss-feeds' ),
'<a href="' . esc_url( 'https://validator.w3.org/feed/' ) . '" target="_new">',
'</a>'
)
Expand Down Expand Up @@ -484,12 +474,12 @@ public static function get_form_elements() {
),
'section_pro' => array(
'title' => __( 'PRO Options', 'feedzy-rss-feeds' ),
'description' => __( 'Get access to more options and customizations with full version of Feedzy RSS Feeds . Use existing templates or extend them and make them your own.', 'feedzy-rss-feeds' ) . '<br/><a href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'sectionpro' ) ) ) . '" target="_blank"><small>' . __( 'See more features of Feedzy RSS Feeds PRO', 'feedzy-rss-feeds' ) . '</small></a>',
'description' => __( 'Get access to more options and customizations with full version of Feedzy RSS Feeds. Use existing templates or extend them and make them your own.', 'feedzy-rss-feeds' ) . '<br/><a href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'sectionpro' ) ) ) . '" target="_blank"><small>' . __( 'See more features of Feedzy RSS Feeds PRO', 'feedzy-rss-feeds' ) . '</small></a>',
'elements' => array(
'price' => array(
'label' => sprintf(
// translators: 1: <br/> tag, 2: <a> tag opening, 3: </a> tag closing.
__( 'Should we display the price from the feed if it is available? %1$s You can read about how to extract price from a custom tag %2$s here %3$s', 'feedzy-rss-feeds' ),
__( 'Should we display the price from the feed if it is available?%1$sYou can read about how to extract price from a custom tag %2$shere%3$s', 'feedzy-rss-feeds' ),
'<br/>',
'<a href="' . esc_url( 'https://docs.themeisle.com/article/977-how-do-i-extract-values-from-custom-tags-in-feedzy' ) . '" target="_blank">',
'</a>'
Expand All @@ -511,7 +501,7 @@ public static function get_form_elements() {
'referral_url' => array(
'label' => sprintf(
// translators: 1: <a> tag opening, 2: </a> tag closing.
__( 'Referral URL parameters as per %1$s this document here %2$s', 'feedzy-rss-feeds' ),
__( 'Referral URL parameters as per %1$sthis document here%2$s', 'feedzy-rss-feeds' ),
'<a href="' . esc_url( 'https://docs.themeisle.com/article/1073-how-to-add-referral-parameters-in-feedzy' ) . '" target="_blank">',
'</a>'
),
Expand All @@ -531,7 +521,7 @@ public static function get_form_elements() {
'mapping' => array(
'label' => sprintf(
// translators: 1: <a> tag opening, 2: </a> tag closing.
__( 'Provide mapping for custom feed elements as per %1$s this document here %2$s. This will only work for single feeds, not comma-separated feeds.', 'feedzy-rss-feeds' ),
__( 'Provide mapping for custom feed elements as per %1$sthis document here%2$s. This will only work for single feeds, not comma-separated feeds.', 'feedzy-rss-feeds' ),
'<a href="' . esc_url( 'https://docs.themeisle.com/article/977-how-do-i-extract-values-from-custom-tags-in-feedzy' ) . '" target="_blank">',
'</a>'
),
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/feedzy-rss-feeds-ui.php
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public function feedzy_import_post_title_section() {

$content = __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
$content .= wp_sprintf( __( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s and get 50%% off.', 'feedzy-rss-feeds' ), '<a href="' . esc_url( $upgrade_url ) . '" target="_blank">', '</a>' );
$content .= wp_sprintf( __( 'Unlock more powerful features, by %1$supgrading to Feedzy Pro%2$s and get 50%% off.', 'feedzy-rss-feeds' ), '<a href="' . esc_url( $upgrade_url ) . '" target="_blank">', '</a>' );

echo wp_kses_post( $content );
?>
Expand Down
6 changes: 3 additions & 3 deletions includes/elementor/widgets/register-widget.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ protected function register_controls() { // phpcs:ignore PSR2.Methods.MethodDecl
'type' => Controls_Manager::TEXTAREA,
'description' => wp_sprintf(
// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
__( 'You can add multiple sources at once, by separating them with commas. %1$s Click here %2$s to check if the feed is valid. Invalid feeds may not import anything.', 'feedzy-rss-feeds' ),
__( 'You can add multiple sources at once, by separating them with commas. %1$sClick here%2$s to check if the feed is valid. Invalid feeds may not import anything.', 'feedzy-rss-feeds' ),
'<a href="' . esc_url( 'https://validator.w3.org/feed/' ) . '" class="feedzy-source" target="_blank">',
'</a>'
),
Expand Down Expand Up @@ -505,7 +505,7 @@ protected function register_controls() { // phpcs:ignore PSR2.Methods.MethodDecl
'description' => wp_sprintf(
// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
__(
'Learn more about this feature in %1$s Feedzy docs %2$s .',
'Learn more about this feature in %1$sFeedzy docs%2$s.',
'feedzy-rss-feeds'
),
'<a target="_blank" href="' . esc_url( 'https://docs.themeisle.com/article/923-how-price-is-displayed-from-the-feed' ) . '">',
Expand Down Expand Up @@ -572,7 +572,7 @@ protected function register_controls() { // phpcs:ignore PSR2.Methods.MethodDecl
! feedzy_is_pro() ?
wp_sprintf(
// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
__( 'Unlock this feature and more advanced options with %1$s Feedzy Pro %1$s.', 'feedzy-rss-feeds' ),
__( 'Unlock this feature and more advanced options with %1$sFeedzy Pro%2$s.', 'feedzy-rss-feeds' ),
'<a target="_blank" href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'refferal', 'widget-area' ) ) ) . '">',
'</a>'
)
Expand Down
5 changes: 3 additions & 2 deletions includes/layouts/feedzy-improve.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
<h3 class="h3 pb-16"><?php esc_html_e( 'Answer a few questions to help us improve Feedzy', 'feedzy-rss-feeds' ); ?></h3>
<p>
<?php
esc_html_e( 'We\'re always looking for suggestions to further improve Feedzy.', 'feedzy-rss-feeds' );
if ( ! feedzy_is_pro() ) {
esc_html_e( 'If your feedback is especially helpful and we choose to do an interview with you to discuss your suggestions, you will even gain a yearly membership for free for your trouble.', 'feedzy-rss-feeds' );
esc_html_e( 'We\'re always looking for suggestions to further improve Feedzy. If your feedback is especially helpful and we choose to do an interview with you to discuss your suggestions, you will even gain a yearly membership for free for your trouble.', 'feedzy-rss-feeds' );
} else {
esc_html_e( 'We\'re always looking for suggestions to further improve Feedzy.', 'feedzy-rss-feeds' );
}
?>
</p>
Expand Down
Loading
Loading