Merge branch 'release/1.7.1'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+*1.7.1* (2019-11-05)
+- Fix polylex categories names (#242)
+
 *1.7.0* (2019-10-30)
 - Update to Elements 2.2.0 https://github.com/epfl-idevelop/elements
 

wp-theme-2018/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

wp-theme-2018/languages/fr_FR.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: epfl\n"
-"POT-Creation-Date: 2019-09-02 12:41+0200\n"
-"PO-Revision-Date: 2019-09-02 12:42+0200\n"
+"POT-Creation-Date: 2019-11-04 18:08+0100\n"
+"PO-Revision-Date: 2019-11-04 18:09+0100\n"
 "Last-Translator: Charmier Grégory <[email protected]>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-KeywordsList: __;esc_html__;esc_html_e;_e\n"
@@ -124,7 +124,7 @@ msgstr "Rerchercher sur le Web de l'EPFL"
 #: shortcodes/custom_teasers/shortcake.php:28
 #: shortcodes/custom_teasers/view.php:44
 #: shortcodes/epfl_labs_search/view.php:56
-#: shortcodes/epfl_polylex_search/view.php:82
+#: shortcodes/epfl_polylex_search/view.php:93
 #: shortcodes/introduction/shortcake.php:8 shortcodes/schools/shortcake.php:15
 msgid "Title"
 msgstr "Titre"
@@ -304,7 +304,6 @@ msgstr "Lieu et salle"
 
 #: shortcodes/epfl_memento/templates/card-info.php:34
 #: shortcodes/epfl_memento/templates/card-info.php:36
-#: shortcodes/epfl_polylex_search/view.php:83
 msgid "Category"
 msgstr "Catégorie"
 
@@ -357,22 +356,26 @@ msgid "Office"
 msgstr "Bureau"
 
 #: shortcodes/epfl_polylex_search/view.php:13
-msgid "All categories"
-msgstr "Toutes les catégories"
+msgid "All sections"
+msgstr "Toutes les rubriques"
 
-#: shortcodes/epfl_polylex_search/view.php:33
-msgid "All subcategories"
-msgstr "Toutes les sous-catégories"
+#: shortcodes/epfl_polylex_search/view.php:35
+msgid "All subsections"
+msgstr "Toutes les sous-rubriques"
 
-#: shortcodes/epfl_polylex_search/view.php:58
+#: shortcodes/epfl_polylex_search/view.php:69
 msgid "Search a number or a keyword"
 msgstr "Chercher un numéro ou un mot-clé"
 
-#: shortcodes/epfl_polylex_search/view.php:106
+#: shortcodes/epfl_polylex_search/view.php:94
+msgid "Section, subsection"
+msgstr "Rubrique, sous-rubrique"
+
+#: shortcodes/epfl_polylex_search/view.php:117
 msgid "Effective on"
 msgstr "Entrée en vigueur au"
 
-#: shortcodes/epfl_polylex_search/view.php:112
+#: shortcodes/epfl_polylex_search/view.php:123
 msgid "Status as of"
 msgstr "Etat au"
 
@@ -555,6 +558,12 @@ msgstr "Continuer la lecture<span class=\"screen-reader-text\"> \"%s\"</span>"
 msgid "Pages:"
 msgstr "Pages :"
 
+#~ msgid "All categories"
+#~ msgstr "Toutes les rubriques"
+
+#~ msgid "Category, subcategory"
+#~ msgstr "Rubrique, Sous-rubrique"
+
 #~ msgid "Search inside"
 #~ msgstr "Rechercher dans"
 

wp-theme-2018/shortcodes/epfl_polylex_search/view.php

@@ -10,7 +10,7 @@
         $category_options .= " selected";
     }
 
-    $category_options .= ' value="all">' . __('All categories', 'epfl') . '</option>';
+    $category_options .= ' value="all">' . __('All sections', 'epfl') . '</option>';
 
     // Build category combo list
     ksort($combo_list_contents);
@@ -32,7 +32,7 @@
         $subcategory_options .= " selected";
     }
 
-    $subcategory_options .= ' value="all">' . __('All subcategories', 'epfl') . '</option>';
+    $subcategory_options .= ' value="all">' . __('All subsections', 'epfl') . '</option>';
     $all_subcategories = [];
 
     foreach($combo_list_contents as $categ => $subcategories) {
@@ -91,7 +91,7 @@ class="epfl-lexes-select custom-select mr-2"
         <div id="sorting-header" class="flex-row d-md-flex pt-1 pb-1 border-bottom mb-2">
                 <div class="sort col-1 pr-0 pl-1" data-sort="lex-number"><a href="#" onclick="return false;"><strong>Lex</strong></a></div>
                 <div class="sort col-7" data-sort="lex-title"><a href="#" onclick="return false;"><strong><?php _e('Title', 'epfl') ?></strong></a></div>
-                <div class="sort col-4" data-sort="lex-category-subcategory"><a href="#" onclick="return false;"><strong><?php _e('Category', 'epfl') ?></strong></a></div>
+                <div class="sort col-4" data-sort="lex-category-subcategory"><a href="#" onclick="return false;"><strong><?php _e('Section, subsection', 'epfl') ?></strong></a></div>
         </div>
 
         <div class="list">

wp-theme-2018/style.css

@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.7.0
+Version: 1.7.1
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl