diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index 362ba57..f46fd6a 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -60,7 +60,7 @@ return array( 'original link' => 'lien original', 'mark as read' => 'marquer comme lu', 'No history' => 'Aucun historique', - 'mark as unread' => 'marquer comme non lu', + 'mark as unread' => 'non lu', 'History' => 'Historique', 'flush all items' => 'supprimer tous les éléments', 'Item not found' => 'Élément introuvable', diff --git a/model.php b/model.php index 477da44..2c17a86 100644 --- a/model.php +++ b/model.php @@ -412,7 +412,7 @@ function get_feed_items($feed_id, $offset = null, $limit = null) function get_item($id) { - return \PicoTools\singleton('db') + return \PicoTools\singleton('db') ->table('items') ->eq('id', $id) ->findOne(); diff --git a/templates/bookmarks.php b/templates/bookmarks.php index 0019c6c..b04f6c6 100644 --- a/templates/bookmarks.php +++ b/templates/bookmarks.php @@ -22,10 +22,15 @@
- = Helper\escape($item['feed_title']) ?> | - = Helper\get_host_from_url($item['url']) ?> | + = Helper\escape($item['feed_title']) ?> | = dt('%e %B %Y %k:%M', $item['updated']) ?> | - = t('remove bookmark') ?> | + + + = Helper\get_host_from_url($feed['site_url']) ?> | - = t('items') ?> | + = t('refresh') ?>
diff --git a/templates/history.php b/templates/history.php index 0358a38..ec6b469 100644 --- a/templates/history.php +++ b/templates/history.php @@ -24,8 +24,7 @@- = Helper\escape($item['feed_title']) ?> | - = Helper\get_host_from_url($item['url']) ?> | + = Helper\escape($item['feed_title']) ?> |
diff --git a/templates/show_item.php b/templates/show_item.php index 31dd1b9..23f89ee 100644 --- a/templates/show_item.php +++ b/templates/show_item.php @@ -12,7 +12,7 @@- = Helper\escape($feed['title']) ?> | + = Helper\escape($feed['title']) ?> | = Helper\get_host_from_url($item['url']) ?> |
diff --git a/templates/unread_items.php b/templates/unread_items.php index 5cf6675..ffbc5e2 100644 --- a/templates/unread_items.php +++ b/templates/unread_items.php @@ -33,8 +33,7 @@ = Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?>- = Helper\escape($item['feed_title']) ?> | - = Helper\get_host_from_url($item['url']) ?> | + = Helper\escape($item['feed_title']) ?> |