]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Added translations and tweak parameters
authorThomas Citharel <tcit@tcit.fr>
Sat, 5 Nov 2016 14:28:36 +0000 (15:28 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 28 Apr 2020 08:13:57 +0000 (10:13 +0200)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
15 files changed:
src/Wallabag/CoreBundle/Controller/EntryController.php
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig

index ff90957b9917661f879472a5186d28dea6ab26a1..5407d06578780227fe4a18eacc8b69463955e057 100644 (file)
@@ -532,9 +532,9 @@ class EntryController extends Controller
         $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
         $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
 
-        $sortBy = 'id';
-        if (in_array($request->get('sort', 'id'), ['id', 'created_at', 'title', 'updated_at'], true)) {
-            $sortBy = $request->get('sort', 'id');
+        $sortBy = 'createdAt';
+        if (in_array($request->get('sort', 'createdAt'), ['id', 'createdAt', 'title', 'updatedAt'], true)) {
+            $sortBy = $request->get('sort', 'createdAt');
         }
 
         $direction = 'DESC' === $request->get('direction') ? 'DESC' : 'ASC';
index 670c7f9d8ad986d9e9d34cc9f0723d740c3437c4..0c35f2f9265a5d9c527d5cf4b50ea18291b7b36e 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         # export: 'Export'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Indtast søgning'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Ryd'
             filter: 'Filter'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             # back_to_top: 'Back to top'
index 92984f468c75920962d31190bf9e1ec6acfa8e50..73ecebb9b03516f7535fa721b37ca2b3fc1de2c1 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         export: 'Exportieren'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Suchbegriff hier eingeben'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Zurücksetzen'
             filter: 'Filtern'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'Nach oben'
index 0a5af0855dc91a3ec0cbde6249a5d4144bd5d990..d5173707ecdb5d7ba585c8cae6f7865bf9485abc 100644 (file)
@@ -42,6 +42,7 @@ menu:
         random_entry: Jump to a random entry from that list
         export: 'Export'
         account: 'My account'
+        sort_entries: 'Sort entries'
     search_form:
         input_label: 'Enter your search here'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Clear'
             filter: 'Filter'
+    sort:
+        title: 'Sort options'
+        status_label: 'Sort by'
+        by:
+            creation_date: 'Creation date'
+            title: 'Title'
+            last_updated: 'Last updated'
+        ascending: 'Asencending'
+        descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'Back to top'
index cdc51a2bd68bc89fcaa81fe0fc5daff15b555244..1d834290ee944850419290e5fa5b8d1baacfcf22 100644 (file)
@@ -42,6 +42,7 @@ menu:
         random_entry: 'Ir a un artículo aleatório de esta lista'
         export: 'Exportar'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Introduzca su búsqueda aquí'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Limpiar'
             filter: 'Filtrar'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'Regrese al principio'
index 581e053a8f2303d918e522e4a37c1fae22820876..46e96c047a0b0401c2201f0cf40442c9a376d095 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         export: 'برون‌بری'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'جستجوی خود را این‌جا بنویسید:'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'از نو'
             filter: 'فیلتر'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'بازگشت به بالای صفحه'
index 2dd9245657ac3fbf4d0d7ab789910febd8f5b3ff..dc75f5c105769e9aaaa4fdf2701dd13327e8c81f 100644 (file)
@@ -42,6 +42,7 @@ menu:
         random_entry: Aller à un article aléatoire de cette liste
         export: "Exporter"
         account: "Mon compte"
+        sort_entries: 'Trier les articles'
     search_form:
         input_label: "Saisissez votre terme de recherche"
 
@@ -234,7 +235,7 @@ entry:
         export_title: "Exporter"
     filters:
         title: "Filtres"
-        status_label: "Status"
+        status_label: "Statut"
         archived_label: "Lus"
         starred_label: "Favoris"
         unread_label: "Non lus"
@@ -256,6 +257,15 @@ entry:
         action:
             clear: "Effacer"
             filter: "Filtrer"
+    sort:
+        title: 'Options de tri'
+        status_label: 'Trier par'
+        by:
+            creation_date: 'Date de création'
+            title: 'Titre'
+            last_updated: 'Dernière mise à jour'
+        ascending: 'Ascendant'
+        descending: 'Descendant'
     view:
         left_menu:
             back_to_top: "Revenir en haut"
index a05a6e6ed09a629bbffe12f513e626d4d8f666fb..804871b1cac00e9c15a0c86e7f612fce4f47fe01 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         export: 'Esporta'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Inserisci qui la tua ricerca'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Pulisci'
             filter: 'Filtra'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: "Torna all'inizio"
index 2c7af685c4721f3d87d03d248aea0cea71a41358..93b844d811b45f1e8771dfd696a7db019976cea3 100644 (file)
@@ -42,6 +42,7 @@ menu:
         random_entry: "Sautar a un article a l'azard"
         export: 'Exportar'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Picatz vòstre mot-clau a cercar aquí'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Escafar'
             filter: 'Filtrar'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'Tornar en naut'
index 877ff4aa6589768bd2117d040d8ebc4f35e5f0b4..0f0d83781738126bbeb7e0e03fbba04ecf1e1e86 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         export: 'Eksportuj'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Wpisz swoje zapytanie tutaj'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Wyczyść'
             filter: 'Filtruj'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'Wróć na górę'
index fc7239d9c7eae6d0d8d678d54648191b982395eb..5a403c2361b2f52d96c5b3ed12afa74a00a2dae5 100644 (file)
@@ -42,6 +42,7 @@ menu:
         random_entry: Ir para um artigo aleatório desta lista
         export: 'Exportar'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Digite aqui sua pesquisa'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Limpar'
             filter: 'Filtro'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             back_to_top: 'Voltar ao topo'
index 9b0cea506f5c9693560cfb337b5da47e274950e0..55fcead71877153a73a8d26c3cf54c52c43ce84d 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         # export: 'Export'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Introdu căutarea ta'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Șterge'
             filter: 'Filtru'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             # back_to_top: 'Back to top'
index f69f3c3249de301e7e4f5cf3f2ff8e3bb5863e76..0f5655faf1e62ea87a86b59fe0a6a55244a1f150 100644 (file)
@@ -42,6 +42,7 @@ menu:
         # random_entry: Jump to a random entry from that list
         export: 'Dışa Aktar'
         # account: 'My account'
+        # sort_entries: 'Sort entries'
     search_form:
         input_label: 'Aramak istediğiniz herhangi bir şey yazın'
 
@@ -256,6 +257,15 @@ entry:
         action:
             clear: 'Temizle'
             filter: 'Filtrele'
+    sort:
+        # title: 'Sort options'
+        # status_label: 'Sort by'
+        # by:
+        #    creation_date: 'Creation date'
+        #    title: 'Title'
+        #    last_updated: 'Last updated'
+        #ascending: 'Asencending'
+        # descending: 'Descending'
     view:
         left_menu:
             # back_to_top: 'Back to top'
index 7e48619e8c4a0afeacb6fd1d78969812558f9332..deeb19a366d3902cefd66aae0a024575d36311a5 100644 (file)
 
         <div class="row">
             <div class="col s12">
-                <label>{{ 'entry.sort_by.status_label'|trans }}</label>
+                <label>{{ 'entry.sort.status_label'|trans }}</label>
             </div>
 
             <div class="input-field col s12 with-checkbox">
                 <select>
                     <option value="" disabled selected>Creation date</option>
-                    <option value="1">Sort by creation date</option>
-                    <option value="2">Sort by title</option>
-                    <option value="3">Sort by last updated</option>
+                    <option value="createdAt">{{ 'entry.sort.by.creation_date' | trans }}</option>
+                    <option value="title">{{ 'entry.sort.by.title' | trans }}</option>
+                    <option value="updatedAt">{{ 'entry.sort.by.last_updated' | trans }}</option>
                 </select>
-                {{ form_label(form.isArchived) }}
             </div>
 
             <div class="col s12">
index b4c1a628128283a352f5fb750b0ec6d3889e459d..95d7da9a36cb2b95ae44dde9bb82c70c25150551 100644 (file)
@@ -93,7 +93,7 @@
                         </a>
                     </li>
                     <li id="button_sort">
-                        <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="sort" class="nav-panel-menu button-collapse-right">
+                        <a title="{{ 'menu.top.sort_entries'|trans }}" href="#" data-activates="sort" class="nav-panel-menu button-collapse-right">
                             <i class="material-icons">sort_by_alpha</i>
                         </a>
                     </li>