Merge branch 'release/1.4.5'

epfl-si · May 23, 2019 · 42a05f7 · 42a05f7
2 parents 118c52c + e7ffaf7
commit 42a05f7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+*1.4.5* (2019-05-23)
+- Shortcode News: visual_url dimension change (#210)
+- Shortcode News: update all news links (#208)
+
 *1.4.4* (2019-05-09)
 - Shortcode Memento: academic calendar (#207)
 

diff --git a/wp-theme-2018/VERSION b/wp-theme-2018/VERSION
@@ -1 +1 @@
-1.4.4
+1.4.5
diff --git a/wp-theme-2018/footer_en.php b/wp-theme-2018/footer_en.php
@@ -123,7 +123,7 @@
     <div class="collapse collapse-item" id="collapse-footer-4">
       <ul class="footer-links">
                   <li>
-                                    <a href="https://www.epfl.ch/innovation/about/domains/">Innovation domains</a>
+                                    <a href="https://www.epfl.ch/innovation/domains/">Innovation domains</a>
                       </li>
                   <li>
                                     <a href="https://www.epfl.ch/innovation/industry/"> Collaborate with industry</a>

diff --git a/wp-theme-2018/footer_fr.php b/wp-theme-2018/footer_fr.php
@@ -123,7 +123,7 @@
     <div class="collapse collapse-item" id="collapse-footer-4">
       <ul class="footer-links">
                   <li>
-                        <a href="https://www.epfl.ch/innovation/about/fr/domaines/">Domaines d'innovation</a>
+                        <a href="https://www.epfl.ch/innovation/domains/fr/domaines/">Domaines d'innovation</a>
                                   </li>
                   <li>
                         <a href="https://www.epfl.ch/innovation/industry/fr/industries/">Collaboration avec l'industrie</a>

diff --git a/wp-theme-2018/shortcodes/epfl_news/utils.php b/wp-theme-2018/shortcodes/epfl_news/utils.php
@@ -8,8 +8,13 @@
 function epfl_news_get_url_channel($data) {
     $url_channel = "";
     if (count($data) > 0) {
-        $channel = $data[0]->channel->name;
-        $url_channel = "https://actu.epfl.ch/search/" . $channel;
+        $url_channel = "https://actu.epfl.ch/search/";
+        if (get_locale() == 'fr_FR') {
+            $url_channel .= "fr/";
+        } else {
+            $url_channel .= "en/";
+        }
+        $url_channel .= $data[0]->channel->name;
     }
     return $url_channel;
 }
@@ -68,7 +73,7 @@ function epfl_news_get_subtitle($news) {
  * $news: news to display
  */
 function epfl_news_get_visual_url($news) {
-    return substr($news->visual_url, 0, -11) . '1296x728.jpg';
+    return $news->visual_url;
 }
 
 /**

diff --git a/wp-theme-2018/style.css b/wp-theme-2018/style.css
@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.4.4
+Version: 1.4.5
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl