TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #593 from griotteau/patch-translate

Browse Source 
Missing translation with wrong password
This commit is contained in:
Manuel Raynaud
2014-08-14 09:24:21 +02:00
parent 5ff5be7634 0965a846a5
commit 4651e6ba6c
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Config/I18n/en_US.php Normal file → Executable file
View File

@@ -405,6 +405,7 @@ return array(
'Warnings' => 'Warnings', 'Warnings' => 'Warnings',
'Weight' => 'Weight', 'Weight' => 'Weight',
'Wrong form method, %s expected.' => 'Wrong form method, %s expected.', 'Wrong form method, %s expected.' => 'Wrong form method, %s expected.',
'Wrong email or password. Please try again' => 'Wrong email or password. Please try again',
'Yes, I have a password :' => 'Yes, I have a password :', 'Yes, I have a password :' => 'Yes, I have a password :',
'You are already registered!' => 'You are already registered!', 'You are already registered!' => 'You are already registered!',
'You don\'t need to use commas or other punctuations.' => 'You don\'t need to use commas or other punctuations.', 'You don\'t need to use commas or other punctuations.' => 'You don\'t need to use commas or other punctuations.',

1
core/lib/Thelia/Config/I18n/fr_FR.php Normal file → Executable file
View File

@@ -405,6 +405,7 @@ return array(
'Warnings' => 'Avertissements', 'Warnings' => 'Avertissements',
'Weight' => 'Poids', 'Weight' => 'Poids',
'Wrong form method, %s expected.' => 'Méthode HTTP invalide : %s attendu.', 'Wrong form method, %s expected.' => 'Méthode HTTP invalide : %s attendu.',
'Wrong email or password. Please try again' => 'Mauvais email ou mot de passe. Veuillez retenter',
'Yes, I have a password :' => 'Oui, j\'ai un mot de passe :', 'Yes, I have a password :' => 'Oui, j\'ai un mot de passe :',
'You are already registered!' => 'Vous êtes déjà enregistré !', 'You are already registered!' => 'Vous êtes déjà enregistré !',
'You don\'t need to use commas or other punctuations.' => 'Vous n\'avez pas besoin d\'utiliser de virgules ou d\'autres signes de ponctuation', 'You don\'t need to use commas or other punctuations.' => 'Vous n\'avez pas besoin d\'utiliser de virgules ou d\'autres signes de ponctuation',

6
local/modules/Front/Controller/CustomerController.php
View File

@@ -314,11 +314,11 @@ class CustomerController extends BaseFrontController
return RedirectResponse::create($successUrl); return RedirectResponse::create($successUrl);
} catch (UsernameNotFoundException $e) { } catch (UsernameNotFoundException $e) {
$message = "Wrong email or password. Please try again"; $message = Translator::getInstance()->trans("Wrong email or password. Please try again");
} catch (WrongPasswordException $e) { } catch (WrongPasswordException $e) {
$message = "Wrong email or password. Please try again"; $message = Translator::getInstance()->trans("Wrong email or password. Please try again");
} catch (AuthenticationException $e) { } catch (AuthenticationException $e) {
$message = "Wrong email or password. Please try again"; $message = Translator::getInstance()->trans("Wrong email or password. Please try again");
} }
} }

2
templates/frontOffice/default/I18n/fr_FR.php
View File

@@ -243,7 +243,7 @@ return array(
'deliveries' => 'Livraisons', 'deliveries' => 'Livraisons',
'for' => 'pour', 'for' => 'pour',
'instead of' => 'au lieu de', 'instead of' => 'au lieu de',
'missing or invalid data' => 'Information érronée ou incomplète', 'missing or invalid data' => 'Information erronée ou incomplète',
'per page' => 'par page', 'per page' => 'par page',
'update' => 'mettre à jour', 'update' => 'mettre à jour',
'with:' => 'avec :', 'with:' => 'avec :',