From 519ba0b5e71cd9b5abd620f682fd2296e6180af3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 18 Aug 2016 11:58:35 +0200 Subject: [PATCH] Replaced favorite word/icon with star one Fix #2041 --- src/Wallabag/CoreBundle/Controller/EntryController.php | 2 +- .../CoreBundle/Resources/translations/messages.da.yml | 2 +- .../CoreBundle/Resources/translations/messages.de.yml | 2 +- .../CoreBundle/Resources/translations/messages.en.yml | 4 ++-- .../CoreBundle/Resources/translations/messages.es.yml | 2 +- .../CoreBundle/Resources/translations/messages.fa.yml | 2 +- .../CoreBundle/Resources/translations/messages.fr.yml | 2 +- .../CoreBundle/Resources/translations/messages.it.yml | 2 +- .../CoreBundle/Resources/translations/messages.oc.yml | 2 +- .../CoreBundle/Resources/translations/messages.pl.yml | 2 +- .../CoreBundle/Resources/translations/messages.ro.yml | 2 +- .../CoreBundle/Resources/translations/messages.tr.yml | 2 +- .../Resources/views/themes/baggy/Entry/entry.html.twig | 4 ++-- .../views/themes/material/Entry/entries.html.twig | 2 +- .../views/themes/material/Entry/entry.html.twig | 10 +++++----- src/Wallabag/ImportBundle/Import/PocketImport.php | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 4eb314f7..775dfccd 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -357,7 +357,7 @@ class EntryController extends Controller } /** - * Changes favorite status for an entry. + * Changes star status for an entry. * * @param Request $request * @param Entry $entry diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 213d5790..dd655a4c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Tilbage' set_as_read: 'Marker som læst' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Marker som favorit' + set_as_starred: 'Marker som favorit' view_original_article: 'Originalartikel' # re_fetch_content: 'Re-fetch content' delete: 'Slet' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index c98cf0fc..6e3d097a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Zurück' set_as_read: 'Als gelesen markieren' set_as_unread: 'Als ungelesen markieren' - set_as_favorite: 'Favorisieren' + set_as_starred: 'Favorisieren' view_original_article: 'Original-Artikel' re_fetch_content: 'Inhalt neu laden' delete: 'Löschen' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index b65e4522..e3f67905 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -146,7 +146,7 @@ entry: reading_time_less_one_minute: 'estimated reading time: < 1 min' original_article: 'original' toogle_as_read: 'Toggle mark as read' - toogle_as_star: 'Toggle favorite' + toogle_as_star: 'Toggle star' delete: 'Delete' export_title: 'Export' filters: @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Back' set_as_read: 'Mark as read' set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorite' + set_as_starred: 'Toggle star' view_original_article: 'Original article' re_fetch_content: 'Re-fetch content' delete: 'Delete' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 75978f16..925f0fdd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Regrese a la página principal' set_as_read: 'Marcar como leído' set_as_unread: 'Marcar como no leído' - set_as_favorite: 'Marcar como favorito' + set_as_starred: 'Marcar como favorito' view_original_article: 'Artículo original' re_fetch_content: 'Redescargar el contenido' delete: 'Suprimir' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index db6e5960..9463dfc7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'بازگشت' set_as_read: 'خوانده‌شده' set_as_unread: 'به عنوان خوانده‌نشده علامت بزن' - set_as_favorite: 'برگزیده' + set_as_starred: 'برگزیده' view_original_article: 'مقالهٔ اصلی' re_fetch_content: 'مقاله‌ها را دوباره دریافت کن' delete: 'پاک کردن' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 94300596..35d23c1d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Retour' set_as_read: 'Marquer comme lu' set_as_unread: 'Marquer comme non lu' - set_as_favorite: 'Mettre en favori' + set_as_starred: 'Mettre en favori' view_original_article: 'Article original' re_fetch_content: 'Recharger le contenu' delete: 'Supprimer' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 00ed9c98..d4b0ef04 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -175,7 +175,7 @@ entry: back_to_homepage: 'Indietro' set_as_read: 'Segna come già letto' set_as_unread: 'Segna come da leggere' - set_as_favorite: 'Segna come preferito' + set_as_starred: 'Segna come preferito' view_original_article: 'Contenuto originale' re_fetch_content: 'Ri-ottieni pagina' delete: 'Elimina' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index c81c852b..d777357b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Tornar' set_as_read: 'Marcar coma legit' set_as_unread: 'Marcar coma pas legit' - set_as_favorite: 'Metre en favori' + set_as_starred: 'Metre en favori' view_original_article: 'Article original' re_fetch_content: 'Tornar cargar lo contengut' delete: 'Suprimir' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 3707a857..db1501fe 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Cofnij' set_as_read: 'Oznacz jako przeczytane' set_as_unread: 'Oznacz jako nieprzeczytane' - set_as_favorite: 'Ulubione' + set_as_starred: 'Ulubione' view_original_article: 'Oryginalny artykuł' re_fetch_content: 'Pobierz ponownie treść' delete: 'Usuń' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 27be1edc..5550dd29 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Înapoi' set_as_read: 'Marchează ca citit' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorit' + set_as_starred: 'Favorit' view_original_article: 'Articol original' # re_fetch_content: 'Re-fetch content' delete: 'Șterge' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 85ee7316..29ed6b25 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Back' set_as_read: 'Okundu olarak işaretle' set_as_unread: 'Okunmadı olarak işaretle' - set_as_favorite: 'Favorilere ekle/çıkar' + set_as_starred: 'Favorilere ekle/çıkar' view_original_article: 'Orijinal makale' re_fetch_content: 'İçeriği yenile' delete: 'Sil' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 5a800332..7808b4dd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -14,7 +14,7 @@
  • {{ entry.domainName|removeWww }}
  • {{ 'entry.view.left_menu.re_fetch_content'|trans }}
  • {% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}
    • -
  • {{ 'entry.view.left_menu.set_as_favorite'|trans }}
    • +
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • {% if craue_setting('share_twitter') %}
    • {% endif %} @@ -72,7 +72,7 @@ $("body").css("cursor", "auto"); });*/ - // toggle favorite property of current article + // toggle star property of current article /* $('#setFav').click(function(){ $("body").css("cursor", "wait"); $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( 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 920fa933..c8e4a533 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 @@ -77,7 +77,7 @@ diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index e89aea3a..fca112dc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -24,8 +24,8 @@
  • - - + +
  • @@ -70,9 +70,9 @@
  • - - - {{ 'entry.view.left_menu.set_as_favorite'|trans }} + + + {{ 'entry.view.left_menu.set_as_starred'|trans }}
    • diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 29361a32..19b63f17 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php @@ -226,7 +226,7 @@ class PocketImport implements ImportInterface $entry->setArchived(true); } - // 0 or 1 - 1 If the item is favorited + // 0 or 1 - 1 If the item is starred if ($pocketEntry['favorite'] == 1) { $entry->setStarred(true); } -- 2.41.0