show only recent planet&blog post

show localized planet if exists otherwise localized blog
if number of localized titles is less then required add
English planet and English blog as fallback

1 files changed, 12 insertions, 4 deletions

diff --git a/en/index.php b/en/index.php
index 8f4e2f130..3015df71b 100755
--- a/en/index.php
+++ b/en/index.php
@@ -233,10 +233,18 @@ $dictionary = read_translation_file($locale, array('index', 'news', 'common_foot
             $prefix  = '<span style="font-weight: bold;">';
             $prefix .= sprintf(_r('Latest news from our <a href="%s">blog</a>:'), _r('https://blog.mageia.org/en/'));
             $prefix .= '</span> ';
-            if (_r('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/') {
-                show_feed($locale, null, _r('https://planet.mageia.org/en/'), _r('https://planet.mageia.org/en/') . '?type=rss10', 1, null, true, $prefix);
-            } else {
-                show_feed($locale, null, _r('https://blog.mageia.org/en/'), _r('https://blog.mageia.org/en/') . '?feed=rss', 1, null, true, $prefix);
+            $loc_planet_url = _r('https://planet.mageia.org/en/');
+            $loc_blog_url = _r('https://blog.mageia.org/en/');
+            $fresh_blog_post_titles = prepare_fresh_blog_post_titles('https://planet.mageia.org/en/', 'https://blog.mageia.org/en/', $loc_planet_url, $loc_blog_url, 1, 1);
+            $fresh_loc_posts     = $fresh_blog_post_titles[1];
+            $num_fresh_loc_posts = $fresh_blog_post_titles[2];
+            $fresh_eng_posts     = $fresh_blog_post_titles[4];
+            $num_fresh_eng_posts = count($fresh_eng_posts);
+            if(0 != $num_fresh_loc_posts) {
+                show_feed($locale, null, '', '', 0, null, true, $prefix, $fresh_loc_posts);
+            }
+            if(0 != $num_fresh_eng_posts) {
+                show_feed($locale, null, '', '', 0, null, true, $prefix, $fresh_eng_posts);
             }
         ?>
         </div>