diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-08-18 11:58:35 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-08-18 14:27:17 +0200 |
commit | 519ba0b5e71cd9b5abd620f682fd2296e6180af3 (patch) | |
tree | 2b036c251c8d95cc78dae5676394e076f9e919e1 /src | |
parent | e408d7e895e784271a55c3a200666034db0af80a (diff) | |
download | wallabag-519ba0b5e71cd9b5abd620f682fd2296e6180af3.tar.gz wallabag-519ba0b5e71cd9b5abd620f682fd2296e6180af3.tar.zst wallabag-519ba0b5e71cd9b5abd620f682fd2296e6180af3.zip |
Replaced favorite word/icon with star one
Fix #2041
Diffstat (limited to 'src')
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 | |||
357 | } | 357 | } |
358 | 358 | ||
359 | /** | 359 | /** |
360 | * Changes favorite status for an entry. | 360 | * Changes star status for an entry. |
361 | * | 361 | * |
362 | * @param Request $request | 362 | * @param Request $request |
363 | * @param Entry $entry | 363 | * @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: | |||
176 | back_to_homepage: 'Tilbage' | 176 | back_to_homepage: 'Tilbage' |
177 | set_as_read: 'Marker som læst' | 177 | set_as_read: 'Marker som læst' |
178 | # set_as_unread: 'Mark as unread' | 178 | # set_as_unread: 'Mark as unread' |
179 | set_as_favorite: 'Marker som favorit' | 179 | set_as_starred: 'Marker som favorit' |
180 | view_original_article: 'Originalartikel' | 180 | view_original_article: 'Originalartikel' |
181 | # re_fetch_content: 'Re-fetch content' | 181 | # re_fetch_content: 'Re-fetch content' |
182 | delete: 'Slet' | 182 | 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: | |||
176 | back_to_homepage: 'Zurück' | 176 | back_to_homepage: 'Zurück' |
177 | set_as_read: 'Als gelesen markieren' | 177 | set_as_read: 'Als gelesen markieren' |
178 | set_as_unread: 'Als ungelesen markieren' | 178 | set_as_unread: 'Als ungelesen markieren' |
179 | set_as_favorite: 'Favorisieren' | 179 | set_as_starred: 'Favorisieren' |
180 | view_original_article: 'Original-Artikel' | 180 | view_original_article: 'Original-Artikel' |
181 | re_fetch_content: 'Inhalt neu laden' | 181 | re_fetch_content: 'Inhalt neu laden' |
182 | delete: 'Löschen' | 182 | 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: | |||
146 | reading_time_less_one_minute: 'estimated reading time: <small class="inferieur"><</small> 1 min' | 146 | reading_time_less_one_minute: 'estimated reading time: <small class="inferieur"><</small> 1 min' |
147 | original_article: 'original' | 147 | original_article: 'original' |
148 | toogle_as_read: 'Toggle mark as read' | 148 | toogle_as_read: 'Toggle mark as read' |
149 | toogle_as_star: 'Toggle favorite' | 149 | toogle_as_star: 'Toggle star' |
150 | delete: 'Delete' | 150 | delete: 'Delete' |
151 | export_title: 'Export' | 151 | export_title: 'Export' |
152 | filters: | 152 | filters: |
@@ -176,7 +176,7 @@ entry: | |||
176 | back_to_homepage: 'Back' | 176 | back_to_homepage: 'Back' |
177 | set_as_read: 'Mark as read' | 177 | set_as_read: 'Mark as read' |
178 | set_as_unread: 'Mark as unread' | 178 | set_as_unread: 'Mark as unread' |
179 | set_as_favorite: 'Favorite' | 179 | set_as_starred: 'Toggle star' |
180 | view_original_article: 'Original article' | 180 | view_original_article: 'Original article' |
181 | re_fetch_content: 'Re-fetch content' | 181 | re_fetch_content: 'Re-fetch content' |
182 | delete: 'Delete' | 182 | 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: | |||
176 | back_to_homepage: 'Regrese a la página principal' | 176 | back_to_homepage: 'Regrese a la página principal' |
177 | set_as_read: 'Marcar como leído' | 177 | set_as_read: 'Marcar como leído' |
178 | set_as_unread: 'Marcar como no leído' | 178 | set_as_unread: 'Marcar como no leído' |
179 | set_as_favorite: 'Marcar como favorito' | 179 | set_as_starred: 'Marcar como favorito' |
180 | view_original_article: 'Artículo original' | 180 | view_original_article: 'Artículo original' |
181 | re_fetch_content: 'Redescargar el contenido' | 181 | re_fetch_content: 'Redescargar el contenido' |
182 | delete: 'Suprimir' | 182 | 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: | |||
176 | back_to_homepage: 'بازگشت' | 176 | back_to_homepage: 'بازگشت' |
177 | set_as_read: 'خواندهشده' | 177 | set_as_read: 'خواندهشده' |
178 | set_as_unread: 'به عنوان خواندهنشده علامت بزن' | 178 | set_as_unread: 'به عنوان خواندهنشده علامت بزن' |
179 | set_as_favorite: 'برگزیده' | 179 | set_as_starred: 'برگزیده' |
180 | view_original_article: 'مقالهٔ اصلی' | 180 | view_original_article: 'مقالهٔ اصلی' |
181 | re_fetch_content: 'مقالهها را دوباره دریافت کن' | 181 | re_fetch_content: 'مقالهها را دوباره دریافت کن' |
182 | delete: 'پاک کردن' | 182 | 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: | |||
176 | back_to_homepage: 'Retour' | 176 | back_to_homepage: 'Retour' |
177 | set_as_read: 'Marquer comme lu' | 177 | set_as_read: 'Marquer comme lu' |
178 | set_as_unread: 'Marquer comme non lu' | 178 | set_as_unread: 'Marquer comme non lu' |
179 | set_as_favorite: 'Mettre en favori' | 179 | set_as_starred: 'Mettre en favori' |
180 | view_original_article: 'Article original' | 180 | view_original_article: 'Article original' |
181 | re_fetch_content: 'Recharger le contenu' | 181 | re_fetch_content: 'Recharger le contenu' |
182 | delete: 'Supprimer' | 182 | 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: | |||
175 | back_to_homepage: 'Indietro' | 175 | back_to_homepage: 'Indietro' |
176 | set_as_read: 'Segna come già letto' | 176 | set_as_read: 'Segna come già letto' |
177 | set_as_unread: 'Segna come da leggere' | 177 | set_as_unread: 'Segna come da leggere' |
178 | set_as_favorite: 'Segna come preferito' | 178 | set_as_starred: 'Segna come preferito' |
179 | view_original_article: 'Contenuto originale' | 179 | view_original_article: 'Contenuto originale' |
180 | re_fetch_content: 'Ri-ottieni pagina' | 180 | re_fetch_content: 'Ri-ottieni pagina' |
181 | delete: 'Elimina' | 181 | 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: | |||
176 | back_to_homepage: 'Tornar' | 176 | back_to_homepage: 'Tornar' |
177 | set_as_read: 'Marcar coma legit' | 177 | set_as_read: 'Marcar coma legit' |
178 | set_as_unread: 'Marcar coma pas legit' | 178 | set_as_unread: 'Marcar coma pas legit' |
179 | set_as_favorite: 'Metre en favori' | 179 | set_as_starred: 'Metre en favori' |
180 | view_original_article: 'Article original' | 180 | view_original_article: 'Article original' |
181 | re_fetch_content: 'Tornar cargar lo contengut' | 181 | re_fetch_content: 'Tornar cargar lo contengut' |
182 | delete: 'Suprimir' | 182 | 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: | |||
176 | back_to_homepage: 'Cofnij' | 176 | back_to_homepage: 'Cofnij' |
177 | set_as_read: 'Oznacz jako przeczytane' | 177 | set_as_read: 'Oznacz jako przeczytane' |
178 | set_as_unread: 'Oznacz jako nieprzeczytane' | 178 | set_as_unread: 'Oznacz jako nieprzeczytane' |
179 | set_as_favorite: 'Ulubione' | 179 | set_as_starred: 'Ulubione' |
180 | view_original_article: 'Oryginalny artykuł' | 180 | view_original_article: 'Oryginalny artykuł' |
181 | re_fetch_content: 'Pobierz ponownie treść' | 181 | re_fetch_content: 'Pobierz ponownie treść' |
182 | delete: 'Usuń' | 182 | 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: | |||
176 | back_to_homepage: 'Înapoi' | 176 | back_to_homepage: 'Înapoi' |
177 | set_as_read: 'Marchează ca citit' | 177 | set_as_read: 'Marchează ca citit' |
178 | # set_as_unread: 'Mark as unread' | 178 | # set_as_unread: 'Mark as unread' |
179 | set_as_favorite: 'Favorit' | 179 | set_as_starred: 'Favorit' |
180 | view_original_article: 'Articol original' | 180 | view_original_article: 'Articol original' |
181 | # re_fetch_content: 'Re-fetch content' | 181 | # re_fetch_content: 'Re-fetch content' |
182 | delete: 'Șterge' | 182 | 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: | |||
176 | back_to_homepage: 'Back' | 176 | back_to_homepage: 'Back' |
177 | set_as_read: 'Okundu olarak işaretle' | 177 | set_as_read: 'Okundu olarak işaretle' |
178 | set_as_unread: 'Okunmadı olarak işaretle' | 178 | set_as_unread: 'Okunmadı olarak işaretle' |
179 | set_as_favorite: 'Favorilere ekle/çıkar' | 179 | set_as_starred: 'Favorilere ekle/çıkar' |
180 | view_original_article: 'Orijinal makale' | 180 | view_original_article: 'Orijinal makale' |
181 | re_fetch_content: 'İçeriği yenile' | 181 | re_fetch_content: 'İçeriği yenile' |
182 | delete: 'Sil' | 182 | 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 @@ | |||
14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> | 14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> |
15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> | 15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> |
16 | <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li> | 16 | <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li> |
17 | <li><a title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span></a></li> | 17 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> |
18 | <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> | 18 | <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> |
19 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> | 19 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> |
20 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} | 20 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} |
@@ -72,7 +72,7 @@ | |||
72 | $("body").css("cursor", "auto"); | 72 | $("body").css("cursor", "auto"); |
73 | });*/ | 73 | });*/ |
74 | 74 | ||
75 | // toggle favorite property of current article | 75 | // toggle star property of current article |
76 | /* $('#setFav').click(function(){ | 76 | /* $('#setFav').click(function(){ |
77 | $("body").css("cursor", "wait"); | 77 | $("body").css("cursor", "wait"); |
78 | $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( | 78 | $.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 @@ | |||
77 | <ul class="tools links right"> | 77 | <ul class="tools links right"> |
78 | <li> | 78 | <li> |
79 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> | 79 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> |
80 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> | 80 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> |
81 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> | 81 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> |
82 | </li> | 82 | </li> |
83 | </ul> | 83 | </ul> |
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 @@ | |||
24 | </a> | 24 | </a> |
25 | </li> | 25 | </li> |
26 | <li> | 26 | <li> |
27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
28 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 28 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> |
29 | </a> | 29 | </a> |
30 | </li> | 30 | </li> |
31 | <li> | 31 | <li> |
@@ -70,9 +70,9 @@ | |||
70 | </li> | 70 | </li> |
71 | 71 | ||
72 | <li class="bold hide-on-med-and-down"> | 72 | <li class="bold hide-on-med-and-down"> |
73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
74 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 74 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> |
75 | <span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span> | 75 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> |
76 | </a> | 76 | </a> |
77 | <div class="collapsible-body"></div> | 77 | <div class="collapsible-body"></div> |
78 | </li> | 78 | </li> |
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 | |||
226 | $entry->setArchived(true); | 226 | $entry->setArchived(true); |
227 | } | 227 | } |
228 | 228 | ||
229 | // 0 or 1 - 1 If the item is favorited | 229 | // 0 or 1 - 1 If the item is starred |
230 | if ($pocketEntry['favorite'] == 1) { | 230 | if ($pocketEntry['favorite'] == 1) { |
231 | $entry->setStarred(true); | 231 | $entry->setStarred(true); |
232 | } | 232 | } |