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

Profile and Useful was misspelled

Browse Source 
Add missing language key into the dictionary
This commit is contained in:
touffies
2013-11-04 16:35:01 +01:00
parent 2e21713d40
commit 65a8953143
13 changed files with 189 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Action/Customer.php
View File

@@ -60,7 +60,7 @@ class Customer extends BaseAction implements EventSubscriberInterface
}
public function updateProfil(CustomerCreateOrUpdateEvent $event)
public function updateProfile(CustomerCreateOrUpdateEvent $event)
{
$customer = $event->getCustomer();
@@ -166,7 +166,7 @@ class Customer extends BaseAction implements EventSubscriberInterface
return array(
TheliaEvents::CUSTOMER_CREATEACCOUNT => array('create', 128),
TheliaEvents::CUSTOMER_UPDATEACCOUNT => array('modify', 128),
TheliaEvents::CUSTOMER_UPDATEPROFIL => array('updateProfil', 128),
TheliaEvents::CUSTOMER_UPDATEPROFILE => array('updateProfile', 128),
TheliaEvents::CUSTOMER_LOGOUT => array('logout', 128),
TheliaEvents::CUSTOMER_LOGIN => array('login', 128),
TheliaEvents::CUSTOMER_DELETEACCOUNT => array('delete', 128),

2
core/lib/Thelia/Config/Resources/form.xml
View File

@@ -9,7 +9,7 @@
<form name="thelia.front.customer.login" class="Thelia\Form\CustomerLogin"/>
<form name="thelia.front.customer.lostpassword" class="Thelia\Form\CustomerLostPasswordForm"/>
<form name="thelia.front.customer.create" class="Thelia\Form\CustomerCreateForm"/>
<form name="thelia.front.customer.profil.update" class="Thelia\Form\CustomerProfilUpdateForm"/>
<form name="thelia.front.customer.profile.update" class="Thelia\Form\CustomerProfileUpdateForm"/>
<form name="thelia.front.customer.password.update" class="Thelia\Form\CustomerPasswordUpdateForm"/>
<form name="thelia.front.address.create" class="Thelia\Form\AddressCreateForm"/>
<form name="thelia.front.address.update" class="Thelia\Form\AddressUpdateForm"/>

20
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -33,7 +33,7 @@ use Thelia\Form\CustomerCreateForm;
use Thelia\Form\CustomerLogin;
use Thelia\Form\CustomerLostPasswordForm;
use Thelia\Form\CustomerPasswordUpdateForm;
use Thelia\Form\CustomerProfilUpdateForm;
use Thelia\Form\CustomerProfileUpdateForm;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\Customer;
use Thelia\Core\Event\TheliaEvents;
@@ -149,10 +149,10 @@ class CustomerController extends BaseFrontController
'newsletter' => null !== NewsletterQuery::create()->findOneByEmail($customer->getEmail()),
);
$customerProfilUpdateForm = new CustomerProfilUpdateForm($this->getRequest(), 'form', $data);
$customerProfileUpdateForm = new CustomerProfileUpdateForm($this->getRequest(), 'form', $data);
// Pass it to the parser
$this->getParserContext()->addForm($customerProfilUpdateForm);
$this->getParserContext()->addForm($customerProfileUpdateForm);
}
public function updatePasswordAction()
@@ -169,7 +169,7 @@ class CustomerController extends BaseFrontController
$customerChangeEvent = $this->createEventInstance($form->getData());
$customerChangeEvent->setCustomer($customer);
$this->dispatch(TheliaEvents::CUSTOMER_UPDATEPROFIL, $customerChangeEvent);
$this->dispatch(TheliaEvents::CUSTOMER_UPDATEPROFILE, $customerChangeEvent);
$this->redirectSuccess($customerPasswordUpdateForm);
@@ -198,17 +198,17 @@ class CustomerController extends BaseFrontController
$message = false;
$customerProfilUpdateForm = new CustomerProfilUpdateForm($this->getRequest());
$customerProfileUpdateForm = new CustomerProfileUpdateForm($this->getRequest());
try {
$customer = $this->getSecurityContext()->getCustomerUser();
$newsletterOldEmail = $customer->getEmail();
$form = $this->validateForm($customerProfilUpdateForm, "post");
$form = $this->validateForm($customerProfileUpdateForm, "post");
$customerChangeEvent = $this->createEventInstance($form->getData());
$customerChangeEvent->setCustomer($customer);
$this->dispatch(TheliaEvents::CUSTOMER_UPDATEPROFIL, $customerChangeEvent);
$this->dispatch(TheliaEvents::CUSTOMER_UPDATEPROFILE, $customerChangeEvent);
$updatedCustomer = $customerChangeEvent->getCustomer();
@@ -234,7 +234,7 @@ class CustomerController extends BaseFrontController
$this->processLogin($updatedCustomer);
$this->redirectSuccess($customerProfilUpdateForm);
$this->redirectSuccess($customerProfileUpdateForm);
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
@@ -245,10 +245,10 @@ class CustomerController extends BaseFrontController
if ($message !== false) {
Tlog::getInstance()->error(sprintf("Error during customer modification process : %s.", $message));
$customerProfilUpdateForm->setErrorMessage($message);
$customerProfileUpdateForm->setErrorMessage($message);
$this->getParserContext()
->addForm($customerProfilUpdateForm)
->addForm($customerProfileUpdateForm)
->setGeneralError($message)
;
}

4
core/lib/Thelia/Core/Event/TheliaEvents.php
View File

@@ -72,9 +72,9 @@ final class TheliaEvents
const CUSTOMER_UPDATEACCOUNT = "action.updateCustomer";
/**
* sent on customer account update profil
* sent on customer account update profile
*/
const CUSTOMER_UPDATEPROFIL = "action.updateProfilCustomer";
const CUSTOMER_UPDATEPROFILE = "action.updateProfileCustomer";
/**
* sent on customer removal

4
core/lib/Thelia/Form/CustomerProfilUpdateForm.php → core/lib/Thelia/Form/CustomerProfileUpdateForm.php
View File

@@ -26,11 +26,11 @@ use Symfony\Component\Validator\ExecutionContextInterface;
use Thelia\Model\CustomerQuery;
/**
* Class CustomerProfilUpdateForm
* Class CustomerProfileUpdateForm
* @package Thelia\Form
* @author Christophe Laffont <claffont@openstudio.fr>
*/
class CustomerProfilUpdateForm extends CustomerCreateForm
class CustomerProfileUpdateForm extends CustomerCreateForm
{
protected function buildForm()

45
templates/default/I18n/en_US.php
View File

@@ -33,7 +33,7 @@ return array (
'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.',
'Latest articles' => 'Latest articles',
'No articles currently' => 'No articles currently',
'Usefull links' => 'Usefull links',
'Useful links' => 'Useful links',
'Login' => 'Login',
'Follow us' => 'Follow us',
'Newsletter' => 'Newsletter',
@@ -113,11 +113,11 @@ return array (
'Coupon code' => 'Coupon code',
'Ok' => 'Ok',
'Delivery address' => 'Delivery address',
'Billing addres' => 'Billing addres',
'Billing address' => 'Billing address',
'Change address' => 'Change address',
'Choose your payment method' => 'Choose your payment method',
'Secure Payment' => 'Secure Payment',
'You chose to pay by' => 'You chose to pay by',
'You choose to pay by' => 'You choose to pay by',
'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.',
'A summary of your order email has been sent to the following address' => 'A summary of your order email has been sent to the following address',
'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
@@ -139,7 +139,7 @@ return array (
'View order %ref as pdf document' => 'View order %ref as pdf document',
'Order details' => 'Order details',
'You don\'t have orders yet.' => 'You don\'t have orders yet.',
'Update Profil' => 'Update Profil',
'Update Profile' => 'Update Profile',
'Personal Informations' => 'Personal Informations',
'Select Title' => 'Select Title',
'Update' => 'Update',
@@ -152,5 +152,42 @@ return array (
'Select Country' => 'Select Country',
'Create' => 'Create',
'Related' => 'Related',
'The page cannot be found' => 'The page cannot be found',
'What\'s your name?' => 'What\'s your name?',
'So I can get back to you.' => 'So I can get back to you.',
'The subject of your message.' => 'The subject of your message.',
'And your message...' => 'And your message...',
'This email already exists.' => 'This email already exists.',
'Address label' => 'Address label',
'Title' => 'Title',
'First Name' => 'First Name',
'Last Name' => 'Last Name',
'Company Name' => 'Company Name',
'Street Address' => 'Street Address',
'Address Line 2' => 'Address Line 2',
'Address Line 3' => 'Address Line 3',
'City' => 'City',
'Zip code' => 'Zip code',
'Country' => 'Country',
'Phone' => 'Phone',
'Cellphone' => 'Cellphone',
'Make this address as my primary address' => 'Make this address as my primary address',
'Full Name' => 'Full Name',
'Your Email Address' => 'Your Email Address',
'Subject' => 'Subject',
'Your Message' => 'Your Message',
'Please enter your email address' => 'Please enter your email address',
'No, I am a new customer.' => 'No, I am a new customer.',
'Yes, I have a password :' => 'Yes, I have a password :',
'Please enter your password' => 'Please enter your password',
'This value should not be blank.' => 'This value should not be blank.',
'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.',
'This email does not exists' => 'This email does not exists',
'Current Password' => 'Current Password',
'New Password' => 'New Password',
'Password confirmation' => 'Password confirmation',
'Your current password does not match.' => 'Your current password does not match.',
'Password confirmation is not the same as password field.' => 'Password confirmation is not the same as password field.',
'I would like to receive the newsletter or the latest news.' => 'I would like to receive the newsletter or the latest news.',
)
;

45
templates/default/I18n/es_ES.php
View File

@@ -33,7 +33,7 @@ return array (
'Questions ? See or F.A.Q.' => '',
'Latest articles' => '',
'No articles currently' => '',
'Usefull links' => '',
'Useful links' => '',
'Login' => '',
'Follow us' => '',
'Newsletter' => '',
@@ -113,11 +113,11 @@ return array (
'Coupon code' => '',
'Ok' => '',
'Delivery address' => '',
'Billing addres' => '',
'Billing address' => '',
'Change address' => '',
'Choose your payment method' => '',
'Secure Payment' => '',
'You chose to pay by' => '',
'You choose to pay by' => '',
'Thank you for the trust you place in us.' => '',
'A summary of your order email has been sent to the following address' => '',
'Your order will be confirmed by us upon receipt of your payment.' => '',
@@ -139,7 +139,7 @@ return array (
'View order %ref as pdf document' => '',
'Order details' => '',
'You don\'t have orders yet.' => '',
'Update Profil' => '',
'Update Profile' => '',
'Personal Informations' => '',
'Select Title' => '',
'Update' => '',
@@ -152,5 +152,42 @@ return array (
'Select Country' => '',
'Create' => '',
'Related' => '',
'The page cannot be found' => '',
'What\'s your name?' => '',
'So I can get back to you.' => '',
'The subject of your message.' => '',
'And your message...' => '',
'This email already exists.' => '',
'Address label' => '',
'Title' => '',
'First Name' => '',
'Last Name' => '',
'Company Name' => '',
'Street Address' => '',
'Address Line 2' => '',
'Address Line 3' => '',
'City' => '',
'Zip code' => '',
'Country' => '',
'Phone' => '',
'Cellphone' => '',
'Make this address as my primary address' => '',
'Full Name' => '',
'Your Email Address' => '',
'Subject' => '',
'Your Message' => '',
'Please enter your email address' => '',
'No, I am a new customer.' => '',
'Yes, I have a password :' => '',
'Please enter your password' => '',
'This value should not be blank.' => '',
'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
'This email does not exists' => '',
'Current Password' => '',
'New Password' => '',
'Password confirmation' => '',
'Your current password does not match.' => '',
'Password confirmation is not the same as password field.' => '',
'I would like to receive the newsletter or the latest news.' => '',
)
;

48
templates/default/I18n/fr_FR.php
View File

@@ -1,7 +1,7 @@
<?php
return array (
'+ View All' => '',
'+ View All' => 'Tous',
'Thelia V2' => '',
'Skip to content' => '',
'Toggle navigation' => '',
@@ -33,7 +33,7 @@ return array (
'Questions ? See or F.A.Q.' => '',
'Latest articles' => '',
'No articles currently' => '',
'Usefull links' => '',
'Useful links' => '',
'Login' => '',
'Follow us' => '',
'Newsletter' => '',
@@ -113,11 +113,11 @@ return array (
'Coupon code' => '',
'Ok' => '',
'Delivery address' => '',
'Billing addres' => '',
'Billing address' => '',
'Change address' => '',
'Choose your payment method' => '',
'Secure Payment' => '',
'You chose to pay by' => '',
'You choose to pay by' => '',
'Thank you for the trust you place in us.' => '',
'A summary of your order email has been sent to the following address' => '',
'Your order will be confirmed by us upon receipt of your payment.' => '',
@@ -139,7 +139,7 @@ return array (
'View order %ref as pdf document' => '',
'Order details' => '',
'You don\'t have orders yet.' => '',
'Update Profil' => '',
'Update Profile' => '',
'Personal Informations' => '',
'Select Title' => '',
'Update' => '',
@@ -152,5 +152,43 @@ return array (
'Select Country' => '',
'Create' => '',
'Related' => '',
'The page cannot be found' => '',
'What\'s your name?' => '',
'So I can get back to you.' => '',
'The subject of your message.' => '',
'And your message...' => '',
'This email already exists.' => '',
'Address label' => '',
'Title' => '',
'First Name' => '',
'Last Name' => '',
'Company Name' => '',
'Street Address' => '',
'Address Line 2' => '',
'Address Line 3' => '',
'City' => '',
'Zip code' => '',
'Country' => '',
'Phone' => '',
'Cellphone' => '',
'Make this address as my primary address' => '',
'Full Name' => '',
'Your Email Address' => '',
'Subject' => '',
'Your Message' => '',
'Please enter your email address' => '',
'No, I am a new customer.' => '',
'Yes, I have a password :' => '',
'Please enter your password' => '',
'This value should not be blank.' => '',
'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
'This email does not exists' => '',
'Current Password' => '',
'New Password' => '',
'Password confirmation' => '',
'Your current password does not match.' => '',
'Password confirmation is not the same as password field.' => '',
'I would like to receive the newsletter or the latest news.' => '',
)
;

45
templates/default/I18n/it_IT.php
View File

@@ -33,7 +33,7 @@ return array (
'Questions ? See or F.A.Q.' => '',
'Latest articles' => '',
'No articles currently' => '',
'Usefull links' => '',
'Useful links' => '',
'Login' => '',
'Follow us' => '',
'Newsletter' => '',
@@ -113,11 +113,11 @@ return array (
'Coupon code' => '',
'Ok' => '',
'Delivery address' => '',
'Billing addres' => '',
'Billing address' => '',
'Change address' => '',
'Choose your payment method' => '',
'Secure Payment' => '',
'You chose to pay by' => '',
'You choose to pay by' => '',
'Thank you for the trust you place in us.' => '',
'A summary of your order email has been sent to the following address' => '',
'Your order will be confirmed by us upon receipt of your payment.' => '',
@@ -139,7 +139,7 @@ return array (
'View order %ref as pdf document' => '',
'Order details' => '',
'You don\'t have orders yet.' => '',
'Update Profil' => '',
'Update Profile' => '',
'Personal Informations' => '',
'Select Title' => '',
'Update' => '',
@@ -152,5 +152,42 @@ return array (
'Select Country' => '',
'Create' => '',
'Related' => '',
'The page cannot be found' => '',
'What\'s your name?' => '',
'So I can get back to you.' => '',
'The subject of your message.' => '',
'And your message...' => '',
'This email already exists.' => '',
'Address label' => '',
'Title' => '',
'First Name' => '',
'Last Name' => '',
'Company Name' => '',
'Street Address' => '',
'Address Line 2' => '',
'Address Line 3' => '',
'City' => '',
'Zip code' => '',
'Country' => '',
'Phone' => '',
'Cellphone' => '',
'Make this address as my primary address' => '',
'Full Name' => '',
'Your Email Address' => '',
'Subject' => '',
'Your Message' => '',
'Please enter your email address' => '',
'No, I am a new customer.' => '',
'Yes, I have a password :' => '',
'Please enter your password' => '',
'This value should not be blank.' => '',
'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
'This email does not exists' => '',
'Current Password' => '',
'New Password' => '',
'Password confirmation' => '',
'Your current password does not match.' => '',
'Password confirmation is not the same as password field.' => '',
'I would like to receive the newsletter or the latest news.' => '',
)
;

6
templates/default/account-update.html
View File

@@ -8,7 +8,7 @@
{$breadcrumbs = [['title' => {intl l="Account"}, 'url'=>{url path="/account"}]]}
{$breadcrumbs = [
['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
['title' => {intl l="Update Profil"}, 'url'=>{url path="/account/update"}]
['title' => {intl l="Update Profile"}, 'url'=>{url path="/account/update"}]
]}
{/block}
@@ -17,9 +17,9 @@
<article class="col-main" role="main" aria-labelledby="main-label">
<h1 id="main-label" class="page-header">{intl l="Update Profil"}</h1>
<h1 id="main-label" class="page-header">{intl l="Update Profile"}</h1>
{form name="thelia.front.customer.profil.update"}
{form name="thelia.front.customer.profile.update"}
{assign var="isPost" value="{$smarty.post|count}"}
<form id="form-register" class="form-horizontal" action="{url path="/account/update"}" method="post" role="form">
{form_field form=$form field='success_url'}

2
templates/default/layout.tpl
View File

@@ -245,7 +245,7 @@ GNU General Public License : http://www.gnu.org/licenses/
</div>
<div class="col">
<section class="block block-default">
<div class="block-heading"><h3 class="block-title">{intl l="Usefull links"}</h3></div>
<div class="block-heading"><h3 class="block-title">{intl l="Useful links"}</h3></div>
<div class="block-content">
<ul>
{loop name="footer_links" type="content" folder="2"}

2
templates/default/order-invoice.html
View File

@@ -192,7 +192,7 @@
{form_field form=$form field='invoice-address'}
<div class="panel">
<div class="panel-heading">{intl l="Billing addres"}s</div>
<div class="panel-heading">{intl l="Billing address"}s</div>
{if $error}
<span class="help-block"><span class="icon-remove"></span> {$message}</span>

2
templates/default/order-placed.html
View File

@@ -24,7 +24,7 @@
<div id="payment-success" class="panel">
<div class="panel-heading">
<h3 class="panel-title">{intl l="You chose to pay by"} : <span class="payment-method">{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span></h3>
<h3 class="panel-title">{intl l="You choose to pay by"} : <span class="payment-method">{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span></h3>
</div>
<div class="panel-body">
<h3>{intl l="Thank you for the trust you place in us."}</h3>