From 453a818c5562758d17451d4fb5b374e6a63cbea5 Mon Sep 17 00:00:00 2001 From: touffies Date: Wed, 6 Nov 2013 15:17:52 +0100 Subject: [PATCH 01/25] Display the number of results (Items) on the category page or search page --- templates/default/I18n/en_US.php | 4 ++ templates/default/I18n/es_ES.php | 4 ++ templates/default/I18n/fr_FR.php | 4 ++ templates/default/I18n/it_IT.php | 4 ++ templates/default/category.html | 2 +- templates/default/includes/toolbar.html | 2 +- templates/default/search.html | 3 +- templates/default/view_all.html | 53 ++++++++++--------------- 8 files changed, 41 insertions(+), 35 deletions(-) diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php index 24bf81612..07b7e6411 100755 --- a/templates/default/I18n/en_US.php +++ b/templates/default/I18n/en_US.php @@ -156,6 +156,10 @@ return array ( 'List' => 'List', 'Next' => 'Next', 'Previous' => 'Previous', + '%nb Items' => '%nb Items', + '%nb Item' => '%nb Item', + 'Latest products' => 'Latest products', + 'Product Offers' => 'Product Offers', /* 'The page cannot be found' => 'The page cannot be found', 'What\'s your name?' => 'What\'s your name?', diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php index 427227f1c..a5c5950ee 100755 --- a/templates/default/I18n/es_ES.php +++ b/templates/default/I18n/es_ES.php @@ -156,6 +156,10 @@ return array ( 'List' => '', 'Next' => '', 'Previous' => '', + '%nb Items' => '', + '%nb Item' => '', + 'Latest products' => '', + 'Product Offers' => '', /* 'The page cannot be found' => '', 'What\'s your name?' => '', diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php index b5f6a6290..3ed34e1f7 100755 --- a/templates/default/I18n/fr_FR.php +++ b/templates/default/I18n/fr_FR.php @@ -156,6 +156,10 @@ return array ( 'List' => 'Liste', 'Next' => 'Suivant', 'Previous' => 'Précédent', + '%nb Items' => '%nb produits', + '%nb Item' => '%nb produit', + 'Latest products' => 'Derniers produits', + 'Product Offers' => 'Produits en promotion', /* 'The page cannot be found' => '', diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php index 427227f1c..a5c5950ee 100755 --- a/templates/default/I18n/it_IT.php +++ b/templates/default/I18n/it_IT.php @@ -156,6 +156,10 @@ return array ( 'List' => '', 'Next' => '', 'Previous' => '', + '%nb Items' => '', + '%nb Item' => '', + 'Latest products' => '', + 'Product Offers' => '', /* 'The page cannot be found' => '', 'What\'s your name?' => '', diff --git a/templates/default/category.html b/templates/default/category.html index b47abd222..f89deef2c 100644 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -19,7 +19,7 @@ {$product_order={$smarty.get.order|default:'alpha'}}
{ifloop rel="product_list"} - {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order} + {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" category={category attr="id"}}}
    diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html index c512ba90a..07733634b 100644 --- a/templates/default/includes/toolbar.html +++ b/templates/default/includes/toolbar.html @@ -1,7 +1,7 @@
+ {ifloop rel="product_promo"}

{intl l="Offers"} {intl l="+ View All"}

@@ -107,8 +122,8 @@ {loop name="product_promo" type="product" limit="5" promo="yes"} {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"} {/loop} -
+ {/ifloop} {/block} \ No newline at end of file From 14e5ee62a79042abf69698d28506a31a7328a64c Mon Sep 17 00:00:00 2001 From: touffies Date: Wed, 6 Nov 2013 18:57:22 +0100 Subject: [PATCH 04/25] Hide pagination if there is only 1 page --- templates/default/category.html | 5 +-- templates/default/includes/toolbar.html | 46 +++++++++++++------------ templates/default/search.html | 5 +-- templates/default/view_all.html | 6 ++-- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/templates/default/category.html b/templates/default/category.html index f89deef2c..c47708ced 100644 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -19,7 +19,8 @@ {$product_order={$smarty.get.order|default:'alpha'}}
{ifloop rel="product_list"} - {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" category={category attr="id"}}} + {assign var="amount" value="{count type="product" category={category attr="id"}}"} + {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
    @@ -29,7 +30,7 @@
- {include file="includes/toolbar.html" toolbar="bottom"} + {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}} {/ifloop} {elseloop rel="product_list"}
diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html index 07733634b..ff8b0d69b 100644 --- a/templates/default/includes/toolbar.html +++ b/templates/default/includes/toolbar.html @@ -37,31 +37,33 @@
{else} -
- {intl l="Pagination"} -
    + {if $amount > $limit} +
    + {intl l="Pagination"} +
      - {if $product_page > 1} -
      • - {else} -
      • - {/if} - {pageloop rel="product_list"} - {if $PAGE != $CURRENT} -
    • {$PAGE}
      • - {else} -
    • {$PAGE}
      • - {/if} - {if $PAGE == $LAST} - {if $CURRENT < $LAST} -
      • + {if $product_page > 1} +
      • {else} -
      • +
      • {/if} + {pageloop rel="product_list"} + {if $PAGE != $CURRENT} +
    • {$PAGE}
      • + {else} +
    • {$PAGE}
      • + {/if} + {if $PAGE == $LAST} + {if $CURRENT < $LAST} +
      • + {else} +
      • + {/if} - {/if} - {/pageloop} -
    -
    + {/if} + {/pageloop} +
+
+ {/if} {/if}
diff --git a/templates/default/search.html b/templates/default/search.html index ff8955cf0..2151ace21 100644 --- a/templates/default/search.html +++ b/templates/default/search.html @@ -20,7 +20,8 @@

{intl l="Search Result for"} {$smarty.get.q}

- {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" title="{$smarty.get.q}"}} + {assign var="amount" value="{count type="product" title="{$smarty.get.q}"}"} + {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
{ifloop rel="product_list"} @@ -36,7 +37,7 @@
{ifloop rel="product_list"} - {include file="includes/toolbar.html" toolbar="bottom"} + {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}} {/ifloop}
diff --git a/templates/default/view_all.html b/templates/default/view_all.html index 4d2fb66be..6e2c709bc 100644 --- a/templates/default/view_all.html +++ b/templates/default/view_all.html @@ -22,8 +22,8 @@

{if $product_type == "new"}{intl l="Latest products"}{elseif $product_type == "offers"}{intl l="Product Offers"}{/if}

- - {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" promo="{$product_type == "offers"}" new="{$product_type == "new"}"}} + {assign var="amount" value="{count type="product" promo="{$product_type == "offers"}" new="{$product_type == "new"}"}"} + {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
{ifloop rel="product_list"} @@ -39,7 +39,7 @@
{ifloop rel="product_list"} - {include file="includes/toolbar.html" toolbar="bottom"} + {include file="includes/toolbar.html" toolbar="bottom" amount={$amount}} {/ifloop}
From e262c41987f7a69b7978d385c39c76c21029c341 Mon Sep 17 00:00:00 2001 From: touffies Date: Wed, 6 Nov 2013 19:30:52 +0100 Subject: [PATCH 05/25] Add sample product and default message when you install thelia --- templates/default/I18n/en_US.php | 437 +++++++++--------- templates/default/I18n/es_ES.php | 437 +++++++++--------- templates/default/I18n/fr_FR.php | 11 + templates/default/I18n/it_IT.php | 437 +++++++++--------- templates/default/demo/product-new.html | 19 - templates/default/includes/product-empty.html | 35 ++ templates/default/index.html | 182 ++++---- 7 files changed, 805 insertions(+), 753 deletions(-) delete mode 100644 templates/default/demo/product-new.html create mode 100644 templates/default/includes/product-empty.html diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php index 07b7e6411..bd8695b60 100755 --- a/templates/default/I18n/en_US.php +++ b/templates/default/I18n/en_US.php @@ -1,218 +1,229 @@ '+ View All', - 'Thelia V2' => 'Thelia V2', - 'Skip to content' => 'Skip to content', - 'Toggle navigation' => 'Toggle navigation', - 'Main Navigation' => 'Main Navigation', - 'Register!' => 'Register!', - 'Log In!' => 'Log In!', - 'Sign In' => 'Sign In', - 'Register' => 'Register', - 'Cart' => 'Cart', - 'View Cart' => 'View Cart', - 'Checkout' => 'Checkout', - 'You have no items in your shopping cart.' => 'You have no items in your shopping cart.', - 'Home' => 'Home', - 'Search a product' => 'Search a product', - 'Search...' => 'Search...', - 'Minimum 2 characters.' => 'Minimum 2 characters.', - 'Search' => 'Search', - 'Language:' => 'Language:', - 'Currency:' => 'Currency:', - 'Latest' => 'Latest', - 'Offers' => 'Offers', - 'Special Price:' => 'Special Price:', - 'Regular Price:' => 'Regular Price:', - 'Free shipping' => 'Free shipping', - 'Orders over $50' => 'Orders over $50', - 'Secure payment' => 'Secure payment', - 'Multi-payment platform' => 'Multi-payment platform', - 'Need help ?' => 'Need help ?', - 'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.', - 'Latest articles' => 'Latest articles', - 'No articles currently' => 'No articles currently', - 'Useful links' => 'Useful links', - 'Login' => 'Login', - 'Follow us' => 'Follow us', - 'Newsletter' => 'Newsletter', - 'Sign up to receive our latest news.' => 'Sign up to receive our latest news.', - 'Email address' => 'Email address', - 'Your email address' => 'Your email address', - 'Subscribe' => 'Subscribe', - 'Contact Us' => 'Contact Us', - 'Copyright' => 'Copyright', - 'You are here:' => 'You are here:', - 'Show' => 'Show', - 'per page' => 'per page', - 'Sort By' => 'Sort By', - 'Name ascending' => 'Name ascending', - 'Name descending' => 'Name descending', - 'Price ascending' => 'Price ascending', - 'Price descending' => 'Price descending', - 'View as' => 'View as', - 'View product' => 'View product', - 'Pagination' => 'Pagination', - 'No products available in this category' => 'No products available in this category', - 'Categories' => 'Categories', - 'Ref.' => 'Ref.', - 'Availability' => 'Availability', - 'In stock' => 'In stock', - 'Out of stock' => 'Out of stock', - 'Add to cart' => 'Add to cart', - 'Description' => 'Description', - 'Additional Info' => 'Additional Info', - 'View cart' => 'View cart', - 'Continue Shopping' => 'Continue Shopping', - 'Upsell Products' => 'Upsell Products', - 'Your Cart' => 'Your Cart', - 'Billing and delivery' => 'Billing and delivery', - 'Check my order' => 'Check my order', - 'Product Name' => 'Product Name', - 'Name' => 'Name', - 'Unit Price' => 'Unit Price', - 'Price' => 'Price', - 'Quantity' => 'Quantity', - 'Qty' => 'Qty', - 'Total' => 'Total', - 'Tax Inclusive' => 'Tax Inclusive', - 'TTC' => 'TTC', - 'Available' => 'Available', - 'In Stock' => 'In Stock', - 'No.' => 'No.', - 'Remove' => 'Remove', - 'Proceed checkout' => 'Proceed checkout', - 'Warning' => 'Warning', - 'missing or invalid data' => 'missing or invalid data', - 'Do you have an account?' => 'Do you have an account?', - 'Forgot your Password?' => 'Forgot your Password?', - 'Next' => 'Next', - 'Log out!' => 'Log out!', - 'My Account' => 'My Account', - 'Previous product' => 'Previous product', - 'Next product' => 'Next product', - 'instead of' => 'instead of', - 'Add a new address' => 'Add a new address', - 'Choose your delivery address' => 'Choose your delivery address', - 'Address %nb' => 'Address %nb', - 'Edit this address' => 'Edit this address', - 'Edit' => 'Edit', - 'Remove this address' => 'Remove this address', - 'Cancel' => 'Cancel', - 'Choose your delivery method' => 'Choose your delivery method', - 'Back' => 'Back', - 'Next Step' => 'Next Step', - 'Delete address' => 'Delete address', - 'Do you really want to delete this address ?' => 'Do you really want to delete this address ?', - 'No' => 'No', - 'Yes' => 'Yes', - 'Shipping Tax' => 'Shipping Tax', - 'You may have a coupon ?' => 'You may have a coupon ?', - 'Code :' => 'Code :', - 'Coupon code' => 'Coupon code', - 'Ok' => 'Ok', - 'Delivery address' => 'Delivery address', - 'Billing address' => 'Billing address', - 'Change address' => 'Change address', - 'Choose your payment method' => 'Choose your payment method', - 'Secure Payment' => 'Secure Payment', - '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.', - 'Order number' => 'Order number', - 'Date' => 'Date', - 'Go home' => 'Go home', - 'Account' => 'Account', - 'Personal Information' => 'Personal Information', - 'Change my account information' => 'Change my account information', - 'Change my password' => 'Change my password', - 'My Address book' => 'My Address book', - 'My Address Books' => 'My Address Books', - 'My Orders' => 'My Orders', - 'List of orders' => 'List of orders', - 'Order Number' => 'Order Number', - 'Amount' => 'Amount', - 'Status' => 'Status', - 'View' => 'View', - '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 Profile' => 'Update Profile', - 'Personal Informations' => 'Personal Informations', - 'Select Title' => 'Select Title', - 'Update' => 'Update', - 'Change Password' => 'Change Password', - 'Login Information' => 'Login Information', - 'Create New Address' => 'Create New Address', - 'Address' => 'Address', - 'Home address' => 'Home address', - 'Complementary address' => 'Complementary address', - 'Select Country' => 'Select Country', - 'Create' => 'Create', - 'Related' => 'Related', - 'Grid' => 'Grid', - 'List' => 'List', - 'Next' => 'Next', - 'Previous' => 'Previous', - '%nb Items' => '%nb Items', - '%nb Item' => '%nb Item', - 'Latest products' => 'Latest products', - 'Product Offers' => 'Product Offers', -/* - '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.', -*/ - 'Placeholder firstname' => 'John', - 'Placeholder lastname' => 'Doe', - 'Placeholder email' => 'johndoe@domain.com', - 'Placeholder phone' => '', - 'Placeholder cellphone' => '', - 'Placeholder company' => 'Google', - 'Placeholder address1' => '76 Ninth Avenue', - 'Placeholder address2' => '', - 'Placeholder city' => 'New York', - 'Placeholder zipcode' => 'NY 10011', - 'Placeholder address label' => 'Home, Work office, other', - 'Placeholder contact name' => 'What\'s your name?', - 'Placeholder contact email' => 'So I can get back to you.', - 'Placeholder contact subject' => 'The subject of your message.', - 'Placeholder contact message' => 'And your message...', + '+ View All' => '+ View All', + 'Thelia V2' => 'Thelia V2', + 'Skip to content' => 'Skip to content', + 'Toggle navigation' => 'Toggle navigation', + 'Main Navigation' => 'Main Navigation', + 'Register!' => 'Register!', + 'Log In!' => 'Log In!', + 'Sign In' => 'Sign In', + 'Register' => 'Register', + 'Cart' => 'Cart', + 'View Cart' => 'View Cart', + 'Checkout' => 'Checkout', + 'You have no items in your shopping cart.' => 'You have no items in your shopping cart.', + 'Home' => 'Home', + 'Search a product' => 'Search a product', + 'Search...' => 'Search...', + 'Minimum 2 characters.' => 'Minimum 2 characters.', + 'Search' => 'Search', + 'Language:' => 'Language:', + 'Currency:' => 'Currency:', + 'Latest' => 'Latest', + 'Offers' => 'Offers', + 'Special Price:' => 'Special Price:', + 'Regular Price:' => 'Regular Price:', + 'Free shipping' => 'Free shipping', + 'Orders over $50' => 'Orders over $50', + 'Secure payment' => 'Secure payment', + 'Multi-payment platform' => 'Multi-payment platform', + 'Need help ?' => 'Need help ?', + 'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.', + 'Latest articles' => 'Latest articles', + 'No articles currently' => 'No articles currently', + 'Useful links' => 'Useful links', + 'Login' => 'Login', + 'Follow us' => 'Follow us', + 'Newsletter' => 'Newsletter', + 'Sign up to receive our latest news.' => 'Sign up to receive our latest news.', + 'Email address' => 'Email address', + 'Your email address' => 'Your email address', + 'Subscribe' => 'Subscribe', + 'Contact Us' => 'Contact Us', + 'Copyright' => 'Copyright', + 'You are here:' => 'You are here:', + 'Show' => 'Show', + 'per page' => 'per page', + 'Sort By' => 'Sort By', + 'Name ascending' => 'Name ascending', + 'Name descending' => 'Name descending', + 'Price ascending' => 'Price ascending', + 'Price descending' => 'Price descending', + 'View as' => 'View as', + 'View product' => 'View product', + 'Pagination' => 'Pagination', + 'No products available in this category' => 'No products available in this category', + 'Categories' => 'Categories', + 'Ref.' => 'Ref.', + 'Availability' => 'Availability', + 'In stock' => 'In stock', + 'Out of stock' => 'Out of stock', + 'Add to cart' => 'Add to cart', + 'Description' => 'Description', + 'Additional Info' => 'Additional Info', + 'View cart' => 'View cart', + 'Continue Shopping' => 'Continue Shopping', + 'Upsell Products' => 'Upsell Products', + 'Your Cart' => 'Your Cart', + 'Billing and delivery' => 'Billing and delivery', + 'Check my order' => 'Check my order', + 'Product Name' => 'Product Name', + 'Name' => 'Name', + 'Unit Price' => 'Unit Price', + 'Price' => 'Price', + 'Quantity' => 'Quantity', + 'Qty' => 'Qty', + 'Total' => 'Total', + 'Tax Inclusive' => 'Tax Inclusive', + 'TTC' => 'TTC', + 'Available' => 'Available', + 'In Stock' => 'In Stock', + 'No.' => 'No.', + 'Remove' => 'Remove', + 'Proceed checkout' => 'Proceed checkout', + 'Warning' => 'Warning', + 'missing or invalid data' => 'missing or invalid data', + 'Do you have an account?' => 'Do you have an account?', + 'Forgot your Password?' => 'Forgot your Password?', + 'Next' => 'Next', + 'Log out!' => 'Log out!', + 'My Account' => 'My Account', + 'Previous product' => 'Previous product', + 'Next product' => 'Next product', + 'instead of' => 'instead of', + 'Add a new address' => 'Add a new address', + 'Choose your delivery address' => 'Choose your delivery address', + 'Address %nb' => 'Address %nb', + 'Edit this address' => 'Edit this address', + 'Edit' => 'Edit', + 'Remove this address' => 'Remove this address', + 'Cancel' => 'Cancel', + 'Choose your delivery method' => 'Choose your delivery method', + 'Back' => 'Back', + 'Next Step' => 'Next Step', + 'Delete address' => 'Delete address', + 'Do you really want to delete this address ?' => 'Do you really want to delete this address ?', + 'No' => 'No', + 'Yes' => 'Yes', + 'Shipping Tax' => 'Shipping Tax', + 'You may have a coupon ?' => 'You may have a coupon ?', + 'Code :' => 'Code :', + 'Coupon code' => 'Coupon code', + 'Ok' => 'Ok', + 'Delivery address' => 'Delivery address', + 'Billing address' => 'Billing address', + 'Change address' => 'Change address', + 'Choose your payment method' => 'Choose your payment method', + 'Secure Payment' => 'Secure Payment', + '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.', + 'Order number' => 'Order number', + 'Date' => 'Date', + 'Go home' => 'Go home', + 'Account' => 'Account', + 'Personal Information' => 'Personal Information', + 'Change my account information' => 'Change my account information', + 'Change my password' => 'Change my password', + 'My Address book' => 'My Address book', + 'My Address Books' => 'My Address Books', + 'My Orders' => 'My Orders', + 'List of orders' => 'List of orders', + 'Order Number' => 'Order Number', + 'Amount' => 'Amount', + 'Status' => 'Status', + 'View' => 'View', + '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 Profile' => 'Update Profile', + 'Personal Informations' => 'Personal Informations', + 'Select Title' => 'Select Title', + 'Update' => 'Update', + 'Change Password' => 'Change Password', + 'Login Information' => 'Login Information', + 'Create New Address' => 'Create New Address', + 'Address' => 'Address', + 'Home address' => 'Home address', + 'Complementary address' => 'Complementary address', + 'Select Country' => 'Select Country', + 'Create' => 'Create', + 'Related' => 'Related', + 'Grid' => 'Grid', + 'List' => 'List', + 'Next' => 'Next', + 'Previous' => 'Previous', + '%nb Items' => '%nb Items', + '%nb Item' => '%nb Item', + 'Latest products' => 'Latest products', + 'Product Offers' => 'Product Offers', + /* + '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.', + */ + // Product Empty + 'Product Empty Title' => 'Welcome', + 'Product Empty Message' => 'It\'s really quick to add a product. +
    +
  1. Check NEW under the details tab if you want to see your product in the latest product section.
    2. +
  2. Check SALE under the details tab if you want to see your product in the offer product section.
    3. +
', + 'Product Empty Button' => 'Add my first product', + 'Demo product title' => 'Demo product title', + 'Demo product description' => 'Demo product description', + // Placeholder + 'Placeholder firstname' => 'John', + 'Placeholder lastname' => 'Doe', + 'Placeholder email' => 'johndoe@domain.com', + 'Placeholder phone' => '', + 'Placeholder cellphone' => '', + 'Placeholder company' => 'Google', + 'Placeholder address1' => '76 Ninth Avenue', + 'Placeholder address2' => '', + 'Placeholder city' => 'New York', + 'Placeholder zipcode' => 'NY 10011', + 'Placeholder address label' => 'Home, Work office, other', + 'Placeholder contact name' => 'What\'s your name?', + 'Placeholder contact email' => 'So I can get back to you.', + 'Placeholder contact subject' => 'The subject of your message.', + 'Placeholder contact message' => 'And your message...', ) ; \ No newline at end of file diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php index a5c5950ee..e4004de1e 100755 --- a/templates/default/I18n/es_ES.php +++ b/templates/default/I18n/es_ES.php @@ -1,218 +1,229 @@ '', - 'Thelia V2' => '', - 'Skip to content' => '', - 'Toggle navigation' => '', - 'Main Navigation' => '', - 'Register!' => '', - 'Log In!' => '', - 'Sign In' => '', - 'Register' => '', - 'Cart' => '', - 'View Cart' => '', - 'Checkout' => '', - 'You have no items in your shopping cart.' => '', - 'Home' => '', - 'Search a product' => '', - 'Search...' => '', - 'Minimum 2 characters.' => '', - 'Search' => '', - 'Language:' => '', - 'Currency:' => '', - 'Latest' => '', - 'Offers' => '', - 'Special Price:' => '', - 'Regular Price:' => '', - 'Free shipping' => '', - 'Orders over $50' => '', - 'Secure payment' => '', - 'Multi-payment platform' => '', - 'Need help ?' => '', - 'Questions ? See or F.A.Q.' => '', - 'Latest articles' => '', - 'No articles currently' => '', - 'Useful links' => '', - 'Login' => '', - 'Follow us' => '', - 'Newsletter' => '', - 'Sign up to receive our latest news.' => '', - 'Email address' => '', - 'Your email address' => '', - 'Subscribe' => '', - 'Contact Us' => '', - 'Copyright' => '', - 'You are here:' => '', - 'Show' => '', - 'per page' => '', - 'Sort By' => '', - 'Name ascending' => '', - 'Name descending' => '', - 'Price ascending' => '', - 'Price descending' => '', - 'View as' => '', - 'View product' => '', - 'Pagination' => '', - 'No products available in this category' => '', - 'Categories' => '', - 'Ref.' => '', - 'Availability' => '', - 'In stock' => '', - 'Out of stock' => '', - 'Add to cart' => '', - 'Description' => '', - 'Additional Info' => '', - 'View cart' => '', - 'Continue Shopping' => '', - 'Upsell Products' => '', - 'Your Cart' => '', - 'Billing and delivery' => '', - 'Check my order' => '', - 'Product Name' => '', - 'Name' => '', - 'Unit Price' => '', - 'Price' => '', - 'Quantity' => '', - 'Qty' => '', - 'Total' => '', - 'Tax Inclusive' => '', - 'TTC' => '', - 'Available' => '', - 'In Stock' => '', - 'No.' => '', - 'Remove' => '', - 'Proceed checkout' => '', - 'Warning' => '', - 'missing or invalid data' => '', - 'Do you have an account?' => '', - 'Forgot your Password?' => '', - 'Next' => '', - 'Log out!' => '', - 'My Account' => '', - 'Previous product' => '', - 'Next product' => '', - 'instead of' => '', - 'Add a new address' => '', - 'Choose your delivery address' => '', - 'Address %nb' => '', - 'Edit this address' => '', - 'Edit' => '', - 'Remove this address' => '', - 'Cancel' => '', - 'Choose your delivery method' => '', - 'Back' => '', - 'Next Step' => '', - 'Delete address' => '', - 'Do you really want to delete this address ?' => '', - 'No' => '', - 'Yes' => '', - 'Shipping Tax' => '', - 'You may have a coupon ?' => '', - 'Code :' => '', - 'Coupon code' => '', - 'Ok' => '', - 'Delivery address' => '', - 'Billing address' => '', - 'Change address' => '', - 'Choose your payment method' => '', - 'Secure Payment' => '', - '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.' => '', - 'Order number' => '', - 'Date' => '', - 'Go home' => '', - 'Account' => '', - 'Personal Information' => '', - 'Change my account information' => '', - 'Change my password' => '', - 'My Address book' => '', - 'My Address Books' => '', - 'My Orders' => '', - 'List of orders' => '', - 'Order Number' => '', - 'Amount' => '', - 'Status' => '', - 'View' => '', - 'View order %ref as pdf document' => '', - 'Order details' => '', - 'You don\'t have orders yet.' => '', - 'Update Profile' => '', - 'Personal Informations' => '', - 'Select Title' => '', - 'Update' => '', - 'Change Password' => '', - 'Login Information' => '', - 'Create New Address' => '', - 'Address' => '', - 'Home address' => '', - 'Complementary address' => '', - 'Select Country' => '', - 'Create' => '', - 'Related' => '', - 'Grid' => '', - 'List' => '', - 'Next' => '', - 'Previous' => '', - '%nb Items' => '', - '%nb Item' => '', - 'Latest products' => '', - 'Product Offers' => '', -/* - '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.' => '', -*/ - 'Placeholder firstname' => '', - 'Placeholder lastname' => '', - 'Placeholder email' => '', - 'Placeholder phone' => '', - 'Placeholder cellphone' => '', - 'Placeholder company' => '', - 'Placeholder address1' => '', - 'Placeholder address2' => '', - 'Placeholder city' => '', - 'Placeholder zipcode' => '', - 'Placeholder address label' => '', - 'Placeholder contact name' => '', - 'Placeholder contact email' => '', - 'Placeholder contact subject' => '', - 'Placeholder contact message' => '', + '+ View All' => '', + 'Thelia V2' => '', + 'Skip to content' => '', + 'Toggle navigation' => '', + 'Main Navigation' => '', + 'Register!' => '', + 'Log In!' => '', + 'Sign In' => '', + 'Register' => '', + 'Cart' => '', + 'View Cart' => '', + 'Checkout' => '', + 'You have no items in your shopping cart.' => '', + 'Home' => '', + 'Search a product' => '', + 'Search...' => '', + 'Minimum 2 characters.' => '', + 'Search' => '', + 'Language:' => '', + 'Currency:' => '', + 'Latest' => '', + 'Offers' => '', + 'Special Price:' => '', + 'Regular Price:' => '', + 'Free shipping' => '', + 'Orders over $50' => '', + 'Secure payment' => '', + 'Multi-payment platform' => '', + 'Need help ?' => '', + 'Questions ? See or F.A.Q.' => '', + 'Latest articles' => '', + 'No articles currently' => '', + 'Useful links' => '', + 'Login' => '', + 'Follow us' => '', + 'Newsletter' => '', + 'Sign up to receive our latest news.' => '', + 'Email address' => '', + 'Your email address' => '', + 'Subscribe' => '', + 'Contact Us' => '', + 'Copyright' => '', + 'You are here:' => '', + 'Show' => '', + 'per page' => '', + 'Sort By' => '', + 'Name ascending' => '', + 'Name descending' => '', + 'Price ascending' => '', + 'Price descending' => '', + 'View as' => '', + 'View product' => '', + 'Pagination' => '', + 'No products available in this category' => '', + 'Categories' => '', + 'Ref.' => '', + 'Availability' => '', + 'In stock' => '', + 'Out of stock' => '', + 'Add to cart' => '', + 'Description' => '', + 'Additional Info' => '', + 'View cart' => '', + 'Continue Shopping' => '', + 'Upsell Products' => '', + 'Your Cart' => '', + 'Billing and delivery' => '', + 'Check my order' => '', + 'Product Name' => '', + 'Name' => '', + 'Unit Price' => '', + 'Price' => '', + 'Quantity' => '', + 'Qty' => '', + 'Total' => '', + 'Tax Inclusive' => '', + 'TTC' => '', + 'Available' => '', + 'In Stock' => '', + 'No.' => '', + 'Remove' => '', + 'Proceed checkout' => '', + 'Warning' => '', + 'missing or invalid data' => '', + 'Do you have an account?' => '', + 'Forgot your Password?' => '', + 'Next' => '', + 'Log out!' => '', + 'My Account' => '', + 'Previous product' => '', + 'Next product' => '', + 'instead of' => '', + 'Add a new address' => '', + 'Choose your delivery address' => '', + 'Address %nb' => '', + 'Edit this address' => '', + 'Edit' => '', + 'Remove this address' => '', + 'Cancel' => '', + 'Choose your delivery method' => '', + 'Back' => '', + 'Next Step' => '', + 'Delete address' => '', + 'Do you really want to delete this address ?' => '', + 'No' => '', + 'Yes' => '', + 'Shipping Tax' => '', + 'You may have a coupon ?' => '', + 'Code :' => '', + 'Coupon code' => '', + 'Ok' => '', + 'Delivery address' => '', + 'Billing address' => '', + 'Change address' => '', + 'Choose your payment method' => '', + 'Secure Payment' => '', + '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.' => '', + 'Order number' => '', + 'Date' => '', + 'Go home' => '', + 'Account' => '', + 'Personal Information' => '', + 'Change my account information' => '', + 'Change my password' => '', + 'My Address book' => '', + 'My Address Books' => '', + 'My Orders' => '', + 'List of orders' => '', + 'Order Number' => '', + 'Amount' => '', + 'Status' => '', + 'View' => '', + 'View order %ref as pdf document' => '', + 'Order details' => '', + 'You don\'t have orders yet.' => '', + 'Update Profile' => '', + 'Personal Informations' => '', + 'Select Title' => '', + 'Update' => '', + 'Change Password' => '', + 'Login Information' => '', + 'Create New Address' => '', + 'Address' => '', + 'Home address' => '', + 'Complementary address' => '', + 'Select Country' => '', + 'Create' => '', + 'Related' => '', + 'Grid' => '', + 'List' => '', + 'Next' => '', + 'Previous' => '', + '%nb Items' => '', + '%nb Item' => '', + 'Latest products' => '', + 'Product Offers' => '', + /* + '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.' => '', + */ + // Product Empty + 'Product Empty Title' => 'Welcome', + 'Product Empty Message' => 'It\'s really quick to add a product. +
    +
  1. Check NEW under the details tab if you want to see your product in the latest product section.
    2. +
  2. Check SALE under the details tab if you want to see your product in the offer product section.
    3. +
', + 'Product Empty Button' => 'Add my first product', + 'Demo product title' => 'Demo product title', + 'Demo product description' => 'Demo product description', + // Placeholder + 'Placeholder firstname' => '', + 'Placeholder lastname' => '', + 'Placeholder email' => '', + 'Placeholder phone' => '', + 'Placeholder cellphone' => '', + 'Placeholder company' => '', + 'Placeholder address1' => '', + 'Placeholder address2' => '', + 'Placeholder city' => '', + 'Placeholder zipcode' => '', + 'Placeholder address label' => '', + 'Placeholder contact name' => '', + 'Placeholder contact email' => '', + 'Placeholder contact subject' => '', + 'Placeholder contact message' => '', ) ; \ No newline at end of file diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php index 3ed34e1f7..9e00957cb 100755 --- a/templates/default/I18n/fr_FR.php +++ b/templates/default/I18n/fr_FR.php @@ -200,6 +200,17 @@ return array ( 'Password confirmation is not the same as password field.' => '', 'I would like to receive the newsletter or the latest news.' => '', */ + // Product Empty + 'Product Empty Title' => 'Bonjour', + 'Product Empty Message' => 'C\'est très simple d\'ajouter un produit dans l\'adminsitration. +
    +
  1. N\'oubliez pas de sélectionner NEW dans l\'onglet Details afin de voir votre produit dans la section des nouveautés.
    2. +
  2. N\'oubliez pas de sélectionner SALE dans l\'onglet Details afin de voir votre produit dans la section des promotions.
    3. +
', + 'Product Empty Button' => 'Ajouter mon premier produit', + 'Demo product title' => 'Example de titre', + 'Demo product description' => 'Example de description de produit', + // Placeholder 'Placeholder firstname' => 'Prénom', 'Placeholder lastname' => 'Nom de famille', 'Placeholder email' => 'Adresse e-mail', diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php index a5c5950ee..e4004de1e 100755 --- a/templates/default/I18n/it_IT.php +++ b/templates/default/I18n/it_IT.php @@ -1,218 +1,229 @@ '', - 'Thelia V2' => '', - 'Skip to content' => '', - 'Toggle navigation' => '', - 'Main Navigation' => '', - 'Register!' => '', - 'Log In!' => '', - 'Sign In' => '', - 'Register' => '', - 'Cart' => '', - 'View Cart' => '', - 'Checkout' => '', - 'You have no items in your shopping cart.' => '', - 'Home' => '', - 'Search a product' => '', - 'Search...' => '', - 'Minimum 2 characters.' => '', - 'Search' => '', - 'Language:' => '', - 'Currency:' => '', - 'Latest' => '', - 'Offers' => '', - 'Special Price:' => '', - 'Regular Price:' => '', - 'Free shipping' => '', - 'Orders over $50' => '', - 'Secure payment' => '', - 'Multi-payment platform' => '', - 'Need help ?' => '', - 'Questions ? See or F.A.Q.' => '', - 'Latest articles' => '', - 'No articles currently' => '', - 'Useful links' => '', - 'Login' => '', - 'Follow us' => '', - 'Newsletter' => '', - 'Sign up to receive our latest news.' => '', - 'Email address' => '', - 'Your email address' => '', - 'Subscribe' => '', - 'Contact Us' => '', - 'Copyright' => '', - 'You are here:' => '', - 'Show' => '', - 'per page' => '', - 'Sort By' => '', - 'Name ascending' => '', - 'Name descending' => '', - 'Price ascending' => '', - 'Price descending' => '', - 'View as' => '', - 'View product' => '', - 'Pagination' => '', - 'No products available in this category' => '', - 'Categories' => '', - 'Ref.' => '', - 'Availability' => '', - 'In stock' => '', - 'Out of stock' => '', - 'Add to cart' => '', - 'Description' => '', - 'Additional Info' => '', - 'View cart' => '', - 'Continue Shopping' => '', - 'Upsell Products' => '', - 'Your Cart' => '', - 'Billing and delivery' => '', - 'Check my order' => '', - 'Product Name' => '', - 'Name' => '', - 'Unit Price' => '', - 'Price' => '', - 'Quantity' => '', - 'Qty' => '', - 'Total' => '', - 'Tax Inclusive' => '', - 'TTC' => '', - 'Available' => '', - 'In Stock' => '', - 'No.' => '', - 'Remove' => '', - 'Proceed checkout' => '', - 'Warning' => '', - 'missing or invalid data' => '', - 'Do you have an account?' => '', - 'Forgot your Password?' => '', - 'Next' => '', - 'Log out!' => '', - 'My Account' => '', - 'Previous product' => '', - 'Next product' => '', - 'instead of' => '', - 'Add a new address' => '', - 'Choose your delivery address' => '', - 'Address %nb' => '', - 'Edit this address' => '', - 'Edit' => '', - 'Remove this address' => '', - 'Cancel' => '', - 'Choose your delivery method' => '', - 'Back' => '', - 'Next Step' => '', - 'Delete address' => '', - 'Do you really want to delete this address ?' => '', - 'No' => '', - 'Yes' => '', - 'Shipping Tax' => '', - 'You may have a coupon ?' => '', - 'Code :' => '', - 'Coupon code' => '', - 'Ok' => '', - 'Delivery address' => '', - 'Billing address' => '', - 'Change address' => '', - 'Choose your payment method' => '', - 'Secure Payment' => '', - '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.' => '', - 'Order number' => '', - 'Date' => '', - 'Go home' => '', - 'Account' => '', - 'Personal Information' => '', - 'Change my account information' => '', - 'Change my password' => '', - 'My Address book' => '', - 'My Address Books' => '', - 'My Orders' => '', - 'List of orders' => '', - 'Order Number' => '', - 'Amount' => '', - 'Status' => '', - 'View' => '', - 'View order %ref as pdf document' => '', - 'Order details' => '', - 'You don\'t have orders yet.' => '', - 'Update Profile' => '', - 'Personal Informations' => '', - 'Select Title' => '', - 'Update' => '', - 'Change Password' => '', - 'Login Information' => '', - 'Create New Address' => '', - 'Address' => '', - 'Home address' => '', - 'Complementary address' => '', - 'Select Country' => '', - 'Create' => '', - 'Related' => '', - 'Grid' => '', - 'List' => '', - 'Next' => '', - 'Previous' => '', - '%nb Items' => '', - '%nb Item' => '', - 'Latest products' => '', - 'Product Offers' => '', -/* - '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.' => '', -*/ - 'Placeholder firstname' => '', - 'Placeholder lastname' => '', - 'Placeholder email' => '', - 'Placeholder phone' => '', - 'Placeholder cellphone' => '', - 'Placeholder company' => '', - 'Placeholder address1' => '', - 'Placeholder address2' => '', - 'Placeholder city' => '', - 'Placeholder zipcode' => '', - 'Placeholder address label' => '', - 'Placeholder contact name' => '', - 'Placeholder contact email' => '', - 'Placeholder contact subject' => '', - 'Placeholder contact message' => '', + '+ View All' => '', + 'Thelia V2' => '', + 'Skip to content' => '', + 'Toggle navigation' => '', + 'Main Navigation' => '', + 'Register!' => '', + 'Log In!' => '', + 'Sign In' => '', + 'Register' => '', + 'Cart' => '', + 'View Cart' => '', + 'Checkout' => '', + 'You have no items in your shopping cart.' => '', + 'Home' => '', + 'Search a product' => '', + 'Search...' => '', + 'Minimum 2 characters.' => '', + 'Search' => '', + 'Language:' => '', + 'Currency:' => '', + 'Latest' => '', + 'Offers' => '', + 'Special Price:' => '', + 'Regular Price:' => '', + 'Free shipping' => '', + 'Orders over $50' => '', + 'Secure payment' => '', + 'Multi-payment platform' => '', + 'Need help ?' => '', + 'Questions ? See or F.A.Q.' => '', + 'Latest articles' => '', + 'No articles currently' => '', + 'Useful links' => '', + 'Login' => '', + 'Follow us' => '', + 'Newsletter' => '', + 'Sign up to receive our latest news.' => '', + 'Email address' => '', + 'Your email address' => '', + 'Subscribe' => '', + 'Contact Us' => '', + 'Copyright' => '', + 'You are here:' => '', + 'Show' => '', + 'per page' => '', + 'Sort By' => '', + 'Name ascending' => '', + 'Name descending' => '', + 'Price ascending' => '', + 'Price descending' => '', + 'View as' => '', + 'View product' => '', + 'Pagination' => '', + 'No products available in this category' => '', + 'Categories' => '', + 'Ref.' => '', + 'Availability' => '', + 'In stock' => '', + 'Out of stock' => '', + 'Add to cart' => '', + 'Description' => '', + 'Additional Info' => '', + 'View cart' => '', + 'Continue Shopping' => '', + 'Upsell Products' => '', + 'Your Cart' => '', + 'Billing and delivery' => '', + 'Check my order' => '', + 'Product Name' => '', + 'Name' => '', + 'Unit Price' => '', + 'Price' => '', + 'Quantity' => '', + 'Qty' => '', + 'Total' => '', + 'Tax Inclusive' => '', + 'TTC' => '', + 'Available' => '', + 'In Stock' => '', + 'No.' => '', + 'Remove' => '', + 'Proceed checkout' => '', + 'Warning' => '', + 'missing or invalid data' => '', + 'Do you have an account?' => '', + 'Forgot your Password?' => '', + 'Next' => '', + 'Log out!' => '', + 'My Account' => '', + 'Previous product' => '', + 'Next product' => '', + 'instead of' => '', + 'Add a new address' => '', + 'Choose your delivery address' => '', + 'Address %nb' => '', + 'Edit this address' => '', + 'Edit' => '', + 'Remove this address' => '', + 'Cancel' => '', + 'Choose your delivery method' => '', + 'Back' => '', + 'Next Step' => '', + 'Delete address' => '', + 'Do you really want to delete this address ?' => '', + 'No' => '', + 'Yes' => '', + 'Shipping Tax' => '', + 'You may have a coupon ?' => '', + 'Code :' => '', + 'Coupon code' => '', + 'Ok' => '', + 'Delivery address' => '', + 'Billing address' => '', + 'Change address' => '', + 'Choose your payment method' => '', + 'Secure Payment' => '', + '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.' => '', + 'Order number' => '', + 'Date' => '', + 'Go home' => '', + 'Account' => '', + 'Personal Information' => '', + 'Change my account information' => '', + 'Change my password' => '', + 'My Address book' => '', + 'My Address Books' => '', + 'My Orders' => '', + 'List of orders' => '', + 'Order Number' => '', + 'Amount' => '', + 'Status' => '', + 'View' => '', + 'View order %ref as pdf document' => '', + 'Order details' => '', + 'You don\'t have orders yet.' => '', + 'Update Profile' => '', + 'Personal Informations' => '', + 'Select Title' => '', + 'Update' => '', + 'Change Password' => '', + 'Login Information' => '', + 'Create New Address' => '', + 'Address' => '', + 'Home address' => '', + 'Complementary address' => '', + 'Select Country' => '', + 'Create' => '', + 'Related' => '', + 'Grid' => '', + 'List' => '', + 'Next' => '', + 'Previous' => '', + '%nb Items' => '', + '%nb Item' => '', + 'Latest products' => '', + 'Product Offers' => '', + /* + '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.' => '', + */ + // Product Empty + 'Product Empty Title' => 'Welcome', + 'Product Empty Message' => 'It\'s really quick to add a product. +
    +
  1. Check NEW under the details tab if you want to see your product in the latest product section.
    2. +
  2. Check SALE under the details tab if you want to see your product in the offer product section.
    3. +
', + 'Product Empty Button' => 'Add my first product', + 'Demo product title' => 'Demo product title', + 'Demo product description' => 'Demo product description', + // Placeholder + 'Placeholder firstname' => '', + 'Placeholder lastname' => '', + 'Placeholder email' => '', + 'Placeholder phone' => '', + 'Placeholder cellphone' => '', + 'Placeholder company' => '', + 'Placeholder address1' => '', + 'Placeholder address2' => '', + 'Placeholder city' => '', + 'Placeholder zipcode' => '', + 'Placeholder address label' => '', + 'Placeholder contact name' => '', + 'Placeholder contact email' => '', + 'Placeholder contact subject' => '', + 'Placeholder contact message' => '', ) ; \ No newline at end of file diff --git a/templates/default/demo/product-new.html b/templates/default/demo/product-new.html deleted file mode 100644 index bef08b4df..000000000 --- a/templates/default/demo/product-new.html +++ /dev/null @@ -1,19 +0,0 @@ -{for $count=1 to 4} -
  • - -
    • -{/for} \ No newline at end of file diff --git a/templates/default/includes/product-empty.html b/templates/default/includes/product-empty.html new file mode 100644 index 000000000..029d3b6cd --- /dev/null +++ b/templates/default/includes/product-empty.html @@ -0,0 +1,35 @@ +
    +

    {intl l="Product Empty Title"}

    +

    {intl l="Product Empty Message"}

    +

    {intl l="Product Empty Button"}

    +
    + +
    +
    +

    {intl l="Latest"}

    +
    + +
    + +
    +
    \ No newline at end of file diff --git a/templates/default/index.html b/templates/default/index.html index fe38555a7..fabd8a3d9 100644 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -28,102 +28,94 @@ {if {count type="product"} eq 0} -
    -

    Welcome

    -

    - It's really quick to add a product. -

      -
    1. Check NEW under the details tab if you want to see your product in the latest product section.
      2. -
    2. Check SALE under the details tab if you want to see your product in the offer product section.
      3. -
    -

    -

    Add my first product

    -
    + {include file="includes/product-empty.html"} + {else} + {ifloop rel="product_new"} +
    +
    +

    {intl l="Latest"} {intl l="+ View All"}

    +
    + +
    + +
    +
    + {/ifloop} + + {ifloop rel="product_promo"} +
    +
    +

    {intl l="Offers"} {intl l="+ View All"}

    +
    + +
    +
      + {loop name="product_promo" type="product" limit="5" promo="yes"} + {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"} + {/loop} +
    +
    +
    + {/ifloop} {/if} -
    -
    -

    {intl l="Latest"} {intl l="+ View All"}

    -
    - -
    - -
    -
    - - {ifloop rel="product_promo"} -
    -
    -

    {intl l="Offers"} {intl l="+ View All"}

    -
    - -
    -
      - {loop name="product_promo" type="product" limit="5" promo="yes"} - {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"} - {/loop} -
    -
    -
    - {/ifloop} {/block} \ No newline at end of file From 42770025ce116806ec70a5f14e7bf8dd94682806 Mon Sep 17 00:00:00 2001 From: touffies Date: Wed, 6 Nov 2013 20:15:38 +0100 Subject: [PATCH 06/25] Add default image thumbnail --- templates/default/includes/single-product.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/default/includes/single-product.html b/templates/default/includes/single-product.html index 4b5045c8c..9bb9efc89 100644 --- a/templates/default/includes/single-product.html +++ b/templates/default/includes/single-product.html @@ -19,6 +19,9 @@ {loop name="product_thumbnail" type="image" product=$ID width="{$width}" height="{$height}" resize_mode="borders" limit="1"} {$productTitle} {/loop} + {elseloop rel="product_thumbnail"} + {images file='../assets/img/218x146.png'}{$productTitle}{/images} + {/elseloop} From 483fd527348391b35ddb159a3041241c7c428ae1 Mon Sep 17 00:00:00 2001 From: touffies Date: Wed, 6 Nov 2013 20:17:47 +0100 Subject: [PATCH 07/25] Remove html if empty value (ex : Product without images does not need the carousel) --- templates/default/product.html | 64 ++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/templates/default/product.html b/templates/default/product.html index 8fd63bc06..3fa011d97 100644 --- a/templates/default/product.html +++ b/templates/default/product.html @@ -33,12 +33,15 @@ {/loop}

    {$TITLE}

    - {intl l='Ref.'}: {$REF} + {if $REF}{intl l='Ref.'}: {$REF}{/if} -
    + {if $POSTSCRIPTUM}

    {$POSTSCRIPTUM}

    -
    +
    {/if}
    {loop name="stock_meta" type="product_sale_elements" product="$ID"} @@ -111,7 +115,6 @@ {intl l="Availability"}: {intl l='In stock'}{intl l='Out of stock'} - @@ -142,10 +145,8 @@ {/form_field} - {if $form_error}
    {$form_error_message}
    {/if} - {form_field form=$form field="product"} {/form_field} @@ -172,12 +173,12 @@ {form_field form=$form field='quantity'}
    - - {if $error } - {$message} - {elseif $value != "" && !$error} - - {/if} + + {if $error } + {$message} + {elseif $value != "" && !$error} + + {/if}
    {/form_field} @@ -189,29 +190,38 @@ {/form}
    -
    - -
    -
    -

    {$DESCRIPTION}

    -
    -
    - {ifloop rel="feature_value_info"} -
      + {strip} + {capture "additional"} + {ifloop rel="feature_value_info"} +
        {loop name="feature_info" type="feature" product="{$ID}"}
      • {$TITLE} : {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"} - {$TITLE} + {$TITLE} {/loop}
        • {/loop} -
      - {/ifloop} +
    + {/ifloop} + {/capture} + {/strip} + +
    + +
    +
    +

    {$DESCRIPTION|default:'N/A'}

    + {if $smarty.capture.additional ne ""} +
    + {$smarty.capture.additional} +
    + {/if}
    From 8743ac4a3ca23f5d3c949bdb329d7e052cd22688 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 7 Nov 2013 10:09:46 +0100 Subject: [PATCH 08/25] fix readme --- Readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Readme.md b/Readme.md index 2a3e9fece..93df8ab36 100755 --- a/Readme.md +++ b/Readme.md @@ -7,7 +7,6 @@ Thelia [Thelia](http://thelia.net/v2) is an open source tool for creating e-business websites and managing online content. This software is published under GPL. -Here is the current developping next major version. You can download this version for testing or see the code. Here is the most recent developed code for the next major version (v2). You can download this version for testing or having a look on the code (or anything you wish, respecting GPL). See http://thelia.net/v2 web site for more information. Most part of the code can possibly change, a large part will be refactor soon, graphical setup does not exist yet. From 1357ff20011c62ca40fb4b3d4b17ee96de8d4b22 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 7 Nov 2013 10:43:47 +0100 Subject: [PATCH 09/25] fix issue for loading default front template --- core/lib/Thelia/Core/Template/TemplateHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Core/Template/TemplateHelper.php b/core/lib/Thelia/Core/Template/TemplateHelper.php index 10fe67a5b..b29837cbd 100644 --- a/core/lib/Thelia/Core/Template/TemplateHelper.php +++ b/core/lib/Thelia/Core/Template/TemplateHelper.php @@ -62,7 +62,7 @@ class TemplateHelper public function getActiveFrontTemplate() { return new TemplateDefinition( - ConfigQuery::read('active-admin-template', 'default'), + ConfigQuery::read('active-front-template', 'default'), TemplateDefinition::FRONT_OFFICE ); } From a793dc9f3e8162824aa76e6ee62f4dc632fd836b Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 7 Nov 2013 10:47:14 +0100 Subject: [PATCH 10/25] change variable name for active front template --- install/insert.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/insert.sql b/install/insert.sql index ea26fbd6f..c49f3e210 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -7,7 +7,7 @@ INSERT INTO `lang`(`id`,`title`,`code`,`locale`,`url`,`date_format`,`time_format INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES ('session_config.default', '1', 1, 1, NOW(), NOW()), ('verifyStock', '1', 0, 0, NOW(), NOW()), -('active-template', 'default', 0, 0, NOW(), NOW()), +('active-front-template', 'default', 0, 0, NOW(), NOW()), ('active-admin-template', 'default', 0, 0, NOW(), NOW()), ('active-pdf-template', 'default', 0, 0, NOW(), NOW()), ('default_lang_without_translation', '1', 1, 1, NOW(), NOW()), From 14804b269ec7880a6341497a08c3364c016a9698 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 11:15:15 +0100 Subject: [PATCH 11/25] Reorder all I18N files and remove duplicate string --- templates/default/I18n/en_US.php | 392 ++++++++++--------- templates/default/I18n/es_ES.php | 398 +++++++++---------- templates/default/I18n/fr_FR.php | 404 +++++++++----------- templates/default/I18n/it_IT.php | 398 +++++++++---------- templates/default/account.html | 4 +- templates/default/address.html | 2 +- templates/default/contact.html | 4 +- templates/default/includes/addedToCart.html | 2 +- templates/default/product.html | 2 +- templates/default/register.html | 2 +- 10 files changed, 770 insertions(+), 838 deletions(-) diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php index 26be50f83..c83aff515 100755 --- a/templates/default/I18n/en_US.php +++ b/templates/default/I18n/en_US.php @@ -1,195 +1,205 @@ '404', - 'The page cannot be found' => 'The page cannot be found', - 'Account' => 'Account', - 'Change Password' => 'Change Password', - 'Login Information' => 'Login Information', - 'Update Profile' => 'Update Profile', - 'Personal Informations' => 'Personal Informations', - 'Select Title' => 'Select Title', - 'Placeholder firstname' => 'John', - 'Placeholder lastname' => 'Doe', - 'Placeholder email' => 'johndoe@domain.com', - 'Update' => 'Update', - 'My Account' => 'My Account', - 'Personal Information' => 'Personal Information', - 'Change my account information' => 'Change my account information', - 'Change my password' => 'Change my password', - 'My Address book' => 'My Address book', - 'Add a new address' => 'Add a new address', - 'My Address Books' => 'My Address Books', - 'Address %nb' => 'Address %nb', - 'Edit this address' => 'Edit this address', - 'Edit' => 'Edit', - 'Do you really want to delete this address ?' => 'Do you really want to delete this address ?', - 'Remove this address' => 'Remove this address', - 'Cancel' => 'Cancel', - 'My Orders' => 'My Orders', - 'List of orders' => 'List of orders', - 'Order Number' => 'Order Number', - 'Date' => 'Date', - 'Amount' => 'Amount', - 'Status' => 'Status', - 'View' => 'View', - 'View order %ref as pdf document' => 'View order %ref as pdf document', - 'Order details' => 'Order details', - 'Warning' => 'Warning', - 'You don\'t have orders yet.' => 'You don\'t have orders yet.', - 'Address Update' => 'Address update', - 'missing or invalid data' => 'missing or invalid data', - 'Address' => 'Address', - 'Placeholder address label' => 'Home, Work office, other', - 'Placeholder address1' => '76 Ninth Avenue', - 'Placeholder address2' => 'Address', - 'Placeholder zipcode' => 'NY 10011', - 'Placeholder city' => 'New York', - 'Select Country' => 'Select Country', - 'Placeholder phone' => 'Phone number', - 'Placeholder cellphone' => 'Cellular phone number', - 'Add a New Address' => 'Add a new address', - 'Create New Address' => 'Create New Address', - 'Create' => 'Create', - 'Cart' => 'Cart', - 'Your Cart' => 'Your Cart', - 'Product Name' => 'Product Name', - 'Name' => 'Name', - 'Unit Price' => 'Unit Price', - 'Price' => 'Price', - 'Quantity' => 'Quantity', - 'Qty' => 'Qty', - 'Total' => 'Total', - 'Available' => 'Available', - 'In Stock' => 'In Stock', - 'Out of Stock' => 'Out of stock', - 'No.' => 'No.', - 'Remove' => 'Remove', - 'instead of' => 'instead of', - 'Continue Shopping' => 'Continue Shopping', - 'Proceed checkout' => 'Proceed checkout', - 'You have no items in your shopping cart.' => 'You have no items in your shopping cart.', - 'Upsell Products' => 'Upsell Products', - 'No products available in this category' => 'No products available in this category', - 'Thanks !' => 'Thanks !', - 'Thanks for your message, we will contact as soon as possible.' => 'Thanks for your message, we will contact as soon as possible.', - 'Contact us' => 'Contact us', - 'Send us a message' => 'Send us a message', - 'Placeholder contact name' => 'What\'s your name?', - 'Placeholder contact email' => 'So I can get back to you.', - 'Placeholder contact subject' => 'The subject of your message.', - 'Placeholder contact message' => 'And your message...', - 'Send' => 'Send', - 'View cart' => 'View cart', - 'Related' => 'Related', - 'Categories' => 'Categories', - 'View Cart' => 'View Cart', - 'Checkout' => 'Checkout', - 'Special Price:' => 'Special Price:', - 'Regular Price:' => 'Regular Price:', - 'Add to cart' => 'Add to cart', - 'View product' => 'View product', - 'Item(s)' => 'Item(s)', - 'Show' => 'Show', - 'per page' => 'per page', - 'Sort By' => 'Sort By', - 'Position' => 'Position', - 'Name ascending' => 'Name ascending', - 'Name descending' => 'Name descending', - 'Price ascending' => 'Price ascending', - 'Price descending' => 'Price descending', - 'Rating' => 'Rating', - 'View as' => 'View as', - 'Grid' => 'Grid', - 'List' => 'List', - 'Pagination' => 'Pagination', - 'Previous' => 'Previous', - 'Next' => 'Next', - 'Latest' => 'Latest', - '+ View All' => '+ View All', - 'Offers' => 'Offers', - 'Thelia V2' => 'Thelia V2', - 'Skip to content' => 'Skip to content', - 'Toggle navigation' => 'Toggle navigation', - 'Main Navigation' => 'Main Navigation', - 'Log out!' => 'Log out!', - 'Register!' => 'Register!', - 'Log In!' => 'Log In!', - 'Sign In' => 'Sign In', - 'Register' => 'Register', - 'Home' => 'Home', - 'Search a product' => 'Search a product', - 'Search...' => 'Search...', - 'Minimum 2 characters.' => 'Minimum 2 characters.', - 'Search' => 'Search', - 'Language:' => 'Language:', - 'Currency:' => 'Currency:', - 'Free shipping' => 'Free shipping', - 'Orders over $50' => 'Orders over $50', - 'Secure payment' => 'Secure payment', - 'Multi-payment platform' => 'Multi-payment platform', - 'Need help ?' => 'Need help ?', - 'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.', - 'Latest articles' => 'Latest articles', - 'No articles currently' => 'No articles currently', - 'Useful links' => 'Useful links', - 'Login' => 'Login', - 'Follow us' => 'Follow us', - 'Newsletter' => 'Newsletter', - 'Sign up to receive our latest news.' => 'Sign up to receive our latest news.', - 'Email address' => 'Email address', - 'Your email address' => 'Your email address', - 'Subscribe' => 'Subscribe', - 'Contact Us' => 'Contact Us', - 'Copyright' => 'Copyright', - 'Do you have an account?' => 'Do you have an account?', - 'Forgot your Password?' => 'Forgot your Password?', - 'You are here:' => 'You are here:', - 'Billing and delivery' => 'Billing and delivery', - 'Check my order' => 'Check my order', - 'Newsletter Subscription' => 'Newsletter Subscription', - 'You want to subscribe to the newsletter? Please enter your email address below.' => 'You want to subscribe to the newsletter? Please enter your email address below.', - 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.', - 'Choose your delivery address' => 'Choose your delivery address', - 'Choose your delivery method' => 'Choose your delivery method', - 'Back' => 'Back', - 'Next Step' => 'Next Step', - 'My order' => 'My order', - 'Shipping Tax' => 'Shipping Tax', - 'You may have a coupon ?' => 'You may have a coupon ?', - 'Code :' => 'Code :', - 'Coupon code' => 'Coupon code', - 'Ok' => 'Ok', - 'Delivery address' => 'Delivery address', - 'Billing address' => 'Billing address', - 'Change address' => 'Change address', - 'Choose your payment method' => 'Choose your payment method', - 'Secure Payment' => 'Secure Payment', - '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.', - 'Order number' => 'Order number', - 'Go home' => 'Go home', - 'Password' => 'Password', - 'Password Forgotten' => 'Password Forgotten', - 'Please enter your email address below.' => 'Please enter your email address below.', - 'You will receive a link to reset your password.' => 'You will receive a link to reset your password.', - 'Ref.' => 'Ref.', - 'Availability' => 'Availability', - 'In stock' => 'In stock', - 'Out of stock' => 'Out of stock', - 'Description' => 'Description', - 'Additional Info' => 'Additional Info', - 'Previous product' => 'Previous product', - 'Next product' => 'Next product', - 'Create New Account' => 'Create New Account', - 'Delivery Informations' => 'Delivery Informations', - 'Placeholder company' => 'Google', - 'Sign in' => 'Sign in', - 'Search Result for' => 'Search Result for', - 'No results found' => 'No results found', - 'View all' => 'View all', - 'products' => 'products', - 'offers' => 'offers', + '%nb Item' => '%nb Item', + '%nb Items' => '%nb Items', + '+ View All' => '+ View All', + '404' => '404', + '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', + 'Account' => 'Account', + 'Add a new address' => 'Add a new address', + 'Add to cart' => 'Add to cart', + 'Additional Info' => 'Additional Info', + 'Address %nb' => 'Address %nb', + 'Address Update' => 'Address update', + 'Address' => 'Address', + 'Amount' => 'Amount', + 'Availability' => 'Availability', + 'Available' => 'Available', + 'Back' => 'Back', + 'Billing address' => 'Billing address', + 'Billing and delivery' => 'Billing and delivery', + 'Cancel' => 'Cancel', + 'Cart' => 'Cart', + 'Categories' => 'Categories', + 'Change address' => 'Change address', + 'Change my account information' => 'Change my account information', + 'Change my password' => 'Change my password', + 'Change Password' => 'Change Password', + 'Check my order' => 'Check my order', + 'Checkout' => 'Checkout', + 'Choose your delivery address' => 'Choose your delivery address', + 'Choose your delivery method' => 'Choose your delivery method', + 'Choose your payment method' => 'Choose your payment method', + 'Code :' => 'Code :', + 'Complementary address' => 'Complementary address', + 'Contact Us' => 'Contact Us', + 'Continue Shopping' => 'Continue Shopping', + 'Copyright' => 'Copyright', + 'Coupon code' => 'Coupon code', + 'Create New Account' => 'Create New Account', + 'Create New Address' => 'Create New Address', + 'Create' => 'Create', + 'Currency:' => 'Currency:', + 'Date' => 'Date', + 'Delete address' => 'Delete address', + 'Delivery address' => 'Delivery address', + 'Delivery Informations' => 'Delivery Informations', + 'Demo product description' => 'Demo product description', + 'Demo product title' => 'Demo product title', + 'Description' => 'Description', + 'Do you have an account?' => 'Do you have an account?', + 'Do you really want to delete this address ?' => 'Do you really want to delete this address ?', + 'Edit this address' => 'Edit this address', + 'Edit' => 'Edit', + 'Email address' => 'Email address', + 'Follow us' => 'Follow us', + 'Forgot your Password?' => 'Forgot your Password?', + 'Free shipping' => 'Free shipping', + 'Go home' => 'Go home', + 'Grid' => 'Grid', + 'Home address' => 'Home address', + 'Home' => 'Home', + 'In Stock' => 'In Stock', + 'instead of' => 'instead of', + 'Item(s)' => 'Item(s)', + 'Language:' => 'Language:', + 'Latest articles' => 'Latest articles', + 'Latest products' => 'Latest products', + 'Latest' => 'Latest', + 'List of orders' => 'List of orders', + 'List' => 'List', + 'Log In!' => 'Log In!', + 'Log out!' => 'Log out!', + 'Login Information' => 'Login Information', + 'Login' => 'Login', + 'Main Navigation' => 'Main Navigation', + 'Minimum 2 characters.' => 'Minimum 2 characters.', + 'missing or invalid data' => 'missing or invalid data', + 'Multi-payment platform' => 'Multi-payment platform', + 'My Account' => 'My Account', + 'My Address book' => 'My Address book', + 'My Address Books' => 'My Address Books', + 'My order' => 'My order', + 'My Orders' => 'My Orders', + 'Name ascending' => 'Name ascending', + 'Name descending' => 'Name descending', + 'Name' => 'Name', + 'Need help ?' => 'Need help ?', + 'Newsletter Subscription' => 'Newsletter Subscription', + 'Newsletter' => 'Newsletter', + 'Next product' => 'Next product', + 'Next Step' => 'Next Step', + 'Next' => 'Next', + 'No articles currently' => 'No articles currently', + 'No products available in this category' => 'No products available in this category', + 'No results found' => 'No results found', + 'No.' => 'No.', + 'Offers' => 'Offers', + 'Ok' => 'Ok', + 'Order details' => 'Order details', + 'Order number' => 'Order number', + 'Orders over $50' => 'Orders over $50', + 'Out of Stock' => 'Out of stock', + 'Pagination' => 'Pagination', + 'Password Forgotten' => 'Password Forgotten', + 'Password' => 'Password', + 'per page' => 'per page', + 'Personal Informations' => 'Personal Informations', + 'Placeholder address label' => 'Home, Work office, other', + 'Placeholder address1' => '76 Ninth Avenue', + 'Placeholder address2' => 'Address', + 'Placeholder cellphone' => 'Cellular phone number', + 'Placeholder city' => 'New York', + 'Placeholder company' => 'Google', + 'Placeholder contact email' => 'So I can get back to you.', + 'Placeholder contact message' => 'And your message...', + 'Placeholder contact name' => 'What\'s your name?', + 'Placeholder contact subject' => 'The subject of your message.', + 'Placeholder email' => 'johndoe@domain.com', + 'Placeholder firstname' => 'John', + 'Placeholder lastname' => 'Doe', + 'Placeholder phone' => 'Phone number', + 'Placeholder zipcode' => 'NY 10011', + 'Please enter your email address below.' => 'Please enter your email address below.', + 'Position' => 'Position', + 'Previous product' => 'Previous product', + 'Previous' => 'Previous', + 'Price ascending' => 'Price ascending', + 'Price descending' => 'Price descending', + 'Price' => 'Price', + 'Proceed checkout' => 'Proceed checkout', + 'Product Empty Button' => 'Add my first product', + 'Product Empty Message' => 'It\'s really quick to add a product. +
      +
    1. Check NEW under the details tab if you want to see your product in the latest product section.
      2. +
    2. Check SALE under the details tab if you want to see your product in the offer product section.
      3. +
    ', + 'Product Empty Title' => 'Welcome', + 'Product Name' => 'Product Name', + 'Product Offers' => 'Product Offers', + 'products' => 'products', + 'Qty' => 'Qty', + 'Quantity' => 'Quantity', + 'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.', + 'Rating' => 'Rating', + 'Ref.' => 'Ref.', + 'Register!' => 'Register!', + 'Register' => 'Register', + 'Regular Price:' => 'Regular Price:', + 'Related' => 'Related', + 'Remove this address' => 'Remove this address', + 'Remove' => 'Remove', + 'Search a product' => 'Search a product', + 'Search Result for' => 'Search Result for', + 'Search' => 'Search', + 'Search...' => 'Search...', + 'Secure payment' => 'Secure payment', + 'Secure Payment' => 'Secure Payment', + 'Select Country' => 'Select Country', + 'Select Title' => 'Select Title', + 'Send us a message' => 'Send us a message', + 'Send' => 'Send', + 'Shipping Tax' => 'Shipping Tax', + 'Show' => 'Show', + 'Sign In' => 'Sign In', + 'Sign up to receive our latest news.' => 'Sign up to receive our latest news.', + 'Skip to content' => 'Skip to content', + 'Sort By' => 'Sort By', + 'Special Price:' => 'Special Price:', + 'Status' => 'Status', + 'Subscribe' => 'Subscribe', + 'Tax Inclusive' => 'Tax Inclusive', + 'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.', + 'Thanks !' => 'Thanks !', + 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.', + 'Thanks for your message, we will contact as soon as possible.' => 'Thanks for your message, we will contact as soon as possible.', + 'The page cannot be found' => 'The page cannot be found', + 'Thelia V2' => 'Thelia V2', + 'Toggle navigation' => 'Toggle navigation', + 'Total' => 'Total', + 'TTC' => 'TTC', + 'Unit Price' => 'Unit Price', + 'Update Profile' => 'Update Profile', + 'Update' => 'Update', + 'Upsell Products' => 'Upsell Products', + 'Useful links' => 'Useful links', + 'View all' => 'View all', + 'View as' => 'View as', + 'View Cart' => 'View Cart', + 'View order %ref as pdf document' => 'View order %ref as pdf document', + 'View product' => 'View product', + 'View' => 'View', + 'Warning' => 'Warning', + 'Yes' => 'Yes', + 'You are here:' => 'You are here:', + 'You choose to pay by' => 'You choose to pay by', + 'You don\'t have orders yet.' => 'You don\'t have orders yet.', + 'You have no items in your shopping cart.' => 'You have no items in your shopping cart.', + 'You may have a coupon ?' => 'You may have a coupon ?', + 'You want to subscribe to the newsletter? Please enter your email address below.' => 'You want to subscribe to the newsletter? Please enter your email address below.', + 'You will receive a link to reset your password.' => 'You will receive a link to reset your password.', + 'Your Cart' => 'Your Cart', + 'Your email address' => 'Your email 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.', ); diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php index e4004de1e..e96407fea 100755 --- a/templates/default/I18n/es_ES.php +++ b/templates/default/I18n/es_ES.php @@ -1,229 +1,201 @@ '', + '%nb Items' => '', '+ View All' => '', - 'Thelia V2' => '', - 'Skip to content' => '', - 'Toggle navigation' => '', - 'Main Navigation' => '', - 'Register!' => '', - 'Log In!' => '', - 'Sign In' => '', - 'Register' => '', - 'Cart' => '', - 'View Cart' => '', - 'Checkout' => '', - 'You have no items in your shopping cart.' => '', - 'Home' => '', - 'Search a product' => '', - 'Search...' => '', - 'Minimum 2 characters.' => '', - 'Search' => '', - 'Language:' => '', - 'Currency:' => '', - 'Latest' => '', - 'Offers' => '', - 'Special Price:' => '', - 'Regular Price:' => '', - 'Free shipping' => '', - 'Orders over $50' => '', - 'Secure payment' => '', - 'Multi-payment platform' => '', - 'Need help ?' => '', - 'Questions ? See or F.A.Q.' => '', - 'Latest articles' => '', - 'No articles currently' => '', - 'Useful links' => '', - 'Login' => '', - 'Follow us' => '', - 'Newsletter' => '', - 'Sign up to receive our latest news.' => '', - 'Email address' => '', - 'Your email address' => '', - 'Subscribe' => '', - 'Contact Us' => '', - 'Copyright' => '', - 'You are here:' => '', - 'Show' => '', - 'per page' => '', - 'Sort By' => '', - 'Name ascending' => '', - 'Name descending' => '', - 'Price ascending' => '', - 'Price descending' => '', - 'View as' => '', - 'View product' => '', - 'Pagination' => '', - 'No products available in this category' => '', - 'Categories' => '', - 'Ref.' => '', - 'Availability' => '', - 'In stock' => '', - 'Out of stock' => '', - 'Add to cart' => '', - 'Description' => '', - 'Additional Info' => '', - 'View cart' => '', - 'Continue Shopping' => '', - 'Upsell Products' => '', - 'Your Cart' => '', - 'Billing and delivery' => '', - 'Check my order' => '', - 'Product Name' => '', - 'Name' => '', - 'Unit Price' => '', - 'Price' => '', - 'Quantity' => '', - 'Qty' => '', - 'Total' => '', - 'Tax Inclusive' => '', - 'TTC' => '', - 'Available' => '', - 'In Stock' => '', - 'No.' => '', - 'Remove' => '', - 'Proceed checkout' => '', - 'Warning' => '', - 'missing or invalid data' => '', - 'Do you have an account?' => '', - 'Forgot your Password?' => '', - 'Next' => '', - 'Log out!' => '', - 'My Account' => '', - 'Previous product' => '', - 'Next product' => '', - 'instead of' => '', - 'Add a new address' => '', - 'Choose your delivery address' => '', - 'Address %nb' => '', - 'Edit this address' => '', - 'Edit' => '', - 'Remove this address' => '', - 'Cancel' => '', - 'Choose your delivery method' => '', - 'Back' => '', - 'Next Step' => '', - 'Delete address' => '', - 'Do you really want to delete this address ?' => '', - 'No' => '', - 'Yes' => '', - 'Shipping Tax' => '', - 'You may have a coupon ?' => '', - 'Code :' => '', - 'Coupon code' => '', - 'Ok' => '', - 'Delivery address' => '', - 'Billing address' => '', - 'Change address' => '', - 'Choose your payment method' => '', - 'Secure Payment' => '', - 'You choose to pay by' => '', - 'Thank you for the trust you place in us.' => '', + '404' => '', '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.' => '', - 'Order number' => '', - 'Date' => '', - 'Go home' => '', 'Account' => '', - 'Personal Information' => '', + 'Add a new address' => '', + 'Add to cart' => '', + 'Additional Info' => '', + 'Address %nb' => '', + 'Address Update' => '', + 'Address' => '', + 'Amount' => '', + 'Availability' => '', + 'Available' => '', + 'Back' => '', + 'Billing address' => '', + 'Billing and delivery' => '', + 'Cancel' => '', + 'Cart' => '', + 'Categories' => '', + 'Change address' => '', 'Change my account information' => '', 'Change my password' => '', + 'Change Password' => '', + 'Check my order' => '', + 'Checkout' => '', + 'Choose your delivery address' => '', + 'Choose your delivery method' => '', + 'Choose your payment method' => '', + 'Code :' => '', + 'Complementary address' => '', + 'Contact Us' => '', + 'Continue Shopping' => '', + 'Copyright' => '', + 'Coupon code' => '', + 'Create New Account' => '', + 'Create New Address' => '', + 'Create' => '', + 'Currency:' => '', + 'Date' => '', + 'Delete address' => '', + 'Delivery address' => '', + 'Delivery Informations' => '', + 'Demo product description' => '', + 'Demo product title' => '', + 'Description' => '', + 'Do you have an account?' => '', + 'Do you really want to delete this address ?' => '', + 'Edit this address' => '', + 'Edit' => '', + 'Email address' => '', + 'Follow us' => '', + 'Forgot your Password?' => '', + 'Free shipping' => '', + 'Go home' => '', + 'Grid' => '', + 'Home address' => '', + 'Home' => '', + 'In Stock' => '', + 'instead of' => '', + 'Item(s)' => '', + 'Language:' => '', + 'Latest articles' => '', + 'Latest products' => '', + 'Latest' => '', + 'List of orders' => '', + 'List' => '', + 'Log In!' => '', + 'Log out!' => '', + 'Login Information' => '', + 'Login' => '', + 'Main Navigation' => '', + 'Minimum 2 characters.' => '', + 'missing or invalid data' => '', + 'Multi-payment platform' => '', + 'My Account' => '', 'My Address book' => '', 'My Address Books' => '', + 'My order' => '', 'My Orders' => '', - 'List of orders' => '', - 'Order Number' => '', - 'Amount' => '', - 'Status' => '', - 'View' => '', - 'View order %ref as pdf document' => '', - 'Order details' => '', - 'You don\'t have orders yet.' => '', - 'Update Profile' => '', - 'Personal Informations' => '', - 'Select Title' => '', - 'Update' => '', - 'Change Password' => '', - 'Login Information' => '', - 'Create New Address' => '', - 'Address' => '', - 'Home address' => '', - 'Complementary address' => '', - 'Select Country' => '', - 'Create' => '', - 'Related' => '', - 'Grid' => '', - 'List' => '', + 'Name ascending' => '', + 'Name descending' => '', + 'Name' => '', + 'Need help ?' => '', + 'Newsletter Subscription' => '', + 'Newsletter' => '', + 'Next product' => '', + 'Next Step' => '', 'Next' => '', - 'Previous' => '', - '%nb Items' => '', - '%nb Item' => '', - 'Latest products' => '', - 'Product Offers' => '', - /* - '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.' => '', - */ - // Product Empty - 'Product Empty Title' => 'Welcome', - 'Product Empty Message' => 'It\'s really quick to add a product. -
      -
    1. Check NEW under the details tab if you want to see your product in the latest product section.
      2. -
    2. Check SALE under the details tab if you want to see your product in the offer product section.
      3. -
    ', - 'Product Empty Button' => 'Add my first product', - 'Demo product title' => 'Demo product title', - 'Demo product description' => 'Demo product description', - // Placeholder - 'Placeholder firstname' => '', - 'Placeholder lastname' => '', - 'Placeholder email' => '', - 'Placeholder phone' => '', - 'Placeholder cellphone' => '', - 'Placeholder company' => '', + 'No articles currently' => '', + 'No products available in this category' => '', + 'No results found' => '', + 'No.' => '', + 'Offers' => '', + 'Ok' => '', + 'Order details' => '', + 'Order number' => '', + 'Orders over $50' => '', + 'Out of Stock' => '', + 'Pagination' => '', + 'Password Forgotten' => '', + 'Password' => '', + 'per page' => '', + 'Personal Informations' => '', + 'Placeholder address label' => '', 'Placeholder address1' => '', 'Placeholder address2' => '', + 'Placeholder cellphone' => '', 'Placeholder city' => '', - 'Placeholder zipcode' => '', - 'Placeholder address label' => '', - 'Placeholder contact name' => '', + 'Placeholder company' => '', 'Placeholder contact email' => '', - 'Placeholder contact subject' => '', 'Placeholder contact message' => '', -) -; \ No newline at end of file + 'Placeholder contact name' => '', + 'Placeholder contact subject' => '', + 'Placeholder email' => '', + 'Placeholder firstname' => '', + 'Placeholder lastname' => '', + 'Placeholder phone' => '', + 'Placeholder zipcode' => '', + 'Please enter your email address below.' => '', + 'Position' => '', + 'Previous product' => '', + 'Previous' => '', + 'Price ascending' => '', + 'Price descending' => '', + 'Price' => '', + 'Proceed checkout' => '', + 'Product Empty Button' => '', + 'Product Empty Message' => '', + 'Product Empty Title' => '', + 'Product Name' => '', + 'Product Offers' => '', + 'products' => '', + 'Qty' => '', + 'Quantity' => '', + 'Questions ? See or F.A.Q.' => '', + 'Rating' => '', + 'Ref.' => '', + 'Register!' => '', + 'Register' => '', + 'Regular Price:' => '', + 'Related' => '', + 'Remove this address' => '', + 'Remove' => '', + 'Search a product' => '', + 'Search Result for' => '', + 'Search' => '', + 'Search...' => '', + 'Secure payment' => '', + 'Secure Payment' => '', + 'Select Country' => '', + 'Select Title' => '', + 'Send us a message' => '', + 'Send' => '', + 'Shipping Tax' => '', + 'Show' => '', + 'Sign In' => '', + 'Sign up to receive our latest news.' => '', + 'Skip to content' => '', + 'Sort By' => '', + 'Special Price:' => '', + 'Status' => '', + 'Subscribe' => '', + 'Tax Inclusive' => '', + 'Thank you for the trust you place in us.' => '', + 'Thanks !' => '', + 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '', + 'Thanks for your message, we will contact as soon as possible.' => '', + 'The page cannot be found' => '', + 'Thelia V2' => '', + 'Toggle navigation' => '', + 'Total' => '', + 'TTC' => '', + 'Unit Price' => '', + 'Update Profile' => '', + 'Update' => '', + 'Upsell Products' => '', + 'Useful links' => '', + 'View all' => '', + 'View as' => '', + 'View Cart' => '', + 'View order %ref as pdf document' => '', + 'View product' => '', + 'View' => '', + 'Warning' => '', + 'Yes' => '', + 'You are here:' => '', + 'You choose to pay by' => '', + 'You don\'t have orders yet.' => '', + 'You have no items in your shopping cart.' => '', + 'You may have a coupon ?' => '', + 'You want to subscribe to the newsletter? Please enter your email address below.' => '', + 'You will receive a link to reset your password.' => '', + 'Your Cart' => '', + 'Your email address' => '', + 'Your order will be confirmed by us upon receipt of your payment.' => '', +); \ No newline at end of file diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php index 9e00957cb..2aaec2b6e 100755 --- a/templates/default/I18n/fr_FR.php +++ b/templates/default/I18n/fr_FR.php @@ -1,230 +1,208 @@ '%nb produit', + '%nb Items' => '%nb produits', '+ View All' => '+ Voir tout', - 'Thelia V2' => 'Thelia v2', - 'Skip to content' => 'Aller au contenu', - 'Toggle navigation' => 'Navigation alternative', - 'Main Navigation' => 'Navigation principale', - 'Register!' => 'S\'inscrire !', - 'Log In!' => 'Se connecter', - 'Sign In' => 'S\'inscrire', - 'Register' => 'Se connecter', - 'Cart' => 'Panier', - 'View Cart' => 'Voir mon panier', - 'Checkout' => 'Payer', - 'You have no items in your shopping cart.' => 'Vous n\'avez pas de produit dans votre panier.', - 'Home' => 'Accueil', - 'Search a product' => 'Chercher un produit', - 'Search...' => 'Recherche…', - 'Minimum 2 characters.' => '2 caractères minimum.', - 'Search' => 'Recherche', - 'Language:' => 'Langue', - 'Currency:' => 'Monnaie', - 'Latest' => 'Nouveautés', - 'Offers' => 'Promotions', - 'Special Price:' => 'Prix en promotion :', - 'Regular Price:' => 'Prix :', - 'Free shipping' => 'Livraison gratuite', - 'Orders over $50' => 'Commandes supérieures à 50€',//ne devrait-on pas mettre une variable ici? - 'Secure payment' => 'Paiement sécurisé', - 'Multi-payment plateform' => 'Plateforme multipaiement',// bizarre ? - 'Need help ?' => 'Besoin d\'aide? ', - 'Questions ? See or F.A.Q.' => 'Des questions ? Voir la F.A.Q.', // bizarre le 'see or ' - 'Latest articles' => 'Nouveaux articles', - 'No articles currently' => 'Actuellement aucun article', - 'Useful links' => 'Liens utiles', - 'Login' => 'Connexion', - 'Follow us' => 'Suivez-nous', - 'Newsletter' => 'Newsletter', - 'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir nos actualités.', - 'Email address' => 'Adresse e-mail', - 'Your email address' => 'Votre adresse e-mail', - 'Subscribe' => 'Inscription', - 'Contact Us' => 'Contactez-nous', - 'Copyright' => 'Copyright', - 'You are here:' => 'Vous êtes ici :', - 'Show' => 'Voir', - 'per page' => 'par page', - 'Sort By' => 'Trier par', - 'Name ascending' => 'Nom croissant', - 'Name descending' => 'Nom décroissant', - 'Price ascending' => 'Prix croissant', - 'Price descending' => 'Prix décroissant', - 'View as' => 'Voir en tant que ', - 'View product' => 'Voir le produit', - 'Pagination' => 'Pagination', - 'No products available in this category' => 'Aucun produit dans cette catégorie.', - 'Categories' => 'Catégories', - 'Ref.' => 'Ref.', - 'Availability' => 'Disponibilité', - 'In stock' => 'En stock', - 'Out of stock' => 'Indisponible', - 'Add to cart' => 'Ajouter au panier', - 'Description' => 'Description', - 'Additional Info' => 'Informations complémentaires', - 'View cart' => 'Voir mon panier', - 'Continue Shopping' => 'Continuer mes achats', - 'Upsell Products' => 'Nous vous proposons également', - 'Your Cart' => 'Votre panier', - 'Billing and delivery' => 'Facturation et livraison', - 'Check my order' => 'Vérifier ma commmande', - 'Product Name' => 'Nom du produit', - 'Name' => 'Nom', - 'Unit Price' => 'Prix unitaire', - 'Price' => 'Prix', - 'Quantity' => 'Quantité', - 'Qty' => 'Qté', - 'Total' => 'Total', - 'Tax Inclusive' => 'TVA incluse', - 'Available' => 'Disponible', - 'In Stock' => 'Disponible', - 'No.' => 'N°', - 'Remove' => 'Supprimer', - 'Proceed checkout' => 'Payer', - 'Warning' => 'Attention', - 'missing or invalid data' => 'Information éronnée ou incomplète', - 'Do you have an account?' => 'Avez-vous déjà un compte ?', - 'Forgot your Password?' => 'Mot de passé oublié ?', - 'Next' => 'Suivant', - 'Log out!' => 'Se déconnecter', - 'My Account' => 'Mon compte', - 'Previous product' => 'Produits précédents', - 'Next product' => 'Produits suivants', - 'instead of' => 'au lieu de', - 'Add a new address' => 'Ajouter une nouvelle adresse', - 'Choose your delivery address' => 'Choisissez une adresse de livraison', - 'Address %nb' => 'Adresse n°', - 'Edit this address' => 'Editer cette adresse', - 'Edit' => 'Editer', - 'Remove this address' => 'Supprimer cette adresse', - 'Cancel' => 'Annuler', - 'Choose your delivery method' => 'Choisissez votre moyen de livraison', - 'Back' => 'Retour', - 'Next Step' => 'Etape suivante', - 'Delete address' => 'Supprimer cette adresse', - 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', - 'No' => 'Non', - 'Yes' => 'Oui', - 'Shipping Tax' => 'Frais de livraison', - 'You may have a coupon ?' => 'Avez-vous un code promo ?', - 'Code :' => 'Code', - 'Coupon code' => 'Code promo', - 'Ok' => 'Ok', - 'Delivery address' => 'Adresse de livraison', - 'Billing address' => 'Adresse de facturation', - 'Change address' => 'Changer d\'adresse', - 'Choose your payment method' => 'Choisissez voter moyen de paiement', - 'Secure Payment' => 'Paiement sécurisé', - // Tous les éléments relatifs au message de confirmation de commande devraient être administrables non? - 'You choose to pay by' => 'Vous avez choisi de payer par', - 'Thank you for the trust you place in us.' => 'Merci pour voter confiance. ', + '404' => '404', 'A summary of your order email has been sent to the following address' => 'Un récapitulatif de commande vows a été envoyé par e-mail à l\'adresse suivante : ', - 'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre pavement.', - 'Order number' => 'Commande numéro', - 'Date' => 'Date', - 'Go home' => 'Retour à l\'accueil', 'Account' => 'Mon compte', - 'Personal Information' => 'Informations personnelles', + 'Add a new address' => 'Ajouter une nouvelle adresse', + 'Add to cart' => 'Ajouter au panier', + 'Additional Info' => 'Informations complémentaires', + 'Address %nb' => 'Adresse n°', + 'Address Update' => 'Mise à jour de l\'adresse', + 'Address' => 'Adresse', + 'Amount' => 'Montant', + 'Availability' => 'Disponibilité', + 'Available' => 'Disponible', + 'Back' => 'Retour', + 'Billing address' => 'Adresse de facturation', + 'Billing and delivery' => 'Facturation et livraison', + 'Cancel' => 'Annuler', + 'Cart' => 'Panier', + 'Categories' => 'Catégories', + 'Change address' => 'Changer d\'adresse', 'Change my account information' => 'Modifier mes informations personnelles', 'Change my password' => 'Changer mon mot de passe', + 'Change Password' => 'Modifier mon mot de passe', + 'Check my order' => 'Vérifier ma commmande', + 'Checkout' => 'Payer', + 'Choose your delivery address' => 'Choisissez une adresse de livraison', + 'Choose your delivery method' => 'Choisissez votre moyen de livraison', + 'Choose your payment method' => 'Choisissez voter moyen de paiement', + 'Code :' => 'Code', + 'Complementary address' => 'Résidence secondaire', + 'Contact Us' => 'Contactez-nous', + 'Continue Shopping' => 'Continuer mes achats', + 'Copyright' => 'Copyright', + 'Coupon code' => 'Code promo', + 'Create New Account' => 'Créer un nouveau compte', + 'Create New Address' => 'Créer une nouvelle adresse', + 'Create' => 'Créer', + 'Currency:' => 'Monnaie', + 'Date' => 'Date', + 'Delete address' => 'Supprimer cette adresse', + 'Delivery address' => 'Adresse de livraison', + 'Delivery Informations' => 'Informations de livraison', + 'Demo product description' => 'Example de description de produit', + 'Demo product title' => 'Example de titre', + 'Description' => 'Description', + 'Do you have an account?' => 'Avez-vous déjà un compte ?', + 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', + 'Edit this address' => 'Editer cette adresse', + 'Edit' => 'Editer', + 'Email address' => 'Adresse e-mail', + 'Follow us' => 'Suivez-nous', + 'Forgot your Password?' => 'Mot de passé oublié ?', + 'Free shipping' => 'Livraison gratuite', + 'Go home' => 'Retour à l\'accueil', + 'Grid' => 'Grille', + 'Home address' => 'Résidence principal', + 'Home' => 'Accueil', + 'In Stock' => 'Disponible', + 'instead of' => 'au lieu de', + 'Item(s)' => 'Produit(s)', + 'Language:' => 'Langue', + 'Latest articles' => 'Nouveaux articles', + 'Latest products' => 'Derniers produits', + 'Latest' => 'Nouveautés', + 'List of orders' => 'Liste de mes commandes', + 'List' => 'Liste', + 'Log In!' => 'Se connecter', + 'Log out!' => 'Se déconnecter', + 'Login Information' => 'Informations de connexion', + 'Login' => 'Connexion', + 'Main Navigation' => 'Navigation principale', + 'Minimum 2 characters.' => '2 caractères minimum.', + 'missing or invalid data' => 'Information éronnée ou incomplète', + 'Multi-payment plateform' => 'Plateforme multipaiement',// bizarre ? + 'My Account' => 'Mon compte', 'My Address book' => 'Mon carnet d\'adresses', 'My Address Books' => 'Mes carnets d\'adresses', + 'My order' => 'Ma commande', 'My Orders' => 'Mes commandes', - 'List of orders' => 'Liste de mes commandes', - 'Order Number' => 'Commande numéro', - 'Amount' => 'Montant', - 'Status' => 'Etat', - 'View' => 'Voir', - 'View order %ref as pdf document' => 'Ouvrir la commande %ref dans un pdf', - 'Order details' => 'Détail de commande', - 'You don\'t have orders yet.' => 'Vous n\'avez pas encore de commande.', - 'Update Profile' => 'Mettre à jour votre profil', - 'Personal Informations' => 'Informations personnelles', - 'Select Title' => 'Civilité', - 'Update' => 'Mettre à jour', - 'Change Password' => 'Modifier mon mot de passe', - 'Login Information' => 'Informations de connexion', - 'Create New Address' => 'Créer une nouvelle adresse', - 'Address' => 'Adresse', - 'Home address' => 'Résidence principal', - 'Complementary address' => 'Résidence secondaire', - 'Select Country' => 'Choisissez un pays', - 'Create' => 'Créer', - 'Related' => 'Liés', // voir le contexte pour l'accord - 'Grid' => 'Grille', - 'List' => 'Liste', + 'Name ascending' => 'Nom croissant', + 'Name descending' => 'Nom décroissant', + 'Name' => 'Nom', + 'Need help ?' => 'Besoin d\'aide? ', + 'Newsletter Subscription' => 'Inscription à la newslatter', + 'Newsletter' => 'Newsletter', + 'Next product' => 'Produits suivants', + 'Next Step' => 'Etape suivante', 'Next' => 'Suivant', + 'Next' => 'Suivant', + 'No articles currently' => 'Actuellement aucun article', + 'No products available in this category' => 'Aucun produit dans cette catégorie.', + 'No results found' => 'Aucun résultat', + 'No' => 'Non', + 'No.' => 'N°', + 'Offers' => 'Promotions', + 'Ok' => 'Ok', + 'Order details' => 'Détail de commande', + 'Order number' => 'Commande numéro', + 'Orders over $50' => 'Commandes supérieures à 50€',//ne devrait-on pas mettre une variable ici? + 'Out of stock' => 'Indisponible', + 'Pagination' => 'Pagination', + 'Password Forgotten' => 'Mot de passe oublié', + 'Password' => 'Mot de passe', + 'per page' => 'par page', + 'Personal Information' => 'Informations personnelles', + 'Personal Informations' => 'Informations personnelles', + 'Placeholder address label' => 'Maison, Domicile, Travail...', + 'Placeholder address1' => 'Adresse', + 'Placeholder address2' => '', + 'Placeholder cellphone' => 'Portable', + 'Placeholder city' => 'Ville', + 'Placeholder company' => 'Compagnie', + 'Placeholder contact email' => 'Pour me permettre de vous contacter', + 'Placeholder contact message' => 'Votre commentaire', + 'Placeholder contact name' => 'Quel est votre nom ?', + 'Placeholder contact subject' => 'Le sujet de votre message', + 'Placeholder email' => 'Adresse e-mail', + 'Placeholder firstname' => 'Prénom', + 'Placeholder lastname' => 'Nom de famille', + 'Placeholder phone' => 'Téléphone', + 'Placeholder zipcode' => 'Code postal', + 'Please enter your email address below.' => 'Veuillez saisir votre adresse e-amil ci-dessous.', + 'Position' => 'Position', + 'Previous product' => 'Produits précédents', 'Previous' => 'Précédent', - '%nb Items' => '%nb produits', - '%nb Item' => '%nb produit', - 'Latest products' => 'Derniers produits', - 'Product Offers' => 'Produits en promotion', - - /* - '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.' => '', - */ - // Product Empty - 'Product Empty Title' => 'Bonjour', + 'Price ascending' => 'Prix croissant', + 'Price descending' => 'Prix décroissant', + 'Price' => 'Prix', + 'Proceed checkout' => 'Payer', + 'Product Empty Button' => 'Ajouter mon premier produit', 'Product Empty Message' => 'C\'est très simple d\'ajouter un produit dans l\'adminsitration.
    1. N\'oubliez pas de sélectionner NEW dans l\'onglet Details afin de voir votre produit dans la section des nouveautés.
    2. N\'oubliez pas de sélectionner SALE dans l\'onglet Details afin de voir votre produit dans la section des promotions.
    ', - 'Product Empty Button' => 'Ajouter mon premier produit', - 'Demo product title' => 'Example de titre', - 'Demo product description' => 'Example de description de produit', - // Placeholder - 'Placeholder firstname' => 'Prénom', - 'Placeholder lastname' => 'Nom de famille', - 'Placeholder email' => 'Adresse e-mail', - 'Placeholder phone' => 'Téléphone', - 'Placeholder cellphone' => 'Portable', - 'Placeholder company' => 'Compagnie', - 'Placeholder address1' => 'Adresse', - 'Placeholder address2' => '', - 'Placeholder city' => 'Ville', - 'Placeholder zipcode' => 'Code postal', - 'Placeholder address label' => 'Maison, Domicile, Travail...', - 'Placeholder contact name' => 'Quel est votre nom ?', - 'Placeholder contact email' => 'Pour me permettre de vous contacter', - 'Placeholder contact subject' => 'Le sujet de votre message', - 'Placeholder contact message' => 'Votre commentaire', -) -; \ No newline at end of file + 'Product Empty Title' => 'Bonjour', + 'Product Name' => 'Nom du produit', + 'Product Offers' => 'Produits en promotion', + 'products' => 'produits', + 'Qty' => 'Qté', + 'Quantity' => 'Quantité', + 'Questions ? See or F.A.Q.' => 'Des questions ? Voir la F.A.Q.', // bizarre le 'see or ' + 'Rating' => 'Avis', + 'Ref.' => '', + 'Register!' => 'S\'inscrire !', + 'Register' => 'Se connecter', + 'Regular Price:' => 'Prix :', + 'Related' => 'Liés', // voir le contexte pour l'accord + 'Remove this address' => 'Supprimer cette adresse', + 'Remove' => 'Supprimer', + 'Search a product' => 'Chercher un produit', + 'Search Result for' => 'Résultat de recherche pour', + 'Search' => 'Recherche', + 'Search...' => 'Recherche…', + 'Secure payment' => 'Paiement sécurisé', + 'Secure Payment' => 'Paiement sécurisé', + 'Select Country' => 'Choisissez un pays', + 'Select Title' => 'Civilité', + 'Send us a message' => 'Envoyer nous un message', + 'Send' => 'Envoyer', + 'Shipping Tax' => 'Frais de livraison', + 'Show' => 'Voir', + 'Sign In' => 'S\'inscrire', + 'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir nos actualités.', + 'Skip to content' => 'Aller au contenu', + 'Sort By' => 'Trier par', + 'Special Price:' => 'Prix en promotion :', + 'Status' => 'Etat', + 'Subscribe' => 'Inscription', + 'Tax Inclusive' => 'TVA incluse', + 'Thank you for the trust you place in us.' => 'Merci pour votre confiance. ', + 'Thanks !' => 'Merci !', + 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '', + 'Thanks for your message, we will contact as soon as possible.' => '', + 'The page cannot be found' => '', + 'Thelia V2' => 'Thelia v2', + 'Toggle navigation' => 'Navigation alternative', + 'Total' => 'Total', + 'TTC' => 'TTC', + 'Unit Price' => 'Prix unitaire', + 'Update Profile' => 'Mettre à jour votre profil', + 'Update' => 'Mettre à jour', + 'Upsell Products' => 'Nous vous proposons également', + 'Useful links' => 'Liens utiles', + 'View all' => ' Voir tout', + 'View as' => 'Voir en tant que ', + 'View Cart' => 'Voir mon panier', + 'View order %ref as pdf document' => 'Ouvrir la commande %ref dans un pdf', + 'View product' => 'Voir le produit', + 'View' => 'Voir', + 'Warning' => 'Attention', + 'Yes' => 'Oui', + 'You are here:' => 'Vous êtes ici :', + 'You choose to pay by' => 'Vous avez choisi de payer par', + 'You don\'t have orders yet.' => 'Vous n\'avez pas encore de commande.', + 'You have no items in your shopping cart.' => 'Vous n\'avez pas de produit dans votre panier.', + 'You may have a coupon ?' => 'Avez-vous un code promo ?', + 'You want to subscribe to the newsletter? Please enter your email address below.' => 'Vous voulez vous inscrire à la newsletter ? Veuillez saisir votre adresse e-amil ci-dessous.', + 'You will receive a link to reset your password.' => 'Vous recevrez un lien pour réinitialiser votre mot de passe.', + 'Your Cart' => 'Votre panier', + 'Your email address' => 'Votre adresse e-mail', + 'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre pavement.', +); \ No newline at end of file diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php index e4004de1e..e96407fea 100755 --- a/templates/default/I18n/it_IT.php +++ b/templates/default/I18n/it_IT.php @@ -1,229 +1,201 @@ '', + '%nb Items' => '', '+ View All' => '', - 'Thelia V2' => '', - 'Skip to content' => '', - 'Toggle navigation' => '', - 'Main Navigation' => '', - 'Register!' => '', - 'Log In!' => '', - 'Sign In' => '', - 'Register' => '', - 'Cart' => '', - 'View Cart' => '', - 'Checkout' => '', - 'You have no items in your shopping cart.' => '', - 'Home' => '', - 'Search a product' => '', - 'Search...' => '', - 'Minimum 2 characters.' => '', - 'Search' => '', - 'Language:' => '', - 'Currency:' => '', - 'Latest' => '', - 'Offers' => '', - 'Special Price:' => '', - 'Regular Price:' => '', - 'Free shipping' => '', - 'Orders over $50' => '', - 'Secure payment' => '', - 'Multi-payment platform' => '', - 'Need help ?' => '', - 'Questions ? See or F.A.Q.' => '', - 'Latest articles' => '', - 'No articles currently' => '', - 'Useful links' => '', - 'Login' => '', - 'Follow us' => '', - 'Newsletter' => '', - 'Sign up to receive our latest news.' => '', - 'Email address' => '', - 'Your email address' => '', - 'Subscribe' => '', - 'Contact Us' => '', - 'Copyright' => '', - 'You are here:' => '', - 'Show' => '', - 'per page' => '', - 'Sort By' => '', - 'Name ascending' => '', - 'Name descending' => '', - 'Price ascending' => '', - 'Price descending' => '', - 'View as' => '', - 'View product' => '', - 'Pagination' => '', - 'No products available in this category' => '', - 'Categories' => '', - 'Ref.' => '', - 'Availability' => '', - 'In stock' => '', - 'Out of stock' => '', - 'Add to cart' => '', - 'Description' => '', - 'Additional Info' => '', - 'View cart' => '', - 'Continue Shopping' => '', - 'Upsell Products' => '', - 'Your Cart' => '', - 'Billing and delivery' => '', - 'Check my order' => '', - 'Product Name' => '', - 'Name' => '', - 'Unit Price' => '', - 'Price' => '', - 'Quantity' => '', - 'Qty' => '', - 'Total' => '', - 'Tax Inclusive' => '', - 'TTC' => '', - 'Available' => '', - 'In Stock' => '', - 'No.' => '', - 'Remove' => '', - 'Proceed checkout' => '', - 'Warning' => '', - 'missing or invalid data' => '', - 'Do you have an account?' => '', - 'Forgot your Password?' => '', - 'Next' => '', - 'Log out!' => '', - 'My Account' => '', - 'Previous product' => '', - 'Next product' => '', - 'instead of' => '', - 'Add a new address' => '', - 'Choose your delivery address' => '', - 'Address %nb' => '', - 'Edit this address' => '', - 'Edit' => '', - 'Remove this address' => '', - 'Cancel' => '', - 'Choose your delivery method' => '', - 'Back' => '', - 'Next Step' => '', - 'Delete address' => '', - 'Do you really want to delete this address ?' => '', - 'No' => '', - 'Yes' => '', - 'Shipping Tax' => '', - 'You may have a coupon ?' => '', - 'Code :' => '', - 'Coupon code' => '', - 'Ok' => '', - 'Delivery address' => '', - 'Billing address' => '', - 'Change address' => '', - 'Choose your payment method' => '', - 'Secure Payment' => '', - 'You choose to pay by' => '', - 'Thank you for the trust you place in us.' => '', + '404' => '', '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.' => '', - 'Order number' => '', - 'Date' => '', - 'Go home' => '', 'Account' => '', - 'Personal Information' => '', + 'Add a new address' => '', + 'Add to cart' => '', + 'Additional Info' => '', + 'Address %nb' => '', + 'Address Update' => '', + 'Address' => '', + 'Amount' => '', + 'Availability' => '', + 'Available' => '', + 'Back' => '', + 'Billing address' => '', + 'Billing and delivery' => '', + 'Cancel' => '', + 'Cart' => '', + 'Categories' => '', + 'Change address' => '', 'Change my account information' => '', 'Change my password' => '', + 'Change Password' => '', + 'Check my order' => '', + 'Checkout' => '', + 'Choose your delivery address' => '', + 'Choose your delivery method' => '', + 'Choose your payment method' => '', + 'Code :' => '', + 'Complementary address' => '', + 'Contact Us' => '', + 'Continue Shopping' => '', + 'Copyright' => '', + 'Coupon code' => '', + 'Create New Account' => '', + 'Create New Address' => '', + 'Create' => '', + 'Currency:' => '', + 'Date' => '', + 'Delete address' => '', + 'Delivery address' => '', + 'Delivery Informations' => '', + 'Demo product description' => '', + 'Demo product title' => '', + 'Description' => '', + 'Do you have an account?' => '', + 'Do you really want to delete this address ?' => '', + 'Edit this address' => '', + 'Edit' => '', + 'Email address' => '', + 'Follow us' => '', + 'Forgot your Password?' => '', + 'Free shipping' => '', + 'Go home' => '', + 'Grid' => '', + 'Home address' => '', + 'Home' => '', + 'In Stock' => '', + 'instead of' => '', + 'Item(s)' => '', + 'Language:' => '', + 'Latest articles' => '', + 'Latest products' => '', + 'Latest' => '', + 'List of orders' => '', + 'List' => '', + 'Log In!' => '', + 'Log out!' => '', + 'Login Information' => '', + 'Login' => '', + 'Main Navigation' => '', + 'Minimum 2 characters.' => '', + 'missing or invalid data' => '', + 'Multi-payment platform' => '', + 'My Account' => '', 'My Address book' => '', 'My Address Books' => '', + 'My order' => '', 'My Orders' => '', - 'List of orders' => '', - 'Order Number' => '', - 'Amount' => '', - 'Status' => '', - 'View' => '', - 'View order %ref as pdf document' => '', - 'Order details' => '', - 'You don\'t have orders yet.' => '', - 'Update Profile' => '', - 'Personal Informations' => '', - 'Select Title' => '', - 'Update' => '', - 'Change Password' => '', - 'Login Information' => '', - 'Create New Address' => '', - 'Address' => '', - 'Home address' => '', - 'Complementary address' => '', - 'Select Country' => '', - 'Create' => '', - 'Related' => '', - 'Grid' => '', - 'List' => '', + 'Name ascending' => '', + 'Name descending' => '', + 'Name' => '', + 'Need help ?' => '', + 'Newsletter Subscription' => '', + 'Newsletter' => '', + 'Next product' => '', + 'Next Step' => '', 'Next' => '', - 'Previous' => '', - '%nb Items' => '', - '%nb Item' => '', - 'Latest products' => '', - 'Product Offers' => '', - /* - '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.' => '', - */ - // Product Empty - 'Product Empty Title' => 'Welcome', - 'Product Empty Message' => 'It\'s really quick to add a product. -
      -
    1. Check NEW under the details tab if you want to see your product in the latest product section.
      2. -
    2. Check SALE under the details tab if you want to see your product in the offer product section.
      3. -
    ', - 'Product Empty Button' => 'Add my first product', - 'Demo product title' => 'Demo product title', - 'Demo product description' => 'Demo product description', - // Placeholder - 'Placeholder firstname' => '', - 'Placeholder lastname' => '', - 'Placeholder email' => '', - 'Placeholder phone' => '', - 'Placeholder cellphone' => '', - 'Placeholder company' => '', + 'No articles currently' => '', + 'No products available in this category' => '', + 'No results found' => '', + 'No.' => '', + 'Offers' => '', + 'Ok' => '', + 'Order details' => '', + 'Order number' => '', + 'Orders over $50' => '', + 'Out of Stock' => '', + 'Pagination' => '', + 'Password Forgotten' => '', + 'Password' => '', + 'per page' => '', + 'Personal Informations' => '', + 'Placeholder address label' => '', 'Placeholder address1' => '', 'Placeholder address2' => '', + 'Placeholder cellphone' => '', 'Placeholder city' => '', - 'Placeholder zipcode' => '', - 'Placeholder address label' => '', - 'Placeholder contact name' => '', + 'Placeholder company' => '', 'Placeholder contact email' => '', - 'Placeholder contact subject' => '', 'Placeholder contact message' => '', -) -; \ No newline at end of file + 'Placeholder contact name' => '', + 'Placeholder contact subject' => '', + 'Placeholder email' => '', + 'Placeholder firstname' => '', + 'Placeholder lastname' => '', + 'Placeholder phone' => '', + 'Placeholder zipcode' => '', + 'Please enter your email address below.' => '', + 'Position' => '', + 'Previous product' => '', + 'Previous' => '', + 'Price ascending' => '', + 'Price descending' => '', + 'Price' => '', + 'Proceed checkout' => '', + 'Product Empty Button' => '', + 'Product Empty Message' => '', + 'Product Empty Title' => '', + 'Product Name' => '', + 'Product Offers' => '', + 'products' => '', + 'Qty' => '', + 'Quantity' => '', + 'Questions ? See or F.A.Q.' => '', + 'Rating' => '', + 'Ref.' => '', + 'Register!' => '', + 'Register' => '', + 'Regular Price:' => '', + 'Related' => '', + 'Remove this address' => '', + 'Remove' => '', + 'Search a product' => '', + 'Search Result for' => '', + 'Search' => '', + 'Search...' => '', + 'Secure payment' => '', + 'Secure Payment' => '', + 'Select Country' => '', + 'Select Title' => '', + 'Send us a message' => '', + 'Send' => '', + 'Shipping Tax' => '', + 'Show' => '', + 'Sign In' => '', + 'Sign up to receive our latest news.' => '', + 'Skip to content' => '', + 'Sort By' => '', + 'Special Price:' => '', + 'Status' => '', + 'Subscribe' => '', + 'Tax Inclusive' => '', + 'Thank you for the trust you place in us.' => '', + 'Thanks !' => '', + 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '', + 'Thanks for your message, we will contact as soon as possible.' => '', + 'The page cannot be found' => '', + 'Thelia V2' => '', + 'Toggle navigation' => '', + 'Total' => '', + 'TTC' => '', + 'Unit Price' => '', + 'Update Profile' => '', + 'Update' => '', + 'Upsell Products' => '', + 'Useful links' => '', + 'View all' => '', + 'View as' => '', + 'View Cart' => '', + 'View order %ref as pdf document' => '', + 'View product' => '', + 'View' => '', + 'Warning' => '', + 'Yes' => '', + 'You are here:' => '', + 'You choose to pay by' => '', + 'You don\'t have orders yet.' => '', + 'You have no items in your shopping cart.' => '', + 'You may have a coupon ?' => '', + 'You want to subscribe to the newsletter? Please enter your email address below.' => '', + 'You will receive a link to reset your password.' => '', + 'Your Cart' => '', + 'Your email address' => '', + 'Your order will be confirmed by us upon receipt of your payment.' => '', +); \ No newline at end of file diff --git a/templates/default/account.html b/templates/default/account.html index 863104615..639ea25a2 100644 --- a/templates/default/account.html +++ b/templates/default/account.html @@ -26,7 +26,7 @@

    - {intl l="Personal Information"} + {intl l="Personal Informations"}

    @@ -144,7 +144,7 @@ - + diff --git a/templates/default/address.html b/templates/default/address.html index fea5c5dd5..ac625af2b 100644 --- a/templates/default/address.html +++ b/templates/default/address.html @@ -12,7 +12,7 @@ {block name='no-return-functions' append} {$breadcrumbs = [ ['title' => {intl l="Account"}, 'url'=>{url path="/account"}], - ['title' => {intl l="Add a New Address"}, 'url'=>{url path="/address/create"}] + ['title' => {intl l="Add a new address"}, 'url'=>{url path="/address/create"}] ]} {/block} diff --git a/templates/default/contact.html b/templates/default/contact.html index 66fc784f6..863314391 100644 --- a/templates/default/contact.html +++ b/templates/default/contact.html @@ -2,13 +2,13 @@ {* Breadcrumb *} {block name='no-return-functions' append} - {$breadcrumbs = [['title' => {intl l="Contact us"}, 'url'=>{url path="/contact"}]]} + {$breadcrumbs = [['title' => {intl l="Contact Us"}, 'url'=>{url path="/contact"}]]} {/block} {block name="main-content"}
    -

    {intl l="Contact us"}

    +

    {intl l="Contact Us"}

    diff --git a/templates/default/includes/addedToCart.html b/templates/default/includes/addedToCart.html index 5a82d761f..273162529 100644 --- a/templates/default/includes/addedToCart.html +++ b/templates/default/includes/addedToCart.html @@ -30,7 +30,7 @@
    {intl l="Order Number"}{intl l="Order number"} {intl l="Date"} {intl l="Amount"} {intl l="Status"}
    {/loop} - {intl l="View cart"} + {intl l="View Cart"} diff --git a/templates/default/product.html b/templates/default/product.html index 3fa011d97..ddea559a2 100644 --- a/templates/default/product.html +++ b/templates/default/product.html @@ -114,7 +114,7 @@
    {intl l="Availability"}: - {intl l='In stock'}{intl l='Out of stock'} + {intl l='In Stock'}{intl l='Out of Stock'}
    diff --git a/templates/default/register.html b/templates/default/register.html index 0fda003b0..66fd5e052 100644 --- a/templates/default/register.html +++ b/templates/default/register.html @@ -262,7 +262,7 @@
    - +
    From 7fa17215f651492b704a1050b19374c19bac2216 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 11:57:43 +0100 Subject: [PATCH 12/25] ISSUE 63 - Newsletter registration : error message --- core/lib/Thelia/Form/NewsletterForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Form/NewsletterForm.php b/core/lib/Thelia/Form/NewsletterForm.php index ad0aab5a4..2dc910c1d 100644 --- a/core/lib/Thelia/Form/NewsletterForm.php +++ b/core/lib/Thelia/Form/NewsletterForm.php @@ -83,7 +83,7 @@ class NewsletterForm extends BaseForm { $customer = NewsletterQuery::create()->findOneByEmail($value); if ($customer) { - $context->addViolation("You are already subscribed!"); + $context->addViolation("You are already registered!"); } } From 316990dedbe82eca92400a59ad7a41554b3fd9c3 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 12:06:09 +0100 Subject: [PATCH 13/25] Change the french translation of Register --- templates/default/I18n/fr_FR.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php index 2aaec2b6e..82a4581c4 100755 --- a/templates/default/I18n/fr_FR.php +++ b/templates/default/I18n/fr_FR.php @@ -148,7 +148,7 @@ return array( 'Rating' => 'Avis', 'Ref.' => '', 'Register!' => 'S\'inscrire !', - 'Register' => 'Se connecter', + 'Register' => 'S\'inscrire', 'Regular Price:' => 'Prix :', 'Related' => 'Liés', // voir le contexte pour l'accord 'Remove this address' => 'Supprimer cette adresse', @@ -165,7 +165,7 @@ return array( 'Send' => 'Envoyer', 'Shipping Tax' => 'Frais de livraison', 'Show' => 'Voir', - 'Sign In' => 'S\'inscrire', + 'Sign In' => 'Se connecter', 'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir nos actualités.', 'Skip to content' => 'Aller au contenu', 'Sort By' => 'Trier par', From bccce8d53196892d3f619c1299244f0263a43635 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 12:12:51 +0100 Subject: [PATCH 14/25] Registration: change the label on the submit button --- templates/default/register.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/default/register.html b/templates/default/register.html index 66fd5e052..4f551ead5 100644 --- a/templates/default/register.html +++ b/templates/default/register.html @@ -262,7 +262,7 @@
    - +
    From eb1f509c67b4103976b5d741fb2d737e16de7593 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 12:19:27 +0100 Subject: [PATCH 15/25] Zipcode translation error on the french version --- templates/admin/default/I18n/fr_FR.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/default/I18n/fr_FR.php b/templates/admin/default/I18n/fr_FR.php index 2de503905..edccca64e 100755 --- a/templates/admin/default/I18n/fr_FR.php +++ b/templates/admin/default/I18n/fr_FR.php @@ -79,7 +79,7 @@ return array ( 'Address Line 2' => 'Adresse suite', 'Additional address' => 'Adresse complémentaire', 'Address Line 3' => 'Adresse suite', - 'Zip code' => 'Code posta', + 'Zip code' => 'Code postal', 'City' => 'Ville', 'Country' => 'Pays', 'Email Address' => 'Adresse e-mail', From aa7efb0e9a107cf2e97548f2c34235157a710d12 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 12:35:34 +0100 Subject: [PATCH 16/25] Issue 61 Add the newsletter registration on Register page --- .../Controller/Front/CustomerController.php | 18 ++++++++++++++++++ core/lib/Thelia/Form/CustomerCreateForm.php | 8 ++++++++ .../Thelia/Form/CustomerProfileUpdateForm.php | 11 +---------- templates/default/register.html | 15 +++++++++++++++ 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php index 2bb01a94a..7f956287e 100755 --- a/core/lib/Thelia/Controller/Front/CustomerController.php +++ b/core/lib/Thelia/Controller/Front/CustomerController.php @@ -104,6 +104,24 @@ class CustomerController extends BaseFrontController $this->dispatch(TheliaEvents::CUSTOMER_CREATEACCOUNT, $customerCreateEvent); + $newCustomer = $customerCreateEvent->getCustomer(); + + // Newsletter + if (true === $form->get('newsletter')->getData()) { + $newsletterEmail = $newCustomer->getEmail(); + $nlEvent = new NewsletterEvent($newsletterEmail, $this->getRequest()->getSession()->getLang()->getLocale()); + $nlEvent->setFirstname($newCustomer->getFirstname()); + $nlEvent->setLastname($newCustomer->getLastname()); + + // Security : Check if this new Email address already exist + if (null !== $newsletter = NewsletterQuery::create()->findOneByEmail($newsletterEmail)) { + $nlEvent->setId($newsletter->getId()); + $this->dispatch(TheliaEvents::NEWSLETTER_UPDATE, $nlEvent); + } else { + $this->dispatch(TheliaEvents::NEWSLETTER_SUBSCRIBE, $nlEvent); + } + } + $this->processLogin($customerCreateEvent->getCustomer()); $cart = $this->getCart($this->getRequest()); diff --git a/core/lib/Thelia/Form/CustomerCreateForm.php b/core/lib/Thelia/Form/CustomerCreateForm.php index 38da394cc..35954dc88 100755 --- a/core/lib/Thelia/Form/CustomerCreateForm.php +++ b/core/lib/Thelia/Form/CustomerCreateForm.php @@ -89,6 +89,14 @@ class CustomerCreateForm extends AddressCreateForm "for" => "password_confirmation" ) )) + // Add Newsletter + ->add("newsletter", "checkbox", array( + "label" => Translator::getInstance()->trans('I would like to receive the newsletter or the latest news.'), + "label_attr" => array( + "for" => "newsletter" + ), + "required" => false + )) // Add terms & conditions ->add("agreed", "checkbox", array( "constraints" => array( diff --git a/core/lib/Thelia/Form/CustomerProfileUpdateForm.php b/core/lib/Thelia/Form/CustomerProfileUpdateForm.php index c7ebd2c43..3bf0c372a 100755 --- a/core/lib/Thelia/Form/CustomerProfileUpdateForm.php +++ b/core/lib/Thelia/Form/CustomerProfileUpdateForm.php @@ -55,16 +55,7 @@ class CustomerProfileUpdateForm extends CustomerCreateForm ->remove("password") ->remove("password_confirm") // Remove Terms & conditions - ->remove("agreed") - - // Add Newsletter - ->add("newsletter", "checkbox", array( - "label" => Translator::getInstance()->trans('I would like to receive the newsletter or the latest news.'), - "label_attr" => array( - "for" => "newsletter" - ), - "required" => false - )); + ->remove("agreed"); } /** diff --git a/templates/default/register.html b/templates/default/register.html index 4f551ead5..50a20f2ee 100644 --- a/templates/default/register.html +++ b/templates/default/register.html @@ -245,6 +245,21 @@ + {form_field form=$form field="newsletter"} +
    +
    +
    + + {if $error } + {$message} + {/if} +
    +
    +
    + {/form_field} + {form_field form=$form field="agreed"}
    From 97f2e82084a9371b0fafc0af15a1900bfbc40d0f Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 12:56:12 +0100 Subject: [PATCH 17/25] Issue 76 Currency sign next to the price --- templates/default/cart.html | 10 +++++----- templates/default/includes/addedToCart.html | 6 +++--- templates/default/includes/mini-cart.html | 4 ++-- templates/default/order-delivery.html | 2 +- templates/default/order-invoice.html | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/default/cart.html b/templates/default/cart.html index 73cd57ddc..592b5f34c 100644 --- a/templates/default/cart.html +++ b/templates/default/cart.html @@ -89,11 +89,11 @@ {if $IS_PROMO == 1} {assign "real_price" $PROMO_TAXED_PRICE} -
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    - {intl l="instead of"} {currency attr="symbol"} {$TAXED_PRICE} +
    {$PROMO_TAXED_PRICE} {currency attr="symbol"}
    + {intl l="instead of"} {$TAXED_PRICE} {currency attr="symbol"} {else} {assign "real_price" $TAXED_PRICE} -
    {currency attr="symbol"} {$TAXED_PRICE}
    +
    {$TAXED_PRICE} {currency attr="symbol"}
    {/if} @@ -109,7 +109,7 @@
    - {currency attr="symbol"} {$real_price * $QUANTITY} + {$real_price * $QUANTITY} {currency attr="symbol"} @@ -121,7 +121,7 @@ {intl l="Total"}
    - {currency attr="symbol"} {cart attr="total_taxed_price"} + {cart attr="total_taxed_price"} {currency attr="symbol"}
    diff --git a/templates/default/includes/addedToCart.html b/templates/default/includes/addedToCart.html index 273162529..e90fc6029 100644 --- a/templates/default/includes/addedToCart.html +++ b/templates/default/includes/addedToCart.html @@ -18,11 +18,11 @@ {if $IS_PROMO == 1} {assign "real_price" $PROMO_TAXED_PRICE} -
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    - {currency attr="symbol"} {$TAXED_PRICE} +
    {$PROMO_TAXED_PRICE} {currency attr="symbol"}
    + {$TAXED_PRICE} {currency attr="symbol"} {else} {assign "real_price" $TAXED_PRICE} -
    {currency attr="symbol"} {$TAXED_PRICE}
    +
    {$TAXED_PRICE} {currency attr="symbol"}
    {/if} diff --git a/templates/default/includes/mini-cart.html b/templates/default/includes/mini-cart.html index 2858d535b..96e0126b7 100644 --- a/templates/default/includes/mini-cart.html +++ b/templates/default/includes/mini-cart.html @@ -34,7 +34,7 @@ {else} {assign "real_price" $TAXED_PRICE} {/if} - {$QUANTITY} X {currency attr="symbol"}{$real_price}
    + {$QUANTITY} X {$real_price} {currency attr="symbol"} {assign "total_price" $total_price + ($QUANTITY * $real_price)} @@ -49,7 +49,7 @@
    - {currency attr="symbol"}{$total_price} + {$total_price} {currency attr="symbol"}
    diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html index c38b3fb0f..2576ee381 100644 --- a/templates/default/order-delivery.html +++ b/templates/default/order-delivery.html @@ -134,7 +134,7 @@ {/if} {/form_field} diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html index d75c08b78..83c71c485 100644 --- a/templates/default/order-invoice.html +++ b/templates/default/order-invoice.html @@ -103,18 +103,18 @@ {if $IS_PROMO == 1} {assign "real_price" $PROMO_TAXED_PRICE} -
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    - {intl l="instead of"} {currency attr="symbol"} {$TAXED_PRICE} +
    {$PROMO_TAXED_PRICE} {currency attr="symbol"}
    + {intl l="instead of"} {$TAXED_PRICE} {currency attr="symbol"} {else} {assign "real_price" $TAXED_PRICE} -
    {currency attr="symbol"} {$TAXED_PRICE}
    +
    {$TAXED_PRICE} {currency attr="symbol"}
    {/if} {$QUANTITY} - {currency attr="symbol"} {$real_price * $QUANTITY} + {$real_price * $QUANTITY} {currency attr="symbol"} @@ -127,7 +127,7 @@ {intl l="Shipping Tax"}
    - {currency attr="symbol"} {order attr="postage"} + {order attr="postage"} {currency attr="symbol"}
    @@ -153,7 +153,7 @@ {intl l="Total"}
    - {currency attr="symbol"} {{cart attr="total_taxed_price"} + {order attr="postage"}} + {{cart attr="total_taxed_price"} + {order attr="postage"}} {currency attr="symbol"}
    From 45f3dbe172c332aab9c13971d32df52e068cf2aa Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 12:56:12 +0100 Subject: [PATCH 18/25] Issue 76 Currency sign next to the price --- templates/default/account.html | 2 +- templates/default/cart.html | 10 +++++----- templates/default/includes/addedToCart.html | 6 +++--- templates/default/includes/mini-cart.html | 4 ++-- templates/default/order-delivery.html | 2 +- templates/default/order-invoice.html | 12 ++++++------ templates/default/order-placed.html | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/templates/default/account.html b/templates/default/account.html index 639ea25a2..73da05a66 100644 --- a/templates/default/account.html +++ b/templates/default/account.html @@ -156,7 +156,7 @@ {$REF} {format_date date=$CREATE_DATE} - {loop type="currency" name="order.currency" id={$CURRENCY}}{$SYMBOL}{/loop} {format_number number=$TOTAL_TAXED_AMOUNT} + {format_number number=$TOTAL_TAXED_AMOUNT} {loop type="currency" name="order.currency" id={$CURRENCY}}{$SYMBOL}{/loop} {loop type="order-status" name="order.status" id={$STATUS}}{$TITLE}{/loop} {intl l="Order details"} diff --git a/templates/default/cart.html b/templates/default/cart.html index 73cd57ddc..592b5f34c 100644 --- a/templates/default/cart.html +++ b/templates/default/cart.html @@ -89,11 +89,11 @@ {if $IS_PROMO == 1} {assign "real_price" $PROMO_TAXED_PRICE} -
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    - {intl l="instead of"} {currency attr="symbol"} {$TAXED_PRICE} +
    {$PROMO_TAXED_PRICE} {currency attr="symbol"}
    + {intl l="instead of"} {$TAXED_PRICE} {currency attr="symbol"} {else} {assign "real_price" $TAXED_PRICE} -
    {currency attr="symbol"} {$TAXED_PRICE}
    +
    {$TAXED_PRICE} {currency attr="symbol"}
    {/if} @@ -109,7 +109,7 @@ - {currency attr="symbol"} {$real_price * $QUANTITY} + {$real_price * $QUANTITY} {currency attr="symbol"} @@ -121,7 +121,7 @@ {intl l="Total"}
    - {currency attr="symbol"} {cart attr="total_taxed_price"} + {cart attr="total_taxed_price"} {currency attr="symbol"}
    diff --git a/templates/default/includes/addedToCart.html b/templates/default/includes/addedToCart.html index 273162529..e90fc6029 100644 --- a/templates/default/includes/addedToCart.html +++ b/templates/default/includes/addedToCart.html @@ -18,11 +18,11 @@ {if $IS_PROMO == 1} {assign "real_price" $PROMO_TAXED_PRICE} -
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    - {currency attr="symbol"} {$TAXED_PRICE} +
    {$PROMO_TAXED_PRICE} {currency attr="symbol"}
    + {$TAXED_PRICE} {currency attr="symbol"} {else} {assign "real_price" $TAXED_PRICE} -
    {currency attr="symbol"} {$TAXED_PRICE}
    +
    {$TAXED_PRICE} {currency attr="symbol"}
    {/if} diff --git a/templates/default/includes/mini-cart.html b/templates/default/includes/mini-cart.html index 2858d535b..96e0126b7 100644 --- a/templates/default/includes/mini-cart.html +++ b/templates/default/includes/mini-cart.html @@ -34,7 +34,7 @@ {else} {assign "real_price" $TAXED_PRICE} {/if} - {$QUANTITY} X {currency attr="symbol"}{$real_price} + {$QUANTITY} X {$real_price} {currency attr="symbol"} {assign "total_price" $total_price + ($QUANTITY * $real_price)} @@ -49,7 +49,7 @@
    - {currency attr="symbol"}{$total_price} + {$total_price} {currency attr="symbol"}
    diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html index c38b3fb0f..2576ee381 100644 --- a/templates/default/order-delivery.html +++ b/templates/default/order-delivery.html @@ -134,7 +134,7 @@ {/if} {/form_field} diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html index d75c08b78..83c71c485 100644 --- a/templates/default/order-invoice.html +++ b/templates/default/order-invoice.html @@ -103,18 +103,18 @@ {if $IS_PROMO == 1} {assign "real_price" $PROMO_TAXED_PRICE} -
    {currency attr="symbol"} {$PROMO_TAXED_PRICE}
    - {intl l="instead of"} {currency attr="symbol"} {$TAXED_PRICE} +
    {$PROMO_TAXED_PRICE} {currency attr="symbol"}
    + {intl l="instead of"} {$TAXED_PRICE} {currency attr="symbol"} {else} {assign "real_price" $TAXED_PRICE} -
    {currency attr="symbol"} {$TAXED_PRICE}
    +
    {$TAXED_PRICE} {currency attr="symbol"}
    {/if} {$QUANTITY} - {currency attr="symbol"} {$real_price * $QUANTITY} + {$real_price * $QUANTITY} {currency attr="symbol"} @@ -127,7 +127,7 @@ {intl l="Shipping Tax"}
    - {currency attr="symbol"} {order attr="postage"} + {order attr="postage"} {currency attr="symbol"}
    @@ -153,7 +153,7 @@ {intl l="Total"}
    - {currency attr="symbol"} {{cart attr="total_taxed_price"} + {order attr="postage"}} + {{cart attr="total_taxed_price"} + {order attr="postage"}} {currency attr="symbol"}
    diff --git a/templates/default/order-placed.html b/templates/default/order-placed.html index 4931896f5..c8a1a24f2 100644 --- a/templates/default/order-placed.html +++ b/templates/default/order-placed.html @@ -42,7 +42,7 @@
    {intl l="Date"} :
    {format_date date=$CREATE_DATE output="date"}
    {intl l="Total"} :
    -
    {loop type="currency" name="order-currency" id=$CURRENCY}{$SYMBOL}{/loop} {$TOTAL_TAXED_AMOUNT}
    +
    {$TOTAL_TAXED_AMOUNT} {loop type="currency" name="order-currency" id=$CURRENCY}{$SYMBOL}{/loop}
    From d2a9de682d0541846337caca86878d1a082d7511 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 7 Nov 2013 14:57:18 +0100 Subject: [PATCH 19/25] Fixed file list bug --- .../Thelia/Core/Template/TemplateHelper.php | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/core/lib/Thelia/Core/Template/TemplateHelper.php b/core/lib/Thelia/Core/Template/TemplateHelper.php index b29837cbd..f1a2ec8b9 100644 --- a/core/lib/Thelia/Core/Template/TemplateHelper.php +++ b/core/lib/Thelia/Core/Template/TemplateHelper.php @@ -130,7 +130,7 @@ class TemplateHelper */ public function walkDir($directory, $walkMode, Translator $translator, $currentLocale, &$strings) { - $num_files = 0; + $num_texts = 0; if ($walkMode == self::WALK_MODE_PHP) { $prefix = '\-\>[\s]*trans[\s]*\('; @@ -155,7 +155,7 @@ class TemplateHelper if ($fileInfo->isDot()) continue; - if ($fileInfo->isDir()) $num_files += $this->walkDir($fileInfo->getPathName(), $walkMode, $translator, $currentLocale, $strings); + if ($fileInfo->isDir()) $num_texts += $this->walkDir($fileInfo->getPathName(), $walkMode, $translator, $currentLocale, $strings); if ($fileInfo->isFile()) { @@ -186,18 +186,19 @@ class TemplateHelper $strings[$hash]['files'][] = $short_path; } } - else - $num_files++; + else { + $num_texts++; - // remove \' - $match = str_replace("\\'", "'", $match); + // remove \' + $match = str_replace("\\'", "'", $match); - $strings[$hash] = array( - 'files' => array($short_path), - 'text' => $match, - 'translation' => $translator->trans($match, array(), 'messages', $currentLocale, false), - 'dollar' => strstr($match, '$') !== false - ); + $strings[$hash] = array( + 'files' => array($short_path), + 'text' => $match, + 'translation' => $translator->trans($match, array(), 'messages', $currentLocale, false), + 'dollar' => strstr($match, '$') !== false + ); + } } } } @@ -205,7 +206,7 @@ class TemplateHelper } } - return $num_files; + return $num_texts; } catch (\UnexpectedValueException $ex) { echo $ex; From 528372855f83b543953b46259011c21467a1c511 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 7 Nov 2013 15:08:01 +0100 Subject: [PATCH 20/25] Refactired Modules classes and interface architecture --- core/lib/Thelia/Model/Module.php | 2 +- core/lib/Thelia/Module/BaseModule.php | 58 +++++++++++++++---- .../lib/Thelia/Module/BaseModuleInterface.php | 14 +++-- templates/admin/default/languages.html | 10 ++-- 4 files changed, 62 insertions(+), 22 deletions(-) diff --git a/core/lib/Thelia/Model/Module.php b/core/lib/Thelia/Model/Module.php index d57df77fa..36ed8778e 100755 --- a/core/lib/Thelia/Model/Module.php +++ b/core/lib/Thelia/Model/Module.php @@ -32,4 +32,4 @@ class Module extends BaseModule { public function getI18nPath() { return $this->getBaseDir() . DS . "I18n"; } -} +} \ No newline at end of file diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php index 15853a398..5a6aa103f 100755 --- a/core/lib/Thelia/Module/BaseModule.php +++ b/core/lib/Thelia/Module/BaseModule.php @@ -36,8 +36,9 @@ use Thelia\Exception\ModuleException; use Thelia\Model\Module; use Thelia\Model\ModuleImage; use Thelia\Model\ModuleQuery; +use Thelia\Core\HttpFoundation\Request; -abstract class BaseModule extends ContainerAware +class BaseModule extends ContainerAware implements BaseModuleInterface { const CLASSIC_MODULE_TYPE = 1; const DELIVERY_MODULE_TYPE = 2; @@ -48,10 +49,8 @@ abstract class BaseModule extends ContainerAware protected $reflected; - public function __construct() - { - - } + protected $dispatcher = null; + protected $request = null; public function activate($moduleModel = null) { @@ -102,7 +101,7 @@ abstract class BaseModule extends ContainerAware public function hasContainer() { - return null === $this->container; + return null !== $this->container; } public function getContainer() @@ -114,6 +113,41 @@ abstract class BaseModule extends ContainerAware return $this->container; } + + public function hasRequest() { + return null !== $this->request; + } + + public function setRequest(Request $request) { + $this->request = $request; + } + + public function getRequest() { + if ($this->hasRequest() === false) { + throw new \RuntimeException("Sorry, the request is not available in this context"); + } + + return $this->request; + } + + + public function hasDispatcher() { + return null !== $this->dispatcher; + } + + public function setDispatcher(EventDispatcherInterface $dispatcher) { + $this->dispatcher = $dispatcher; + } + + public function getDispatcher() { + if ($this->hasDispatcher() === false) { + throw new \RuntimeException("Sorry, the dispatcher is not available in this context"); + } + + return $this->dispatcher; + } + + public function setTitle(Module $module, $titles) { if (is_array($titles)) { @@ -226,6 +260,7 @@ abstract class BaseModule extends ContainerAware public function install(ConnectionInterface $con = null) { + // Implement this method to do something useful. } public function preActivation(ConnectionInterface $con = null) @@ -235,7 +270,7 @@ abstract class BaseModule extends ContainerAware public function postActivation(ConnectionInterface $con = null) { - + // Implement this method to do something useful. } public function preDeactivation(ConnectionInterface $con = null) @@ -245,12 +280,11 @@ abstract class BaseModule extends ContainerAware public function postDeactivation(ConnectionInterface $con = null) { - + // Implement this method to do something useful. } - public function destroy(ConnectionInterface $con = null) + public function destroy(ConnectionInterface $con = null, $deleteModuleData = false) { - + // Implement this method to do something useful. } - -} +} \ No newline at end of file diff --git a/core/lib/Thelia/Module/BaseModuleInterface.php b/core/lib/Thelia/Module/BaseModuleInterface.php index 5cfd98409..a8e4d27ec 100644 --- a/core/lib/Thelia/Module/BaseModuleInterface.php +++ b/core/lib/Thelia/Module/BaseModuleInterface.php @@ -28,9 +28,15 @@ use Symfony\Component\HttpFoundation\Request; interface BaseModuleInterface { - public function setRequest(Request $request); - public function getRequest(); + public function install(ConnectionInterface $con = null); - public function setDispatcher(EventDispatcherInterface $dispatcher); - public function getDispatcher(); + public function preActivation(ConnectionInterface $con = null); + + public function postActivation(ConnectionInterface $con = null); + + public function preDeactivation(ConnectionInterface $con = null); + + public function postDeactivation(ConnectionInterface $con = null); + + public function destroy(ConnectionInterface $con = null, $deleteModuleData = false); } diff --git a/templates/admin/default/languages.html b/templates/admin/default/languages.html index 73f2a656c..dc337efe2 100644 --- a/templates/admin/default/languages.html +++ b/templates/admin/default/languages.html @@ -21,9 +21,9 @@
    - +
    - + - - + + @@ -82,7 +82,7 @@ {/loop} - +
    {intl l="Languages management"} @@ -98,13 +98,13 @@
    - {foreach $choices as $choice} {/foreach}
    - +
    @@ -115,7 +115,7 @@
    - +
    {intl l="Using a domain or subdomain for each language"}
    {form name="thelia.lang.url"} From 40e8656964340b47faad6a2a3f9b32a9d8136ef3 Mon Sep 17 00:00:00 2001 From: touffies Date: Thu, 7 Nov 2013 15:51:24 +0100 Subject: [PATCH 21/25] Review pagination (Disable the Next or Previous button) --- templates/default/includes/toolbar.html | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html index ff8b0d69b..967c63b8d 100644 --- a/templates/default/includes/toolbar.html +++ b/templates/default/includes/toolbar.html @@ -41,25 +41,11 @@
    {intl l="Pagination"}
      - - {if $product_page > 1} -
      • - {else} -
      • - {/if} + {pageloop rel="product_list"} - {if $PAGE != $CURRENT} -
    • {$PAGE}
      • - {else} -
    • {$PAGE}
      • - {/if} - {if $PAGE == $LAST} - {if $CURRENT < $LAST} -
      • - {else} -
      • - {/if} - + {$PAGE} + {if $PAGE eq $LAST} + {/if} {/pageloop}
    From 3945504387e2b8c5bec2e44d52e6fa2e29688991 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 7 Nov 2013 16:50:52 +0100 Subject: [PATCH 22/25] fix use statement in BaseModuleInterface --- core/lib/Thelia/Module/BaseModuleInterface.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/lib/Thelia/Module/BaseModuleInterface.php b/core/lib/Thelia/Module/BaseModuleInterface.php index a8e4d27ec..694a4082c 100644 --- a/core/lib/Thelia/Module/BaseModuleInterface.php +++ b/core/lib/Thelia/Module/BaseModuleInterface.php @@ -23,6 +23,7 @@ namespace Thelia\Module; +use Propel\Runtime\Connection\ConnectionInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; From 6b0973a7ec28a9d2cf65aebcf96d36c084a6050c Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 7 Nov 2013 16:53:49 +0100 Subject: [PATCH 23/25] change request class in BaseModule --- core/lib/Thelia/Module/BaseModule.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php index 5a6aa103f..4575f5aac 100755 --- a/core/lib/Thelia/Module/BaseModule.php +++ b/core/lib/Thelia/Module/BaseModule.php @@ -27,6 +27,8 @@ namespace Thelia\Module; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Propel; use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\HttpFoundation\Request; use Thelia\Model\Map\ModuleTableMap; use Thelia\Model\ModuleI18nQuery; use Thelia\Model\Map\ModuleImageTableMap; @@ -36,7 +38,7 @@ use Thelia\Exception\ModuleException; use Thelia\Model\Module; use Thelia\Model\ModuleImage; use Thelia\Model\ModuleQuery; -use Thelia\Core\HttpFoundation\Request; + class BaseModule extends ContainerAware implements BaseModuleInterface { From 9f211a5dcbf0af8e891e6d10c6c069d5fb16861c Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 7 Nov 2013 20:01:10 +0100 Subject: [PATCH 24/25] Fixed Issue #97 --- .../Thelia/Tests/Command/ModuleActivateCommandTest.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php b/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php index 680a487aa..d18c80a61 100755 --- a/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php +++ b/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php @@ -41,6 +41,9 @@ class ModuleActivateCommandTest extends \PHPUnit_Framework_TestCase $module = ModuleQuery::create()->findOne(); if (null !== $module) { + + $prev_activation_status = $module->getActivate(); + $application = new Application($this->getKernel()); $module->setActivate(BaseModule::IS_NOT_ACTIVATED); @@ -58,7 +61,12 @@ class ModuleActivateCommandTest extends \PHPUnit_Framework_TestCase "module" => $module->getCode(), )); - $this->assertEquals(BaseModule::IS_ACTIVATED, ModuleQuery::create()->findPk($module->getId())->getActivate()); + $activated = ModuleQuery::create()->findPk($module->getId())->getActivate(); + + // Restore activation status + $module->setActivate($prev_activation_status)->save(); + + $this->assertEquals(BaseModule::IS_ACTIVATED, $activated); } } From 85ea937570cc676dd9c19afb7835bbdd756cd957 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Fri, 8 Nov 2013 11:22:26 +0100 Subject: [PATCH 25/25] Optimisation of THELIA_* constants usage --- core/bootstrap.php | 4 ++-- core/lib/Thelia/Command/Install.php | 4 ++-- core/lib/Thelia/Core/Thelia.php | 2 +- core/lib/Thelia/Core/TheliaHttpKernel.php | 2 +- templates/admin/default/administrators.html | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/bootstrap.php b/core/bootstrap.php index 99a24db72..72c003da9 100755 --- a/core/bootstrap.php +++ b/core/bootstrap.php @@ -15,7 +15,7 @@ define('DS' , DIRECTORY_SEPARATOR); $loader = require __DIR__ . "/vendor/autoload.php"; -if (!file_exists(THELIA_ROOT . '/local/config/database.yml') && !defined('THELIA_INSTALL_MODE')) { +if (!file_exists(THELIA_CONF_DIR . 'database.yml') && !defined('THELIA_INSTALL_MODE')) { $sapi = php_sapi_name(); if (substr($sapi, 0, 3) == 'cli') { define('THELIA_INSTALL_MODE', true); @@ -24,4 +24,4 @@ if (!file_exists(THELIA_ROOT . '/local/config/database.yml') && !defined('THELIA header('location: '.$request->getSchemeAndHttpHost() . '/install'); exit; } -} +} \ No newline at end of file diff --git a/core/lib/Thelia/Command/Install.php b/core/lib/Thelia/Command/Install.php index 21ebdcfdc..71c97e9a1 100755 --- a/core/lib/Thelia/Command/Install.php +++ b/core/lib/Thelia/Command/Install.php @@ -180,8 +180,8 @@ class Install extends ContainerAwareCommand { $fs = new Filesystem(); - $sampleConfigFile = THELIA_ROOT . "/local/config/database.yml.sample"; - $configFile = THELIA_ROOT . "/local/config/database.yml"; + $sampleConfigFile = THELIA_CONF_DIR . "database.yml.sample"; + $configFile = THELIA_CONF_DIR . "database.yml"; $fs->copy($sampleConfigFile, $configFile, true); diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index c8cc02820..f4187b5a5 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -75,7 +75,7 @@ class Thelia extends Kernel } $definePropel = new DefinePropel(new DatabaseConfiguration(), - Yaml::parse(THELIA_ROOT . '/local/config/database.yml')); + Yaml::parse(THELIA_CONF_DIR . 'database.yml')); $serviceContainer = Propel::getServiceContainer(); $serviceContainer->setAdapterClass('thelia', 'mysql'); $manager = new ConnectionManagerSingle(); diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php index 07dc15eed..94ad7f9de 100755 --- a/core/lib/Thelia/Core/TheliaHttpKernel.php +++ b/core/lib/Thelia/Core/TheliaHttpKernel.php @@ -215,7 +215,7 @@ class TheliaHttpKernel extends HttpKernel $storage = new Session\Storage\NativeSessionStorage(); if (Model\ConfigQuery::read("session_config.default")) { - $storage->setSaveHandler(new Session\Storage\Handler\NativeFileSessionHandler(Model\ConfigQuery::read("session_config.save_path", THELIA_ROOT . '/local/session/'))); + $storage->setSaveHandler(new Session\Storage\Handler\NativeFileSessionHandler(Model\ConfigQuery::read("session_config.save_path", THELIA_LOCAL_DIR . 'session/'))); } else { $handlerString = Model\ConfigQuery::read("session_config.handlers", 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler'); diff --git a/templates/admin/default/administrators.html b/templates/admin/default/administrators.html index c2b8fa521..a02846c0f 100644 --- a/templates/admin/default/administrators.html +++ b/templates/admin/default/administrators.html @@ -1,6 +1,6 @@ {extends file="admin-layout.tpl"} -{block name="page-title"}{intl l='Taxes rules'}{/block} +{block name="page-title"}{intl l='Back-office users'}{/block} {block name="check-resource"}admin.configuration.administrator{/block} {block name="check-access"}view{/block} @@ -9,12 +9,12 @@
    {intl l="Login"}{intl l="FirstName"}{intl l="LastName"}{intl l="First Name"}{intl l="Last Name"} {intl l="Profile"} {intl l="Actions"}