From eb7b632ee6f898dbe5c861623f59fa62fc4d5235 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 5 Nov 2016 15:28:36 +0100 Subject: Added translations and tweak parameters Signed-off-by: Thomas Citharel --- src/Wallabag/CoreBundle/Controller/EntryController.php | 6 +++--- .../CoreBundle/Resources/translations/messages.da.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.de.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.en.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.es.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.fa.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.fr.yml | 12 +++++++++++- .../CoreBundle/Resources/translations/messages.it.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.oc.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.pl.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.pt.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.ro.yml | 10 ++++++++++ .../CoreBundle/Resources/translations/messages.tr.yml | 10 ++++++++++ .../Resources/views/themes/material/Entry/entries.html.twig | 9 ++++----- .../Resources/views/themes/material/layout.html.twig | 2 +- 15 files changed, 129 insertions(+), 10 deletions(-) diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index ff90957b..5407d065 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -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'; diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 670c7f9d..0c35f2f9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 92984f46..73ecebb9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 0a5af085..d5173707 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index cdc51a2b..1d834290 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 581e053a..46e96c04 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -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: 'بازگشت به بالای صفحه' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 2dd92456..dc75f5c1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -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" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index a05a6e6e..804871b1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -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" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 2c7af685..93b844d8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 877ff4aa..0f0d8378 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -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ę' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index fc7239d9..5a403c23 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 9b0cea50..55fcead7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index f69f3c32..0f5655fa 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -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' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 7e48619e..deeb19a3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -216,17 +216,16 @@
- +
- {{ form_label(form.isArchived) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index b4c1a628..95d7da9a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -93,7 +93,7 @@
  • - + sort_by_alpha
    • -- cgit v1.2.3