diff --git a/bin/symfony_requirements b/bin/symfony_requirements index 1eca6719c..7cd559a45 100755 --- a/bin/symfony_requirements +++ b/bin/symfony_requirements @@ -7,7 +7,7 @@ $lineSize = 70; $symfonyRequirements = new SymfonyRequirements(); $iniPath = $symfonyRequirements->getPhpIniConfigPath(); -echo_title('Symfony2 Requirements Checker'); +echo_title('Symfony Requirements Checker'); echo '> PHP is using the following php.ini file:'.PHP_EOL; if ($iniPath) { @@ -43,9 +43,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) { } if ($checkPassed) { - echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects'); + echo_block('success', 'OK', 'Your system is ready to run Symfony projects'); } else { - echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects'); + echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects'); echo_title('Fix the following mandatory requirements', 'red'); diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 69fb0a6f5..b3e20ceb0 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -56,7 +56,7 @@ class InstallCommand extends ContainerAwareCommand ; $output->writeln('Wallabag has been successfully installed.'); - $output->writeln('Just execute `php bin/console server:run` for using wallabag: http://localhost:8000'); + $output->writeln('Just execute `php bin/console server:run --env=prod` for using wallabag: http://localhost:8000'); } protected function checkRequirements() diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index b7799746e..6eb621d87 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Entity\TaggingRule; @@ -64,7 +65,7 @@ class ConfigController extends Controller 'Password updated' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set4'); } // handle changing user information @@ -82,7 +83,7 @@ class ConfigController extends Controller 'Information updated' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set3'); } // handle rss information @@ -98,7 +99,7 @@ class ConfigController extends Controller 'RSS information updated' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set2'); } // handle tagging rule @@ -116,7 +117,7 @@ class ConfigController extends Controller 'Tagging rules updated' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set5'); } // handle adding new user @@ -144,10 +145,10 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - sprintf('User "%s" added', $newUser->getUsername()) + $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername())) ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set6'); } return $this->render('WallabagCoreBundle:Config:index.html.twig', array( @@ -172,7 +173,7 @@ class ConfigController extends Controller * * @Route("/generate-token", name="generate_token") * - * @return JsonResponse + * @return RedirectResponse|JsonResponse */ public function generateTokenAction(Request $request) { @@ -187,7 +188,12 @@ class ConfigController extends Controller return new JsonResponse(array('token' => $config->getRssToken())); } - return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config'); + $this->get('session')->getFlashBag()->add( + 'notice', + 'RSS token updated' + ); + + return $this->redirect($this->generateUrl('config').'#set2'); } /** @@ -197,7 +203,7 @@ class ConfigController extends Controller * * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") * - * @return \Symfony\Component\HttpFoundation\RedirectResponse + * @return RedirectResponse */ public function deleteTaggingRuleAction(TaggingRule $rule) { @@ -214,7 +220,7 @@ class ConfigController extends Controller 'Tagging rule deleted' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set5'); } /** diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index d8bde17ee..6eb0e63f7 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php @@ -21,7 +21,7 @@ class NewUserType extends AbstractType ->add('plainPassword', RepeatedType::class, array( 'type' => PasswordType::class, 'invalid_message' => 'The password fields must match', - 'first_options' => array('label' => 'Password'), + 'first_options' => array('label' => 'Password'), 'second_options' => array('label' => 'Repeat new password'), 'constraints' => array( new Constraints\Length(array( diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index c7186c342..67750bee8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -27,6 +27,7 @@ Search: 'Rechercher' Filter entries: 'Filtrer les articles' Enter your search here: 'Saisissez votre terme de recherche' Save new entry: 'Sauvegarder un nouvel article' +Export: Exporter # Config screen Settings: 'Paramètres' @@ -39,6 +40,7 @@ Items per page: "Nombre d'articles par page" Language: 'Langue' Save: 'Enregistrer' RSS token: 'Jeton RSS' +RSS token updated: 'Jeton RSS mis à jour' Name: 'Nom' Email: 'Adresse e-mail' No token: 'Aucun jeton généré' @@ -51,6 +53,7 @@ Old password: 'Mot de passe actuel' New password: 'Nouveau mot de passe' Repeat new password: 'Confirmez votre nouveau mot de passe' Username: "Nom d'utilisateur" +Two factor authentication: Double authentification # Tagging rules Tagging rules: "Règles de tag automatiques" @@ -82,6 +85,7 @@ One rule and another: "Une règle et l'autre" The domain name of the entry: "Le nom de domaine de l'article" "Tests that a subject is matches a search (case-insensitive).
Example: title matches \"football\"": "Teste si un sujet correspond à une recherche (non sensible à la casse).
Exemple : title matches \"football\"" Rule: "Règle" +FAQ: "FAQ" # Entries 'estimated reading time': 'durée de lecture' @@ -97,6 +101,10 @@ Edit an entry: "Éditer un article" Title: "Titre" Is public: "Public" +# tag +Tags: Tags +"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Il n'y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." + # Filters Filters: 'Filtres' Status: 'Statut' @@ -110,7 +118,7 @@ to: 'à' website.com: 'website.com' Domain name: 'Nom de domaine' Creation date: 'Date de création' -dd/mm/yyyy: 'dd/mm/aaaa' +dd/mm/yyyy: 'jj/mm/aaaa' Clear: 'Effacer' Filter: 'Filtrer' website.com: "siteweb.com" @@ -161,6 +169,9 @@ Entry unstarred: "Article retiré des favoris" Entry archived: "Article marqué comme lu" Entry unarchived: "Article marqué comme non lu" Entry deleted: "Article supprimé" +Tagging rule deleted: "Règle supprimée" +Tagging rules updated: "Règles mises à jour" +User "%username%" added: 'Utilisateur "%username%" ajouté' # Entry Mark as read: 'Marquer comme lu' @@ -173,6 +184,8 @@ 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" +Re-fetch content: Recharger le contenu +Tag added: Tag ajouté # Import Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer." @@ -189,8 +202,12 @@ Please select your wallabag export and click on the below button to upload and i File: "Fichier" Upload file: "Importer le fichier" Import contents: "Importer les contenus" +Import: "Importer" +Import > Wallabag v1: "Importer > Wallabag v1" +Import > Wallabag v2: "Importer > Wallabag v2" # Quickstart +Quickstart: Pour bien débuter Welcome on wallabag!: "Bienvenue sur wallabag !" We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil." Follow us!: "Suivez-nous !" diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig index c8fb56124..966a84dbb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig @@ -1 +1 @@ -{% trans %}bag it!{% endtrans %} +bag it! 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 32dc08599..94f4ba7d3 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 @@ -12,7 +12,7 @@

{% trans %}Mobile Apps{% endtrans %}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig index 0b5a530de..ade7f56d7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig @@ -1,15 +1,14 @@
+ {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.label) %} + {{ form_errors(form.label) }} + {% endif %} - {% if form_errors(form.label) %} - {{ form_errors(form.label) }} - {% endif %} - - {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} - {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }} + {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} + {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
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 6f8c36741..a40789d8f 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 @@ -52,9 +52,9 @@
  • - + - {% trans %}Reload content{% endtrans %} + {% trans %}Re-fetch content{% endtrans %}
    • @@ -97,11 +97,41 @@
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig index 2de531064..f1e564126 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig @@ -1,14 +1,13 @@
    + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.url) %} + {{ form_errors(form.url) }} + {% endif %} - {% if form_errors(form.url) %} - {{ form_errors(form.url) }} - {% endif %} - - {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }} + {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 63b51aaa0..e27954094 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -18,12 +18,10 @@ -
    {% trans %}Thanks to this form{% endtrans %}
    -
    -
    -
    {% trans %}Drag & drop this link to your bookmarks bar:{% endtrans %} {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig index 0534a4cc4..793103078 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig @@ -1,14 +1,13 @@
    + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.label) %} + {{ form_errors(form.label) }} + {% endif %} - {% if form_errors(form.label) %} - {{ form_errors(form.label) }} - {% endif %} - - {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} + {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}