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

Add Translator on all controllers & forms text strings

Browse Source
This commit is contained in:
Michaël Espeche
2014-02-21 12:05:27 +01:00
parent 809693fe5e
commit 03a62575ec
8 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
local/modules/Front/Controller/AddressController.php
View File

@@ -26,6 +26,7 @@ use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
use Thelia\Core\Event\Address\AddressEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Translation\Translator;
use Thelia\Form\AddressCreateForm;
use Thelia\Form\AddressUpdateForm;
use Thelia\Form\Exception\FormValidationException;
@@ -77,9 +78,9 @@ class AddressController extends BaseFrontController
$this->redirectSuccess($addressCreate);
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {
@@ -137,9 +138,9 @@ class AddressController extends BaseFrontController
$this->redirectSuccess($addressUpdate);
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
$this->getParserContext()->set("address_id", $address_id);
if ($message !== false) {

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

@@ -30,6 +30,7 @@ use Thelia\Core\Event\Newsletter\NewsletterEvent;
use Thelia\Core\Security\Authentication\CustomerUsernamePasswordFormAuthenticator;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\UsernameNotFoundException;
use Thelia\Core\Translation\Translator;
use Thelia\Form\CustomerCreateForm;
use Thelia\Form\CustomerLogin;
use Thelia\Form\CustomerLostPasswordForm;
@@ -68,9 +69,9 @@ class CustomerController extends BaseFrontController
$this->dispatch(TheliaEvents::LOST_PASSWORD, $event);
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {
@@ -132,9 +133,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerCreation);
}
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {
@@ -193,9 +194,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerPasswordUpdateForm);
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {
@@ -256,9 +257,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerProfileUpdateForm);
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {
@@ -319,9 +320,9 @@ class CustomerController extends BaseFrontController
}
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {

9
local/modules/Front/Controller/OrderController.php
View File

@@ -28,6 +28,7 @@ use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\PdfEvent;
use Thelia\Core\HttpFoundation\Response;
use Thelia\Core\Template\TemplateHelper;
use Thelia\Core\Translation\Translator;
use Thelia\Exception\TheliaProcessException;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Event\Order\OrderEvent;
@@ -103,11 +104,11 @@ class OrderController extends BaseFrontController
$this->redirectToRoute("order.invoice");
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (PropelException $e) {
$this->getParserContext()->setGeneralError($e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {
@@ -159,11 +160,11 @@ class OrderController extends BaseFrontController
$this->redirectToRoute("order.payment.process");
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage());
} catch (PropelException $e) {
$this->getParserContext()->setGeneralError($e->getMessage());
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage());
}
if ($message !== false) {