Skip to content

Commit

Permalink
Add recover password
Browse files Browse the repository at this point in the history
  • Loading branch information
angelkurten committed Oct 30, 2015
1 parent 1201266 commit 8241352
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 12 deletions.
9 changes: 3 additions & 6 deletions Http/Controllers/Auth/PasswordController.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?php namespace Modules\User\Http\Controllers\auth;

use Illuminate\Http\Request;
use Pingpong\Modules\Routing\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

class PasswordController extends Controller {

Expand All @@ -18,13 +20,9 @@ public function __construct()

public function getEmail()
{
return \Theme::view('auth.reset-password');
return \Theme::view('auth.reset');
}

protected function getEmailSubject()
{
return isset($this->subject) ? $this->subject : 'Your Password Reset Link';
}

public function redirectPath()
{
Expand All @@ -44,5 +42,4 @@ public function getReset($token = null)
return \Theme::view('auth.reset')->with('token', $token);
}


}
2 changes: 1 addition & 1 deletion Mailer/AuthMailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class AuthMailer extends BaseMail

public function register($user)
{
$subject = 'Welcome to the site!';
$subject = trans('user::mail.register.welcome', ['name' =>\Config::get('lms.name')]);
$view = 'auth.mail.register';
$data = [compact('user')];

Expand Down
14 changes: 12 additions & 2 deletions Resources/lang/es/mail.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
<?php

return [
'register' =>[
'welcome' => 'Welcome to :name',
'message' => 'Gracias por unirte a :name, es un placer tenerte con nosotros',
'btn-started' => 'Ir a la plataforma'
],

'register' => 'Welcome to '. $data['name'],

'reset' =>[
'subject' => 'Recupera tu contraseña',
'message' => '¿Olvidaste tu contraseña? Vamos coloca una nueva!',
'username' => 'Usuario: ',
'email' => 'Email: ',
'btn-reset' => 'Cambiar contraseña'
]
];
9 changes: 6 additions & 3 deletions Resources/lang/es/ui.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
'login' => [
'signin' => 'Iniciar Sesión',
'rememberme' => 'Recuérdame',
'email' => 'Correo',
'username' => 'Usuario',
'password' => 'Contraseña',
'credentials_error' => 'El usuario o la contraseña no son correctos',
Expand All @@ -77,16 +76,20 @@
'last_name' => 'Primer Apellido',
'username' => 'Usuario(Sin Espacios)',
'country' => 'Elegir Pais',
'email' => 'Correo electronico',
'password' => 'Contraseña',
'vpassword' => 'Confirmar Contrasseña',
'btn-create' => 'Crear cuenta'
],

'reset' => [
'btn-reset' => 'Recuperar Contraseña'
],

'common' => [
'email' => 'Correo electronico',
'message-auth' => '<small>Por favor <strong>Ingresa</strong> o <strong>Registrate</strong></small>',
'btn-register-question' => 'Ya tienes cuenta?',
'btn-login' => 'Ingresar a la plataforma',
'btn-login' => 'Ingresa a la plataforma',
'btn-lost-password' => 'Olvidaste la contraseña?',
],

Expand Down

0 comments on commit 8241352

Please sign in to comment.