diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index f40c1c2d4..2e6d6ff76 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -15,7 +15,7 @@ class EntryFilterType extends AbstractType private $repository; /** - * Repository & user are used to get a list of language entries for this user + * Repository & user are used to get a list of language entries for this user. * * @param EntityRepository $entryRepository * @param User $user diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 2286317c1..57bf8024c 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -163,9 +163,9 @@ class EntryRepository extends EntityRepository } /** - * Used only in test case to get the right entry associated to the right user + * Used only in test case to get the right entry associated to the right user. * - * @param string $username + * @param string $username * * @return Entry */ diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 4946344db..aced4d83f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -24,6 +24,7 @@ Add a new entry: 'Sauvegarder un nouvel article' Search: 'Rechercher' Filter entries: 'Filtrer les articles' Enter your search here: 'Saisissez votre terme de recherche' +Save new entry: 'Sauvegarder un nouvel article' # Config screen Settings: 'Paramètres' @@ -115,3 +116,15 @@ Entry unstarred: "Article retiré des favoris" Entry archived: "Article marqué comme lu" Entry unarchived: "Article marqué comme non lu" Entry deleted: "Article supprimé" + +# Entry +Mark as read: 'Marquer comme lu' +Favorite: 'Mettre en favori' +back: 'Retour' +original article: 'Article original' +Add a tag: 'Ajouter un tag' +Share: 'Partager' +Download: 'Télécharger' +Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?" +Problems?: 'Un problème ?' +Edit title: "Modifier le titre" 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 3b4c70530..d3cef895e 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 @@ -54,7 +54,7 @@
  • - {% trans %}Toggle mark as read{% endtrans %} + {% trans %}Mark as read{% endtrans %}
    • @@ -62,7 +62,7 @@
  • - {% trans %}Toggle favorite{% endtrans %} + {% trans %}Favorite{% endtrans %}
    • 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 7614fcd32..22d00a1e2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -42,10 +42,11 @@
  • {% trans %}unread{% endtrans %}
  • {% trans %}starred{% endtrans %}
  • {% trans %}archive{% endtrans %}
    • -
  • {% trans %}all{% endtrans %}
    • +
  • {% trans %}all{% endtrans %}
  • {% trans %}tags{% endtrans %}
  • {% trans %}config{% endtrans %}
  • {% trans %}howto{% endtrans %}
    • +
  • {% trans %}About{% endtrans %}
  • {% trans %}logout{% endtrans %}
    • @@ -76,40 +77,3 @@
    {% endblock %} - -{% block footer %} - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php index e9c85a172..2862417e3 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php @@ -3,7 +3,6 @@ namespace Wallabag\CoreBundle\Tests\Controller; use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; -use Doctrine\ORM\AbstractQuery; class EntryControllerTest extends WallabagCoreTestCase { diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php index f8328860b..6b860c96c 100644 --- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php +++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php @@ -13,7 +13,7 @@ class WallabagExtension extends \Twig_Extension public function removeWww($url) { - return preg_replace('/^www\./i', '',$url); + return preg_replace('/^www\./i', '', $url); } public function getName()