Browse Source

Fix email sender, fixes #123, fixes #117

Jordi Boggiano 13 years ago
parent
commit
087277f81b

+ 10 - 0
app/Resources/translations/FOSUserBundle.en.yml

@@ -0,0 +1,10 @@
+# Password resetting
+resetting:
+    email: |
+        Reset Password
+        Hello %username%
+
+        To reset your password - please visit %confirmationUrl%
+
+        Regards,
+        The Packagist Team

+ 3 - 3
app/config/config.yml

@@ -60,9 +60,9 @@ fos_user:
     firewall_name: main
     user_class:  Packagist\WebBundle\Entity\User
     use_username_form_type: true
-#    from_email:
-#        address:        webmaster@example.com
-#        sender_name:    Admin
+    from_email:
+        address:        %mailer_from_email%
+        sender_name:    %mailer_from_name%
 
 nelmio_solarium:
     adapter: ~

+ 2 - 0
app/config/parameters.yml.dist

@@ -9,6 +9,8 @@ parameters:
     mailer_host: localhost
     mailer_user:
     mailer_password:
+    mailer_from_email: admin@example.org
+    mailer_from_name: Admin Team
 
     locale: en