CS

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index b5385dc39cab1b720aeaa096f616f7696c7de985..6d86eab6cab4976271e06573c44a49e744ebe14d 100644 (file)
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -9,7 +9,7 @@ export_json: Enable JSON export
 export_txt: Enable TXT export
 export_xml: Enable XML export
 pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
-shaarli_url: URL de Shaarli, if the service is enabled
+shaarli_url: Shaarli URL, if the service is enabled
 share_diaspora: Enable share to Diaspora
 share_mail: Enable share by email
 share_shaarli: Enable share to Shaarli

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index bf3fd5f5b1ac78e5b869a23f3339abb611bc4e03..7c7413fb9b276c5c4338724c41d90c25f53a7679 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -40,6 +40,8 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org

diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index bc6c784415fe7e5a23d9aac03eb74320d54814a7..1951f02166f81d2d8d0ccab80963d3fd9e3062ee 100644 (file)
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -30,6 +30,8 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org

diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 2520fec0414c3ad34599f7cd14e366f401ebae96..36ad6cde5393ee5706b42b22b6818367aac7a3e4 100644 (file)
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -30,6 +30,8 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org

diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 253da5b77f03360a3c5ac4e65507bb59a01c5b5f..6564014aa09f5b8c1bf0fa1a0d1673b88cfef103 100644 (file)
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -30,6 +30,8 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
index 354aedbac614b39afed240f8174897683f66cfdc..fd698b3e491a389b71b63f28a00cde559e9d5e1e 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
@@ -6,7 +6,7 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
 
 /**
  * The controller `SettingsController` does not exist.
- * This test cover security against the internal settings page managed by CraueConfigBundle
+ * This test cover security against the internal settings page managed by CraueConfigBundle.
  */
 class SettingsControllerTest extends WallabagCoreTestCase
 {

diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
index 98017f43a62fda6565cf59f08172195b862c489a..d078bdf761f5577a2b375dbc258209ce901e98bc 100644 (file)
--- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
+++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
@@ -48,7 +48,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
     private $supportUrl;
 
     /**
-     * Url for the wallabag instance (only used for image in the HTML email template)
+     * Url for the wallabag instance (only used for image in the HTML email template).
      *
      * @var string
      */