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

Fixed module translations

Browse Source
This commit is contained in:
Franck Allimant
2014-04-22 12:12:53 +02:00
parent 7054b3d316
commit 9e0dedcb45
4 changed files with 624 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Front\Controller; namespace Front\Controller;
use Front\Front;
use Thelia\Controller\Front\BaseFrontController; use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
use Thelia\Core\Event\Address\AddressEvent; use Thelia\Core\Event\Address\AddressEvent;
@@ -78,9 +79,9 @@ class AddressController extends BaseFrontController
$this->redirectSuccess($addressCreate); $this->redirectSuccess($addressCreate);
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {
@@ -138,9 +139,9 @@ class AddressController extends BaseFrontController
$this->redirectSuccess($addressUpdate); $this->redirectSuccess($addressUpdate);
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
$this->getParserContext()->set("address_id", $address_id); $this->getParserContext()->set("address_id", $address_id);
if ($message !== false) { if ($message !== false) {

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

@@ -22,6 +22,7 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Front\Controller; namespace Front\Controller;
use Front\Front;
use Thelia\Controller\Front\BaseFrontController; use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent; use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
use Thelia\Core\Event\Customer\CustomerLoginEvent; use Thelia\Core\Event\Customer\CustomerLoginEvent;
@@ -69,9 +70,9 @@ class CustomerController extends BaseFrontController
$this->dispatch(TheliaEvents::LOST_PASSWORD, $event); $this->dispatch(TheliaEvents::LOST_PASSWORD, $event);
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {
@@ -133,9 +134,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerCreation); $this->redirectSuccess($customerCreation);
} }
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {
@@ -194,9 +195,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerPasswordUpdateForm); $this->redirectSuccess($customerPasswordUpdateForm);
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {
@@ -257,9 +258,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerProfileUpdateForm); $this->redirectSuccess($customerProfileUpdateForm);
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {
@@ -320,9 +321,9 @@ class CustomerController extends BaseFrontController
} }
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {

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

@@ -102,11 +102,11 @@ class OrderController extends BaseFrontController
$this->redirectToRoute("order.invoice"); $this->redirectToRoute("order.invoice");
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (PropelException $e) { } catch (PropelException $e) {
$this->getParserContext()->setGeneralError($e->getMessage()); $this->getParserContext()->setGeneralError($e->getMessage());
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {
@@ -158,11 +158,11 @@ class OrderController extends BaseFrontController
$this->redirectToRoute("order.payment.process"); $this->redirectToRoute("order.payment.process");
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$message = sprintf(Translator::getInstance()->trans("Please check your input: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Please check your input: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} catch (PropelException $e) { } catch (PropelException $e) {
$this->getParserContext()->setGeneralError($e->getMessage()); $this->getParserContext()->setGeneralError($e->getMessage());
} catch (\Exception $e) { } catch (\Exception $e) {
$message = sprintf(Translator::getInstance()->trans("Sorry, an error occured: %s"), $e->getMessage()); $message = Translator::getInstance()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
} }
if ($message !== false) { if ($message !== false) {

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

@@ -27,9 +27,5 @@ use Thelia\Module\BaseModule;
class Front extends BaseModule class Front extends BaseModule
{ {
/** const MESSAGE_DOMAIN = 'front';
* YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class
* Like install and destroy
*/
} }