From 293678e2649784a383549b4f72987c30ae04fed4 Mon Sep 17 00:00:00 2001 From: filip Date: Sat, 28 Apr 2018 15:16:43 +0200 Subject: proper blog/planet source description + remove description if neither works --- en/index.php | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'en/index.php') diff --git a/en/index.php b/en/index.php index 3015df71b..f663be13a 100755 --- a/en/index.php +++ b/en/index.php @@ -230,21 +230,34 @@ $dictionary = read_translation_file($locale, array('index', 'news', 'common_foot
'; - $prefix .= sprintf(_r('Latest news from our blog:'), _r('https://blog.mageia.org/en/')); - $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); + $loc_blog_url = _r('https://blog.mageia.org/en/'); + $eng_planet_url = 'https://planet.mageia.org/en/'; + $eng_blog_url = 'https://blog.mageia.org/en/'; + $fresh_blog_post_titles = prepare_fresh_blog_post_titles($eng_planet_url, $eng_blog_url, $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]; + $first_source = $fresh_blog_post_titles[5]; $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); + if (0 < $num_fresh_loc_posts || 0 < $num_fresh_eng_posts) { + $prefix = ''; + if ($first_source == 1) { + $prefix .= sprintf(_r('Latest news from our localized planet:'), $loc_planet_url); + } else if ($first_source == 2) { + $prefix .= sprintf(_r('Latest news from our localized blog:'), $loc_blog_url); + } else if ($first_source == 3) { + $prefix .= sprintf(_r('Latest news from our English planet:'), $eng_planet_url); + } else if ($first_source == 4) { + $prefix .= sprintf(_r('Latest news from our English blog:'), $eng_blog_url); + } + $prefix .= ' '; + + if (0 < $num_fresh_loc_posts) { + show_feed($locale, null, '', '', 0, null, true, $prefix, $fresh_loc_posts); + } else if (0 < $num_fresh_eng_posts) { + show_feed($locale, null, '', '', 0, null, true, $prefix, $fresh_eng_posts); + } } ?>
-- cgit v1.2.1