diff --git a/.t9n.yml b/.t9n.yml index a32582c40423e..cf49bc316ae32 100644 --- a/.t9n.yml +++ b/.t9n.yml @@ -9,6 +9,7 @@ paths: - install-dev - themes - pdf + - mails/themes exclude_files: - src/PrestaShopBundle/Tests - classes/PrestaShopAutoload.php @@ -17,5 +18,6 @@ exclude_files: - node_modules - vendor - tools - - mails + - mails/[a-zA-Z]{2}/ - js + - modules/ps_themecusto diff --git a/app/Resources/translations/default/AdminNotificationsError.xlf b/app/Resources/translations/default/AdminNotificationsError.xlf index 9ecc5c5f262bb..f83cfae6b0f22 100644 --- a/app/Resources/translations/default/AdminNotificationsError.xlf +++ b/app/Resources/translations/default/AdminNotificationsError.xlf @@ -37,32 +37,32 @@ This class name does not exist. This class name does not exist. - Line: 132 + Line: 134 This property does not exist in the class or is forbidden. This property does not exist in the class or is forbidden. - Line: 149 + Line: 151 This association has too many elements. This association has too many elements. - Line: 178 + Line: 180 This name is not allowed. This name is not allowed. - Line: 194 + Line: 196 Syntax error with this pattern. Syntax error with this pattern. - Line: 188 + Line: 190 This key has already been used. This key has already been used. - Line: 230 + Line: 232 @@ -280,63 +280,63 @@ The 'From' date format is invalid (YYYY-MM-DD) The 'From' date format is invalid (YYYY-MM-DD) - Line: 906 + Line: 892 The 'To' date format is invalid (YYYY-MM-DD) The 'To' date format is invalid (YYYY-MM-DD) - Line: 914 + Line: 900 An error occurred while attempting to delete the image. (cannot load object). An error occurred while attempting to delete the image. (cannot load object). - Line: 1021 + Line: 1007 You cannot delete this item. You cannot delete this item. - Line: 1108 + Line: 1094 Comment: check if some ids are in list_skip_actions and forbid deletion An error occurred when attempting to update the required fields. An error occurred when attempting to update the required fields. - Line: 1314 + Line: 1300 field %s is required. field %s is required. - Line: 1469 + Line: 1455 Cannot add configuration %s Cannot add configuration %s - Line: 1532 + Line: 1518 The field %field_name% is required at least in %lang%. The field %field_name% is required at least in %lang%. - Line: 3713 + Line: 3699 The %field_name% field (%lang%) is invalid. The %field_name% field (%lang%) is invalid. - Line: 3748 + Line: 3734 %s: Incorrect value %s: Incorrect value - Line: 3954 + Line: 3940 An error occurred while assigning a zone to the selection. An error occurred while assigning a zone to the selection. - Line: 4198 + Line: 4184 You must select at least one element to assign a new zone. You must select at least one element to assign a new zone. - Line: 4200 + Line: 4186 @@ -904,7 +904,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion The voucher code is invalid. The voucher code is invalid. - Line: 158 + Line: 159 @@ -1023,17 +1023,17 @@ Comment: check if some ids are in list_skip_actions and forbid deletion The object cannot be loaded (the identifier is missing or invalid) The object cannot be loaded (the identifier is missing or invalid) - Line: 475 + Line: 476 You do not have permission to update this. You do not have permission to update this. - Line: 328 + Line: 329 You need permission to add this. You need permission to add this. - Line: 558 + Line: 559 @@ -1051,12 +1051,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion Profile(s) assigned to employee cannot be deleted Profile(s) assigned to employee cannot be deleted - Line: 280 + Line: 281 You cannot delete your own profile You cannot delete your own profile - Line: 284 + Line: 285 @@ -1083,7 +1083,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion The %s field is required. The %s field is required. - Line: 401 + Line: 403 Cannot write into file: %filename%. Please check write permissions. @@ -1097,12 +1097,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion You do not have permission to delete this. You do not have permission to delete this. - Line: 344 + Line: 345 An unexpected error occurred. [%type% code %code%] An unexpected error occurred. [%type% code %code%] - Line: 369 + Line: 370 @@ -1144,17 +1144,17 @@ Comment: check if some ids are in list_skip_actions and forbid deletion The %s field is not valid The %s field is not valid - Line: 377 + Line: 378 Unexpected error occurred. Unexpected error occurred. - Line: 309 + Line: 310 You need permission to edit this. You need permission to edit this. - Line: 294 + Line: 295 @@ -1168,12 +1168,17 @@ Comment: check if some ids are in list_skip_actions and forbid deletion An error occurred while uploading the image. An error occurred while uploading the image. - Line: 336 + Line: 337 The object cannot be loaded (or found) The object cannot be loaded (or found) - Line: 309 + Line: 310 + + + Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server's configuration settings. + Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server's configuration settings. + Line: 333 @@ -1182,12 +1187,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion An error occurred while deleting this selection. An error occurred while deleting this selection. - Line: 403 + Line: 404 An error occurred while deleting the object. An error occurred while deleting the object. - Line: 407 + Line: 408 @@ -1232,12 +1237,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion Unable to delete associated images. Unable to delete associated images. - Line: 739 + Line: 743 You cannot upload more files You cannot upload more files - Line: 760 + Line: 764 @@ -1260,7 +1265,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion The field %s is required. The field %s is required. - Line: 796 + Line: 807 @@ -1380,12 +1385,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion Cannot generate emails because the Symfony container is unavailable. Cannot generate emails because the Symfony container is unavailable. - Line: 754 + Line: 753 Cannot generate email templates: %s. Cannot generate email templates: %s. - Line: 777 + Line: 776 diff --git a/app/Resources/translations/default/EmailsBody.xlf b/app/Resources/translations/default/EmailsBody.xlf index b2fbb46f57663..c07ada7cbdc79 100644 --- a/app/Resources/translations/default/EmailsBody.xlf +++ b/app/Resources/translations/default/EmailsBody.xlf @@ -1,1179 +1,2187 @@ - + - - Thank you for creating a customer account at {shop_name}. - Thank you for creating a customer account at {shop_name}. - Context: -File: modules/ps_emailgenerator/templates/core/account.php:7 - - - Here are your login details: - Here are your login details: - Context: -File: modules/ps_emailgenerator/templates/core/account.php:25 - - - Important Security Tips: - Important Security Tips: - Context: -File: modules/ps_emailgenerator/templates/core/account.php:45 - - - Always keep your account details safe. - Always keep your account details safe. - Context: -File: modules/ps_emailgenerator/templates/core/account.php:47 - - - Never disclose your login details to anyone. - Never disclose your login details to anyone. - Context: -File: modules/ps_emailgenerator/templates/core/account.php:48 + + {shop_name} powered by PrestaShop™]]> + {shop_name} powered by PrestaShop™]]> + Line: 6 - - Change your password regularly. - Change your password regularly. - Context: -File: modules/ps_emailgenerator/templates/core/account.php:49 - - - Should you suspect someone is using your account illegally, please notify us immediately. - Should you suspect someone is using your account illegally, please notify us immediately. - Context: -File: modules/ps_emailgenerator/templates/core/account.php:50 + + + + + + Your login email address on {shop_name} + Your login email address on {shop_name} + Line: 25 - - You can now place orders on our shop: - You can now place orders on our shop: - Context: -File: modules/ps_emailgenerator/templates/core/account.php:65 + + Here is your login email address: + Here is your login email address: + Line: 30 - + - - A new order has been generated on your behalf. - A new order has been generated on your behalf. - Context: -File: modules/ps_emailgenerator/templates/core/backoffice_order.php:21 - {order_link} to finalize the payment.]]> {order_link} to finalize the payment.]]> - Context: -File: modules/ps_emailgenerator/templates/core/backoffice_order.php:24 + Line: 25 - + Awaiting wire payment Awaiting wire payment - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:22 + Line: 25 You have selected to pay by wire transfer. You have selected to pay by wire transfer. - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:45 + Line: 50 Here are the bank details for your transfer: Here are the bank details for your transfer: - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:48 - - - Account owner: - Account owner: - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:50 - - - Account details: - Account details: - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:51 - - - Bank address: - Bank address: - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:52 - - - Please specify your order reference in the bankwire description. - Please specify your order reference in the bankwire description. - Context: -File: modules/ps_emailgenerator/templates/core/bankwire.php:53 + Line: 53 - + - - {order_name} has been placed successfully and will be shipped as soon as we receive your payment.]]> - {order_name} has been placed successfully and will be shipped as soon as we receive your payment.]]> - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:25 - - - Amount: - Amount: - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:49 - "Guest Tracking" section on our shop.]]> "Guest Tracking" section on our shop.]]> - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:76 + Line: 87 Awaiting check payment Awaiting check payment - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:22 + Line: 25 You have selected to pay by check. You have selected to pay by check. - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:45 + Line: 50 Here are the bank details for your check: Here are the bank details for your check: - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:48 - - - Payable to the order of: - Payable to the order of: - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:50 + Line: 53 - - Please mail your check to: - Please mail your check to: - Context: -File: modules/ps_emailgenerator/templates/core/cheque.php:51 + + Your order with the reference [1]{order_name}[/1] has been placed successfully and will be [1]shipped as soon as we receive your payment[/1]. + Your order with the reference [1]{order_name}[/1] has been placed successfully and will be [1]shipped as soon as we receive your payment[/1]. + Line: 30 - + - - Message from a {shop_name} customer - Message from a {shop_name} customer - Context: -File: modules/ps_emailgenerator/templates/core/contact.php:6 - Customer e-mail address: Customer e-mail address: - Context: -File: modules/ps_emailgenerator/templates/core/contact.php:21 + Line: 22 - - - - Order ID: Order ID: - Context: -File: modules/ps_emailgenerator/templates/core/contact_form.php:22 - - - Attached file: - Attached file: - Context: -File: modules/ps_emailgenerator/templates/core/contact_form.php:24 + Line: 24 + + + + Your message to {shop_name} Customer Service Your message to {shop_name} Customer Service - Context: -File: modules/ps_emailgenerator/templates/core/contact_form.php:6 + Line: 7 Your message has been sent successfully. Your message has been sent successfully. - Context: -File: modules/ps_emailgenerator/templates/core/contact_form.php:21 - - - Product: - Product: - Context: -File: modules/ps_emailgenerator/templates/core/contact_form.php:23 + Line: 22 We will answer as soon as possible. We will answer as soon as possible. - Context: -File: modules/ps_emailgenerator/templates/core/contact_form.php:40 + Line: 41 - + Credit slip created Credit slip created - Context: -File: modules/ps_emailgenerator/templates/core/credit_slip.php:21 - - - {order_name}.]]> - {order_name}.]]> - Context: -File: modules/ps_emailgenerator/templates/core/credit_slip.php:24 + Line: 24 "My credit slips" section of your account by clicking "My account" on our shop.]]> "My credit slips" section of your account by clicking "My account" on our shop.]]> - Context: -File: modules/ps_emailgenerator/templates/core/credit_slip.php:40 + Line: 45 + + + We have generated a credit slip in your name for order with the reference [1]{order_name}[/1]. + We have generated a credit slip in your name for order with the reference [1]{order_name}[/1]. + Line: 29 - + {shop_name}]]> {shop_name}]]> - Context: -File: modules/ps_emailgenerator/templates/core/download_product.php:7 + Line: 8 Product(s) now available for download Product(s) now available for download - Context: -File: modules/ps_emailgenerator/templates/core/download_product.php:22 + Line: 25 - - {nbProducts} product(s) now available for download using the following link(s):]]> - {nbProducts} product(s) now available for download using the following link(s):]]> - Context: -File: modules/ps_emailgenerator/templates/core/download_product.php:25 + + You have [1]{nbProducts}[1] product(s) now available for download using the following link(s): + You have [1]{nbProducts}[1] product(s) now available for download using the following link(s): + Line: 30 - + Your {shop_name} login information Your {shop_name} login information - Context: -File: modules/ps_emailgenerator/templates/core/employee_password.php:21 - - - {shop_name}:]]> - {shop_name}:]]> - Context: -File: modules/ps_emailgenerator/templates/core/employee_password.php:24 - - - First name: - First name: - Context: -File: modules/ps_emailgenerator/templates/core/employee_password.php:25 - - - Last name: - Last name: - Context: -File: modules/ps_emailgenerator/templates/core/employee_password.php:26 + Line: 24 - - - - - - {shop_name} powered by PrestaShop™]]> - {shop_name} powered by PrestaShop™]]> - Context: -File: modules/ps_emailgenerator/templates/core/footer.php:6 + + Here is your personal login information for [1]{shop_name}[/1]: + Here is your personal login information for [1]{shop_name}[/1]: + Line: 29 - + Customer service - Forwarded discussion Customer service - Forwarded discussion - Context: -File: modules/ps_emailgenerator/templates/core/forward_msg.php:21 - - - {employee} wanted to forward this discussion to you.]]> - {employee} wanted to forward this discussion to you.]]> - Context: -File: modules/ps_emailgenerator/templates/core/forward_msg.php:24 - - - Discussion history: - Discussion history: - Context: -File: modules/ps_emailgenerator/templates/core/forward_msg.php:25 + Line: 24 - - {employee} added "{comment}"]]> - {employee} added "{comment}"]]> - Context: -File: modules/ps_emailgenerator/templates/core/forward_msg.php:26 + + [1]{employee}[/1] added [1]"{comment}"[/1] + [1]{employee}[/1] added [1]"{comment}"[/1] + Line: 31 - + Your customer account creation Your customer account creation - Context: -File: modules/ps_emailgenerator/templates/core/guest_to_customer.php:21 - - - {shop_name} has been transformed into a customer account.]]> - {shop_name} has been transformed into a customer account.]]> - Context: -File: modules/ps_emailgenerator/templates/core/guest_to_customer.php:24 + Line: 24 Please be careful when sharing these login details with others. Please be careful when sharing these login details with others. - Context: -File: modules/ps_emailgenerator/templates/core/guest_to_customer.php:41 + Line: 46 - - You can access your customer account on our shop: - You can access your customer account on our shop: - Context: -File: modules/ps_emailgenerator/templates/core/guest_to_customer.php:50 + + E-mail address: + E-mail address: + Line: 30 - - - - - - Message from {shop_name} - Message from {shop_name} - Context: -File: modules/ps_emailgenerator/templates/core/header_order_conf.php:6 + + Your guest account for [1]{shop_name}[/1] has been transformed into a customer account. + Your guest account for [1]{shop_name}[/1] has been transformed into a customer account. + Line: 29 - + Import complete Import complete - Context: -File: modules/ps_emailgenerator/templates/core/import.php:21 - - - The file {filename} has been successfully imported to your shop. - The file {filename} has been successfully imported to your shop. - Context: -File: modules/ps_emailgenerator/templates/core/import.php:24 + Line: 24 - + - - In transit - In transit - Context: -File: modules/ps_emailgenerator/templates/core/in_transit.php:46 - - - {order_name} is currently in transit.]]> - {order_name} is currently in transit.]]> - Context: -File: modules/ps_emailgenerator/templates/core/in_transit.php:49 - - - You can track your package using the following link: - You can track your package using the following link: - Context: -File: modules/ps_emailgenerator/templates/core/in_transit.php:50 - {followup} {followup} - Context: -File: modules/ps_emailgenerator/templates/core/in_transit.php:50 + Line: 55 + + + Your order with the reference [1]{order_name}[/1] is currently in transit. + Your order with the reference [1]{order_name}[/1] is currently in transit. + Line: 54 - + You have received a new log alert You have received a new log alert - Context: -File: modules/ps_emailgenerator/templates/core/log_alert.php:21 - - - Warning: you have received a new log alert in your Back Office.]]> - Warning: you have received a new log alert in your Back Office.]]> - Context: -File: modules/ps_emailgenerator/templates/core/log_alert.php:24 + Line: 24 - - "Tools" > "Logs" section of your Back Office.]]> - "Tools" > "Logs" section of your Back Office.]]> - Context: -File: modules/ps_emailgenerator/templates/core/log_alert.php:25 + + [1]Warning:[/1] you have received a new log alert in your Back Office. + [1]Warning:[/1] you have received a new log alert in your Back Office. + Line: 29 - + - - Order canceled - Order canceled - Context: -File: modules/ps_emailgenerator/templates/core/order_canceled.php:21 - - - {order_name} from {shop_name} has been canceled.]]> - {order_name} from {shop_name} has been canceled.]]> - Context: -File: modules/ps_emailgenerator/templates/core/order_canceled.php:24 + + Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been canceled. + Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been canceled. + Line: 29 - - - - Order changed - Order changed - Context: -File: modules/ps_emailgenerator/templates/core/order_changed.php:21 - - - {order_name} from {shop_name} has been changed by the merchant.]]> - {order_name} from {shop_name} has been changed by the merchant.]]> - Context: -File: modules/ps_emailgenerator/templates/core/order_changed.php:24 - - - - - - - Thank you for shopping with {shop_name}! - Thank you for shopping with {shop_name}! - Context: -File: modules/ps_emailgenerator/templates/core/order_conf.php:7 - - - - + Message from a customer Message from a customer - Context: -File: modules/ps_emailgenerator/templates/core/order_customer_comment.php:21 - - - You have received a new message regarding order with the reference - You have received a new message regarding order with the reference - Context: -File: modules/ps_emailgenerator/templates/core/order_customer_comment.php:24 - - - - - - - {shop_name} regarding order with the reference {order_name}.]]> - {shop_name} regarding order with the reference {order_name}.]]> - Context: -File: modules/ps_emailgenerator/templates/core/order_merchant_comment.php:24 - - - Message: - Message: - Context: -File: modules/ps_emailgenerator/templates/core/order_merchant_comment.php:25 + Line: 24 - + Return #{id_order_return} - update Return #{id_order_return} - update - Context: -File: modules/ps_emailgenerator/templates/core/order_return_state.php:21 - - - We have updated the progress on your return #{id_order_return}, the new status is: - We have updated the progress on your return #{id_order_return}, the new status is: - Context: -File: modules/ps_emailgenerator/templates/core/order_return_state.php:24 + Line: 24 - + - - Thanks for your order with the reference {order_name} from {shop_name}. - Thanks for your order with the reference {order_name} from {shop_name}. - Context: -File: modules/ps_emailgenerator/templates/core/outofstock.php:7 - Item(s) out of stock Item(s) out of stock - Context: -File: modules/ps_emailgenerator/templates/core/outofstock.php:22 + Line: 25 Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this. Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this. - Context: -File: modules/ps_emailgenerator/templates/core/outofstock.php:25 + Line: 30 - + - - E-mail address: - E-mail address: - Context: -File: modules/ps_emailgenerator/templates/core/password.php:24 - Your new {shop_name} login details Your new {shop_name} login details - Context: -File: modules/ps_emailgenerator/templates/core/password.php:21 + Line: 24 - + Password reset request for {shop_name} Password reset request for {shop_name} - Context: -File: modules/ps_emailgenerator/templates/core/password_query.php:21 - - - {shop_name} login details.]]> - {shop_name} login details.]]> - Context: -File: modules/ps_emailgenerator/templates/core/password_query.php:24 - - - Please note that this will change your current password. - Please note that this will change your current password. - Context: -File: modules/ps_emailgenerator/templates/core/password_query.php:25 + Line: 24 To confirm this action, please use the following link: To confirm this action, please use the following link: - Context: -File: modules/ps_emailgenerator/templates/core/password_query.php:26 + Line: 31 - + Payment processed Payment processed - Context: -File: modules/ps_emailgenerator/templates/core/payment.php:22 + Line: 25 {order_name} was successfully processed.]]> {order_name} was successfully processed.]]> - Context: -File: modules/ps_emailgenerator/templates/core/payment.php:25 + Line: 30 - + Payment processing error Payment processing error - Context: -File: modules/ps_emailgenerator/templates/core/payment_error.php:21 + Line: 24 {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.]]> {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.]]> - Context: -File: modules/ps_emailgenerator/templates/core/payment_error.php:24 + Line: 29 We cannot ship your order until we receive your payment. We cannot ship your order until we receive your payment. - Context: -File: modules/ps_emailgenerator/templates/core/payment_error.php:25 + Line: 30 - + Processing Processing - Context: -File: modules/ps_emailgenerator/templates/core/preparation.php:21 + Line: 24 {shop_name} order with the reference {order_name}.]]> {shop_name} order with the reference {order_name}.]]> - Context: -File: modules/ps_emailgenerator/templates/core/preparation.php:24 + Line: 29 - + - - Refund processed - Refund processed - Context: -File: modules/ps_emailgenerator/templates/core/refund.php:21 - {shop_name} refund for order with the reference {order_name}.]]> {shop_name} refund for order with the reference {order_name}.]]> - Context: -File: modules/ps_emailgenerator/templates/core/refund.php:24 + Line: 29 - + - - Please do not reply directly to this email, we will not receive it. - Please do not reply directly to this email, we will not receive it. - Context: -File: modules/ps_emailgenerator/templates/core/reply_msg.php:22 - {link}]]> {link}]]> - Context: -File: modules/ps_emailgenerator/templates/core/reply_msg.php:24 + Line: 25 - + Your order has been shipped Your order has been shipped - Context: -File: modules/ps_emailgenerator/templates/core/shipped.php:7 - - - Shipped - Shipped - Context: -File: modules/ps_emailgenerator/templates/core/shipped.php:22 - - - {order_name} has been shipped.]]> - {order_name} has been shipped.]]> - Context: -File: modules/ps_emailgenerator/templates/core/shipped.php:25 + Line: 8 - + Hello Hello - Context: -File: modules/ps_emailgenerator/templates/core/test.php:5 + Line: 6 - - test e-mail from your shop.

If you can read this, the test was successful!]]> - test e-mail from your shop.

If you can read this, the test was successful!]]> - Context: -File: modules/ps_emailgenerator/templates/core/test.php:14 + + This is a [1]test e-mail[/1] from your shop. + This is a [1]test e-mail[/1] from your shop. + Line: 15 + + + If you can read this, the test was successful! + If you can read this, the test was successful! + Line: 17 - + Voucher created Voucher created - Context: -File: modules/ps_emailgenerator/templates/core/voucher.php:21 + Line: 24 - - {order_name}.]]> - {order_name}.]]> - Context: -File: modules/ps_emailgenerator/templates/core/voucher.php:24 + + A voucher has been created in your name as a result of your order with the reference [1]{order_name}[/1]. + A voucher has been created in your name as a result of your order with the reference [1]{order_name}[/1]. + Line: 29 - - Voucher code: {voucher_num} in the amount of {voucher_amount}]]> - Voucher code: {voucher_num} in the amount of {voucher_amount}]]> - Context: -File: modules/ps_emailgenerator/templates/core/voucher.php:25 + + [1]Voucher code: {voucher_num}[/1] in the amount of [1]{voucher_amount}[/1] + [1]Voucher code: {voucher_num}[/1] in the amount of [1]{voucher_amount}[/1] + Line: 30 - + This is to inform you about the creation of a voucher. This is to inform you about the creation of a voucher. - Context: -File: modules/ps_emailgenerator/templates/core/voucher_new.php:21 + Line: 24 - + Your {shop_name} login details Your {shop_name} login details - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_1.php:46 + Line: 53 We noticed that during your last visit on {shop_name}, you did not complete the order you had started. We noticed that during your last visit on {shop_name}, you did not complete the order you had started. - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_1.php:24 + Line: 29 - - {days} days, so do not waste a moment!]]> - {days} days, so do not waste a moment!]]> - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_1.php:26 + + As an incentive, we can give you a discount of [1]{amount}%[/1] off your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + As an incentive, we can give you a discount of [1]{amount}%[/1] off your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + Line: 31 - + Thank you for your order at {shop_name}. Thank you for your order at {shop_name}. - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_2.php:7 + Line: 8 - - {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!]]> - {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!]]> - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_2.php:22 + + As our way of saying thanks, we want to give you a discount of [1]{amount}%[/1] off your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + As our way of saying thanks, we want to give you a discount of [1]{amount}%[/1] off your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + Line: 23 - + - - Thanks for your trust. - Thanks for your trust. - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_3.php:7 - You are one of our best customers and as such we want to thank you for your continued patronage. You are one of our best customers and as such we want to thank you for your continued patronage. - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_3.php:22 + Line: 25 - - {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!]]> - {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!]]> - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_3.php:25 + + As appreciation for your loyalty, we want to give you a discount of [1]{amount}%[/1] valid on your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + As appreciation for your loyalty, we want to give you a discount of [1]{amount}%[/1] valid on your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + Line: 30 - + - - Hi {firstname} {lastname}, - Hi {firstname} {lastname}, - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:6 - Here is your coupon: Here is your coupon: - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:46 + Line: 51 Enter this code in your shopping cart to get your discount. Enter this code in your shopping cart to get your discount. - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:47 - - - Your cart at {shop_name} - Your cart at {shop_name} - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:21 - - - Your cart has been saved, you can resume your order by visiting our shop: - Your cart has been saved, you can resume your order by visiting our shop: - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:25 + Line: 52 You are one of our best customers, however you have not placed an order in {days_threshold} days. You are one of our best customers, however you have not placed an order in {days_threshold} days. - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:24 + Line: 29 - - {days} days, so do not waste a moment!]]> - {days} days, so do not waste a moment!]]> - Context: -File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:26 + + We wish to thank you for the trust you have placed in us and want to give you a discount of [1]{amount}%[/1] valid on your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + We wish to thank you for the trust you have placed in us and want to give you a discount of [1]{amount}%[/1] valid on your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment! + Line: 31 - + - - {product} is now available. - {product} is now available. - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/customer_qty.php:21 - This item is once again in-stock. This item is once again in-stock. - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/customer_qty.php:24 + Line: 29 You can access the product page by clicking on the link: You can access the product page by clicking on the link: - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/customer_qty.php:25 + Line: 30 You can order it right now from our online shop. You can order it right now from our online shop. - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/customer_qty.php:26 + Line: 31 - + - - Customer message: - Customer message: - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:312 - - - Order details - Order details - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:28 + + Total Tax paid + Total Tax paid + Line: 180 - - Order: - Order: - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:31 + + A new order was placed on {shop_name} by the following customer: {firstname} {lastname} ({email}) + A new order was placed on {shop_name} by the following customer: {firstname} {lastname} ({email}) + Line: 14 - - Placed on - Placed on - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:31 + + + + + + "Order history" section of your customer account by clicking "My account" on our shop.]]> + "Order history" section of your customer account by clicking "My account" on our shop.]]> + Line: 45 - - Payment: - Payment: - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:32 + + Order {order_name} + Order {order_name} + Line: 24 - - Reference - Reference - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:47 + + "Guest Tracking" section on our shop.]]> + "Guest Tracking" section on our shop.]]> + Line: 54 - - Product - Product - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:48 + + Order edited + Order edited + Line: 24 - - Unit price - Unit price - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:49 + + Your order with the reference [1]{order_name}[/1] has been modified. + Your order with the reference [1]{order_name}[/1] has been modified. + Line: 29 - - Quantity - Quantity - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:50 + + + + + + The stock cover is now less than the specified minimum of: + The stock cover is now less than the specified minimum of: + Line: 29 - - Total price - Total price - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:51 + + + + + + {product} is nearly out of stock. + {product} is nearly out of stock. + Line: 24 + + + The remaining stock is now less than the specified minimum of + The remaining stock is now less than the specified minimum of + Line: 29 + + + + + + + Return details + Return details + Line: 25 + + + {order_name} Placed on {date} + {order_name} Placed on {date} + Line: 28 + + + + + + + Thank you for subscribing to our newsletter, please confirm your request by clicking the link below : + Thank you for subscribing to our newsletter, please confirm your request by clicking the link below : + Line: 22 + + + + + + + Newsletter subscription + Newsletter subscription + Line: 24 + + + Regarding your newsletter subscription, we are pleased to offer you the following voucher: + Regarding your newsletter subscription, we are pleased to offer you the following voucher: + Line: 29 + + + + + + + {shop_name}!]]> + {shop_name}!]]> + Line: 22 + + + We are pleased to offer you a voucher worth [1]{discount_display} (voucher # {discount_name})[/1] that you can use on your next order. + We are pleased to offer you a voucher worth [1]{discount_display} (voucher # {discount_name})[/1] that you can use on your next order. + Line: 23 + + + + + + + join us! + join us! + Line: 7 + + + {shop_name}!]]> + {shop_name}!]]> + Line: 22 + + + Get referred and earn a discount voucher of [1]{discount}![/1] + Get referred and earn a discount voucher of [1]{discount}![/1] + Line: 24 + + + It's very easy to sign up. Just click here! + It's very easy to sign up. Just click here! + Line: 25 + + + When signing up, don't forget to provide the e-mail address of your referring friend: + When signing up, don't forget to provide the e-mail address of your referring friend: + Line: 40 + + + + + + + Referral Program + Referral Program + Line: 22 + + + + + + + Thank you for creating a customer account at {shop_name}. + Thank you for creating a customer account at {shop_name}. + Line: 53 + + + Here are your login details: + Here are your login details: + Line: 256 + + + Important Security Tips: + Important Security Tips: + Line: 330 + + + Always keep your account details safe. + Always keep your account details safe. + Line: 397 + + + Never disclose your login details to anyone. + Never disclose your login details to anyone. + Line: 404 + + + Change your password regularly. + Change your password regularly. + Line: 411 + + + Should you suspect someone is using your account illegally, please notify us immediately. + Should you suspect someone is using your account illegally, please notify us immediately. + Line: 418 + + + You can now place orders on our shop: + You can now place orders on our shop: + Line: 481 + + + Account + Account + Line: 3 + + + Your login details on {shop_name} + Your login details on {shop_name} + Line: 189 + + + + + + + A new order has been generated on your behalf. + A new order has been generated on your behalf. + Line: 170 + + + Back Office Order + Back Office Order + Line: 3 + + + {order_link} to complete the payment.]]> + {order_link} to complete the payment.]]> + Line: 237 + + + + + + + Account owner: + Account owner: + Line: 406 + + + Account details: + Account details: + Line: 414 + + + Bank address: + Bank address: + Line: 421 + + + Please specify your order reference in the bankwire description. + Please specify your order reference in the bankwire description. + Line: 428 + + + Bankwire + Bankwire + Line: 3 + + + Pending payment + Pending payment + Line: 189 + + + Payment method: bank wire + Payment method: bank wire + Line: 323 + + + You have decided to pay by bank wire. + You have decided to pay by bank wire. + Line: 390 + + + Here is the information you need for your transfer: + Here is the information you need for your transfer: + Line: 391 + + + + + + + Amount: + Amount: + Line: 398 + + + Payable to the order of: + Payable to the order of: + Line: 406 + + + Please mail your check to: + Please mail your check to: + Line: 414 + + + Thank you for shopping with {shop_name}! + Thank you for shopping with {shop_name}! + Line: 53 + + + Your order with the reference [1]{order_name}[/1] has been placed successfully. You can expect [1]delivery as soon as your payment is received[/1]. + Your order with the reference [1]{order_name}[/1] has been placed successfully. You can expect [1]delivery as soon as your payment is received[/1]. + Line: 256 + + + Check + Check + Line: 3 + + + Awaiting payment by check + Awaiting payment by check + Line: 189 + + + Payment method: check + Payment method: check + Line: 323 + + + You have decided to pay by bank check. + You have decided to pay by bank check. + Line: 390 + + + Here is the information you need for your check: + Here is the information you need for your check: + Line: 391 + + + + + + + Message from a {shop_name} customer + Message from a {shop_name} customer + Line: 44 + + + Attached file: + Attached file: + Line: 195 + + + Order ID #: + Order ID #: + Line: 187 + + + Contact + Contact + Line: 3 + + + Customer Email Address: + Customer Email Address: + Line: 180 + + + + + + + Product: + Product: + Line: 195 + + + Contact Form + Contact Form + Line: 3 + + + Your message has been sent successfully, thank you for taking the time to write! + Your message has been sent successfully, thank you for taking the time to write! + Line: 180 + + + We will reply as soon as possible. + We will reply as soon as possible. + Line: 266 + + + + + + + Credit Slip + Credit Slip + Line: 3 + + + Credit slip + Credit slip + Line: 180 + + + A credit slip has been generated in your name for order with the reference [1]{order_name}[/1]. + A credit slip has been generated in your name for order with the reference [1]{order_name}[/1]. + Line: 247 + + + Credit slips section of your customer account.]]> + Credit slips section of your customer account.]]> + Line: 310 + + + + + + + Download products + Download products + Line: 3 + + + Thank you for your order with the reference {order_name} from [1]{shop_name}[/1] + Thank you for your order with the reference {order_name} from [1]{shop_name}[/1] + Line: 53 + + + Product(s) to download + Product(s) to download + Line: 189 + + + You have [1]{nbProducts}[/1] product(s) now available for download using the following link(s): + You have [1]{nbProducts}[/1] product(s) now available for download using the following link(s): + Line: 256 + + + + + + + First name: + First name: + Line: 254 + + + Last name: + Last name: + Line: 262 + + + Employee password + Employee password + Line: 3 + + + Here is your personal login information for {shop_name} + Here is your personal login information for {shop_name} + Line: 180 + + + Here is your identification information on [1]{shop_name}[/1] + Here is your identification information on [1]{shop_name}[/1] + Line: 247 + + + + + + + Discussion history: + Discussion history: + Line: 254 + + + [1]{employee}[/1] wanted to forward this discussion to you. + [1]{employee}[/1] wanted to forward this discussion to you. + Line: 247 + + + Forward message + Forward message + Line: 3 + + + Customer Service - Discussion Forwarded + Customer Service - Discussion Forwarded + Line: 180 + + + [1]{employee}[/1] added [1]{comment}[/1] + [1]{employee}[/1] added [1]{comment}[/1] + Line: 261 + + + + + + + You can access your customer account on our shop: + You can access your customer account on our shop: + Line: 317 + + + Email address: + Email address: + Line: 254 + + + Guest to customer + Guest to customer + Line: 3 + + + Your guest account has been turned into a customer account + Your guest account has been turned into a customer account + Line: 180 + + + Congratulations, your guest account for [1]{shop_name}[/1] has been turned into a customer account! + Congratulations, your guest account for [1]{shop_name}[/1] has been turned into a customer account! + Line: 247 + + + + + + + The file {filename} has been successfully imported to your shop. + The file {filename} has been successfully imported to your shop. + Line: 247 + + + Import + Import + Line: 3 + + + Import finished + Import finished + Line: 180 + + + + + + + In transit + In transit + Line: 185 + + + You can track your package using the following link: + You can track your package using the following link: + Line: 259 + + + Your order with the reference [1]{order_name}[/1] is on its way. + Your order with the reference [1]{order_name}[/1] is on its way. + Line: 252 + + + + + + + Logs[/1] section of your back office.]]> + Logs[/1] section of your back office.]]> + Line: 254 + + + Log Alert + Log Alert + Line: 3 + + + New alert message saved + New alert message saved + Line: 180 + + + [1]WARNING:[/1] you have received a new log alert in your back office. + [1]WARNING:[/1] you have received a new log alert in your back office. + Line: 247 + + + + + + + Newsletter + Newsletter + Line: 3 + + + + + + + Order canceled + Order canceled + Line: 179 + + + Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been canceled by the merchant. + Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been canceled by the merchant. + Line: 246 + + + + + + + Order confirmation + Order confirmation + Line: 3 + + + Thank you for shopping on [1]{shop_name}[/1]! + Thank you for shopping on [1]{shop_name}[/1]! + Line: 53 + + + + + + + You have received a new message regarding order with the reference + You have received a new message regarding order with the reference + Line: 247 + + + Order customer comment + Order customer comment + Line: 3 + + + Message from customer + Message from customer + Line: 180 + + + + + + + Message from {shop_name} + Message from {shop_name} + Line: 180 + + + Message: + Message: + Line: 314 + + + You have received a new message from [1]{shop_name}[/1] regarding order with the reference [1]{order_name}[/1]. + You have received a new message from [1]{shop_name}[/1] regarding order with the reference [1]{order_name}[/1]. + Line: 247 + + + Order merchant comment + Order merchant comment + Line: 3 + + + + + + + We have updated the progress on your return #{id_order_return}, the new status is: + We have updated the progress on your return #{id_order_return}, the new status is: + Line: 247 + + + Order return sale + Order return sale + Line: 3 + + + Order return #{id_order_return} - Update + Order return #{id_order_return} - Update + Line: 180 + + + + + + + Thanks for your order with the reference {order_name} from {shop_name}. + Thanks for your order with the reference {order_name} from {shop_name}. + Line: 53 + + + Order history and details section of your customer account.]]> + Order history and details section of your customer account.]]> + Line: 319 + + + Out of stock + Out of stock + Line: 3 + + + Replenishment required + Replenishment required + Line: 189 + + + Unfortunately, one or more items are currently out of stock and this may cause a slight delay for delivery. Please accept our apologies for this inconvenience and be sure we are doing our best to correct the situation. + Unfortunately, one or more items are currently out of stock and this may cause a slight delay for delivery. Please accept our apologies for this inconvenience and be sure we are doing our best to correct the situation. + Line: 256 + + + + + + + Password + Password + Line: 3 + + + Your password has been correctly updated. + Your password has been correctly updated. + Line: 180 + + + + + + + Please note that this will change your current password. + Please note that this will change your current password. + Line: 254 + + + You have requested to reset your [1]{shop_name}[/1] login details. + You have requested to reset your [1]{shop_name}[/1] login details. + Line: 247 + + + Password Query + Password Query + Line: 3 + + + Confirmation of password request on {shop_name} + Confirmation of password request on {shop_name} + Line: 180 + + + In order to confirm this action, click on the following link: + In order to confirm this action, click on the following link: + Line: 261 + + + If you did not make this request, just ignore this email. + If you did not make this request, just ignore this email. + Line: 324 + + + + + + + Payment + Payment + Line: 3 + + + Your payment for order with the reference [1]{order_name}[/1] was successfully processed. + Your payment for order with the reference [1]{order_name}[/1] was successfully processed. + Line: 246 + + + + + + + Payment Error + Payment Error + Line: 3 + + + Payment error + Payment error + Line: 179 + + + We have encountered an error while processing your payment for your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. Please contact us as soon as possible. + We have encountered an error while processing your payment for your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. Please contact us as soon as possible. + Line: 246 + + + You can expect delivery as soon as your payment is received. + You can expect delivery as soon as your payment is received. + Line: 248 + + + + + + + Preparation + Preparation + Line: 3 + + + Processing order + Processing order + Line: 179 + + + We are currently processing your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. + We are currently processing your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. + Line: 246 + + + + + + + Refund processed + Refund processed + Line: 53 + + + Refund + Refund + Line: 3 + + + We have processed your refund for your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. + We have processed your refund for your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. + Line: 188 + + + + + + + Please do not reply directly to this email, we will not receive it. + Please do not reply directly to this email, we will not receive it. + Line: 245 + + + Reply msg + Reply msg + Line: 3 + + + {link}]]> + {link}]]> + Line: 246 + + + + + + + Shipped + Shipped + Line: 3 + + + Your order with the reference [1]{order_name}[/1] has been shipped. + Your order with the reference [1]{order_name}[/1] has been shipped. + Line: 247 + + + + + + + Test + Test + Line: 3 + + + Here is a test [1]email[/1] from your shop. + Here is a test [1]email[/1] from your shop. + Line: 180 + + + If you can read this, it means the test is successful! + If you can read this, it means the test is successful! + Line: 187 + + + + + + + In order to use it, just copy/paste this code during check out. + In order to use it, just copy/paste this code during check out. + Line: 260 + + + Voucher + Voucher + Line: 3 + + + Voucher code generated + Voucher code generated + Line: 179 + + + We are pleased to inform you that a voucher has been generated in your name for order with the reference [1]{order_name}[/1]. + We are pleased to inform you that a voucher has been generated in your name for order with the reference [1]{order_name}[/1]. + Line: 246 + + + [1]VOUCHER CODE: {voucher_num}[/1] in the amount of [1]{voucher_amount}[/1] + [1]VOUCHER CODE: {voucher_num}[/1] in the amount of [1]{voucher_amount}[/1] + Line: 253 + + + + + + + Voucher new + Voucher new + Line: 3 + + + Voucher code has been generated + Voucher code has been generated + Line: 180 + + + Here is your new voucher code: + Here is your new voucher code: + Line: 247 + + + + + + + Your cart at {shop_name} + Your cart at {shop_name} + Line: 180 + + + Follow up 1 + Follow up 1 + Line: 3 + + + Thanks for your visit. However, it looks like you did not complete your purchase. + Thanks for your visit. However, it looks like you did not complete your purchase. + Line: 247 + + + Your cart has been saved, you can go back to your order on our shop: + Your cart has been saved, you can go back to your order on our shop: + Line: 254 + + + Your voucher code on {shop_name} + Your voucher code on {shop_name} + Line: 328 + + + + + + + Follow up 2 + Follow up 2 + Line: 3 + + + Thanks for your order. + Thanks for your order. + Line: 53 + + + + + + + Thanks for your trust. + Thanks for your trust. + Line: 53 + + + Follow up 3 + Follow up 3 + Line: 3 + + + + + + + Your cart has been saved, you can resume your order by visiting our shop: + Your cart has been saved, you can resume your order by visiting our shop: + Line: 254 + + + We are pleased to offer you a discount of [1]{amount}%[/1] off your next order. And this offer is valid for [1]{days}[/1] days, so do not wait any longer! + We are pleased to offer you a discount of [1]{amount}%[/1] off your next order. And this offer is valid for [1]{days}[/1] days, so do not wait any longer! + Line: 261 + + + Here is your VOUCHER CODE: + Here is your VOUCHER CODE: + Line: 328 + + + Enter this code in your shopping cart to get the discount. + Enter this code in your shopping cart to get the discount. + Line: 334 + + + Follow up 4 + Follow up 4 + Line: 3 + + + Your cart on {shop_name} + Your cart on {shop_name} + Line: 180 + + + Congratulations, you are one of our best customers! However, it looks like you have not placed an order since {days_threshold} days. + Congratulations, you are one of our best customers! However, it looks like you have not placed an order since {days_threshold} days. + Line: 247 + + + + + + + {product} is now available. + {product} is now available. + Line: 180 + + + Customer Quantity + Customer Quantity + Line: 3 + + + Good news, this item is back in stock! + Good news, this item is back in stock! + Line: 247 + + + Click on the following link to visit the product page and order it: + Click on the following link to visit the product page and order it: + Line: 254 + + + + + + + Customer message: + Customer message: + Line: 667 + + + Order details + Order details + Line: 188 + + + Order: + Order: + Line: 255 + + + Placed on + Placed on + Line: 255 + + + Payment: + Payment: + Line: 510 + + + Reference + Reference + Line: 331 + + + Product + Product + Line: 332 + + + Unit price + Unit price + Line: 333 + + + Quantity + Quantity + Line: 334 + + + Total price + Total price + Line: 335 Products Products - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:67 + Line: 340 Discounts Discounts - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:95 + Line: 346 Gift-wrapping Gift-wrapping - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:123 + Line: 352 Shipping Shipping - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:151 - - - Total Tax paid - Total Tax paid - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:179 + Line: 358 Total paid Total paid - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:207 + Line: 370 Carrier: Carrier: - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:241 + Line: 504 Delivery address Delivery address - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:267 + Line: 580 Billing address Billing address - Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:286 + Line: 596 + + + Including total tax + Including total tax + Line: 364 + + + New Order + New Order + Line: 3 + + + A new order was placed on [1]{shop_name}[/1] by the following customer: + A new order was placed on [1]{shop_name}[/1] by the following customer: + Line: 53 + + + Carrier + Carrier + Line: 437 + + + + + + + Order changed + Order changed + Line: 180 + + + Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been changed by the merchant. + Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been changed by the merchant. + Line: 247 + + + Guest Tracking section on our shop.]]> + Guest Tracking section on our shop.]]> + Line: 317 + + + Order ID {order_name} + Order ID {order_name} + Line: 180 + + + Go to your customer account to learn more about it. + Go to your customer account to learn more about it. + Line: 254 + + + + + + + Current stock cover: + Current stock cover: + Line: 187 + + + Product coverage + Product coverage + Line: 3 + + + Your stock cover is now less than the specified minimum of: + Your stock cover is now less than the specified minimum of: + Line: 180 + + + + + + + {product} is almost out of stock. + {product} is almost out of stock. + Line: 178 + + + Remaining stock: + Remaining stock: + Line: 252 + + + Stocks[/1] section of your back office to manage your stock.]]> + Stocks[/1] section of your back office to manage your stock.]]> + Line: 258 + + + Product out of stock + Product out of stock + Line: 3 + + + There are now less than [1]{last_qty}[/1] items in stock. + There are now less than [1]{last_qty}[/1] items in stock. + Line: 245 + + + + + + + Customer: + Customer: + Line: 262 + + + You have received a new return request for {shop_name}. + You have received a new return request for {shop_name}. + Line: 53 + + + Return Slip + Return Slip + Line: 3 + + + Return Details + Return Details + Line: 189 + + + + + + + Thank you for subscribing to our newsletter. + Thank you for subscribing to our newsletter. + Line: 180 + + + Hi, + Hi, + Line: 44 + + + Newsletter Confirmation + Newsletter Confirmation + Line: 3 + + + + + + + Newsletter Verification + Newsletter Verification + Line: 3 + + + Thank you for subscribing to our newsletter. Please click on the following link to confirm your request: + Thank you for subscribing to our newsletter. Please click on the following link to confirm your request: + Line: 180 + + + + + + + Newsletter Voucher + Newsletter Voucher + Line: 3 + + Subscribing to newsletter + Subscribing to newsletter + Line: 180 + + + Thank you for subscribing to our newsletter. We are pleased to offer you the following voucher: + Thank you for subscribing to our newsletter. We are pleased to offer you the following voucher: + Line: 247 + + + + + Congratulations! Congratulations! + Line: 44 + + + Refferal program Congratulations + Refferal program Congratulations + Line: 3 + + + {shop_name}!]]> + {shop_name}!]]> + Line: 180 + + + We are pleased to offer you a voucher worth [1]{discount_display}[/1] (VOUCHER # [1]{discount_name}[/1]) that you can use on your next order. + We are pleased to offer you a voucher worth [1]{discount_display}[/1] (VOUCHER # [1]{discount_name}[/1]) that you can use on your next order. + Line: 187 + + + + + + + Best regards, + Best regards, + Line: 311 + + + We are pleased to offer you a voucher worth [1]{discount}[/1] that you can use on your next order. + We are pleased to offer you a voucher worth [1]{discount}[/1] that you can use on your next order. + Line: 186 + + + Refferal program Invitation + Refferal program Invitation + Line: 3 + + + Join us! + Join us! + Line: 43 + + + {shop_name}!]]> + {shop_name}!]]> + Line: 179 + + + Get referred and earn a discount voucher of [1]{discount}[/1]! + Get referred and earn a discount voucher of [1]{discount}[/1]! + Line: 187 + + + It's very easy to sign up, just click here! + It's very easy to sign up, just click here! + Line: 189 + + + When signing up, don't forget to provide the email address of your referring friend: + When signing up, don't forget to provide the email address of your referring friend: + Line: 253 + + + + + + + Hi {firstname} {lastname}, + Hi {firstname} {lastname}, + Line: 44 + + + Simply copy/paste this code during the payment process for your next order. + Simply copy/paste this code during the payment process for your next order. + Line: 255 + + + Here is the code of your voucher: + Here is the code of your voucher: + Line: 248 + + + We have created a voucher in your name for referring a friend. + We have created a voucher in your name for referring a friend. + Line: 247 + + + , with an amount of + , with an amount of + Line: 248 + + + Refferal program Voucher + Refferal program Voucher + Line: 3 + + + Sponsorship Program + Sponsorship Program + Line: 180 + + + + + + + {order_name} has been placed successfully and will be shipped as soon as we receive your payment.]]> + {order_name} has been placed successfully and will be shipped as soon as we receive your payment.]]> + Context: +File: modules/ps_emailgenerator/templates/core/cheque.php:25 + + + + + + + {order_name}.]]> + {order_name}.]]> + Context: +File: modules/ps_emailgenerator/templates/core/credit_slip.php:24 + + + + + + + {nbProducts} product(s) now available for download using the following link(s):]]> + {nbProducts} product(s) now available for download using the following link(s):]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:6 +File: modules/ps_emailgenerator/templates/core/download_product.php:25 - - A new order was placed on {shop_name} by the following customer: {firstname} {lastname} ({email}) - A new order was placed on {shop_name} by the following customer: {firstname} {lastname} ({email}) + + + + + + {shop_name}:]]> + {shop_name}:]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/new_order.php:13 +File: modules/ps_emailgenerator/templates/core/employee_password.php:24 - + - - "Order history" section of your customer account by clicking "My account" on our shop.]]> - "Order history" section of your customer account by clicking "My account" on our shop.]]> + + {shop_name} powered by PrestaShop™]]> + {shop_name} powered by PrestaShop™]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/order_changed.php:40 +File: modules/ps_emailgenerator/templates/core/footer.php:6 - - Order {order_name} - Order {order_name} + + + + + + {employee} wanted to forward this discussion to you.]]> + {employee} wanted to forward this discussion to you.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/order_changed.php:21 +File: modules/ps_emailgenerator/templates/core/forward_msg.php:24 - - "Guest Tracking" section on our shop.]]> - "Guest Tracking" section on our shop.]]> + + {employee} added "{comment}"]]> + {employee} added "{comment}"]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/order_changed.php:49 +File: modules/ps_emailgenerator/templates/core/forward_msg.php:26 - - Order edited - Order edited + + + + + + {shop_name} has been transformed into a customer account.]]> + {shop_name} has been transformed into a customer account.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/order_changed.php:21 +File: modules/ps_emailgenerator/templates/core/guest_to_customer.php:24 - - {order_name} has been modified.]]> - {order_name} has been modified.]]> + + + + + + {order_name} is currently in transit.]]> + {order_name} is currently in transit.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/order_changed.php:24 +File: modules/ps_emailgenerator/templates/core/in_transit.php:49 - + - - {product} is almost out of stock. - {product} is almost out of stock. + + Warning: you have received a new log alert in your Back Office.]]> + Warning: you have received a new log alert in your Back Office.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productcoverage.php:21 +File: modules/ps_emailgenerator/templates/core/log_alert.php:24 - - The stock cover is now less than the specified minimum of: - The stock cover is now less than the specified minimum of: + + "Tools" > "Logs" section of your Back Office.]]> + "Tools" > "Logs" section of your Back Office.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productcoverage.php:24 +File: modules/ps_emailgenerator/templates/core/log_alert.php:25 - - Current stock cover: - Current stock cover: + + + + + + {order_name} from {shop_name} has been canceled.]]> + {order_name} from {shop_name} has been canceled.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productcoverage.php:25 +File: modules/ps_emailgenerator/templates/core/order_canceled.php:24 - + - - {product} is nearly out of stock. - {product} is nearly out of stock. + + {order_name} from {shop_name} has been changed by the merchant.]]> + {order_name} from {shop_name} has been changed by the merchant.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productoutofstock.php:21 +File: modules/ps_emailgenerator/templates/core/order_changed.php:24 - - The remaining stock is now less than the specified minimum of - The remaining stock is now less than the specified minimum of + + + + + + {shop_name} regarding order with the reference {order_name}.]]> + {shop_name} regarding order with the reference {order_name}.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productoutofstock.php:24 +File: modules/ps_emailgenerator/templates/core/order_merchant_comment.php:24 - - Remaining stock: - Remaining stock: + + + + + + {shop_name} login details.]]> + {shop_name} login details.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productoutofstock.php:25 +File: modules/ps_emailgenerator/templates/core/password_query.php:24 - - - + + + + + + {order_name} has been shipped.]]> + {order_name} has been shipped.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productoutofstock.php:26 +File: modules/ps_emailgenerator/templates/core/shipped.php:25 - + - - Customer: - Customer: + + test e-mail from your shop.

If you can read this, the test was successful!]]> + test e-mail from your shop.

If you can read this, the test was successful!]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/return_slip.php:28 +File: modules/ps_emailgenerator/templates/core/test.php:14 - - You have received a new return request for {shop_name}. - You have received a new return request for {shop_name}. + + + + + + {order_name}.]]> + {order_name}.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/return_slip.php:15 +File: modules/ps_emailgenerator/templates/core/voucher.php:24 - - Return details - Return details + + Voucher code: {voucher_num} in the amount of {voucher_amount}]]> + Voucher code: {voucher_num} in the amount of {voucher_amount}]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/return_slip.php:24 +File: modules/ps_emailgenerator/templates/core/voucher.php:25 - - {order_name} Placed on {date} - {order_name} Placed on {date} + + + + + + {days} days, so do not waste a moment!]]> + {days} days, so do not waste a moment!]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/return_slip.php:27 +File: modules/ps_emailgenerator/templates/modules/followup/followup_1.php:26 - + - - Thank you for subscribing to our newsletter. - Thank you for subscribing to our newsletter. + + {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!]]> + {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailsubscription/newsletter_conf.php:22 +File: modules/ps_emailgenerator/templates/modules/followup/followup_2.php:22 - + - - Thank you for subscribing to our newsletter, please confirm your request by clicking the link below : - Thank you for subscribing to our newsletter, please confirm your request by clicking the link below : + + {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!]]> + {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailsubscription/newsletter_verif.php:21 +File: modules/ps_emailgenerator/templates/modules/followup/followup_3.php:25 - + - - Hi, - Hi, + + {days} days, so do not waste a moment!]]> + {days} days, so do not waste a moment!]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailsubscription/newsletter_voucher.php:6 +File: modules/ps_emailgenerator/templates/modules/followup/followup_4.php:26 - - Newsletter subscription - Newsletter subscription + + + + + + {order_name} has been modified.]]> + {order_name} has been modified.]]> Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailsubscription/newsletter_voucher.php:21 +File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/order_changed.php:24 - - Regarding your newsletter subscription, we are pleased to offer you the following voucher: - Regarding your newsletter subscription, we are pleased to offer you the following voucher: + + + + + + + Context: -File: modules/ps_emailgenerator/templates/modules/ps_emailsubscription/newsletter_voucher.php:24 +File: modules/ps_emailgenerator/templates/modules/ps_emailalerts/productoutofstock.php:26 - - Best regards, - Best regards, - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-congratulations.php:37 - {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!]]> {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!]]> @@ -1190,12 +2198,6 @@ File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogra - - join us! - join us! - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-invitation.php:6 - {firstname} {lastname} wants to refer you on {shop_name}!]]> {firstname} {lastname} wants to refer you on {shop_name}!]]> @@ -1228,38 +2230,4 @@ File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogra - - - - Simply copy/paste this code during the payment process for your next order. - Simply copy/paste this code during the payment process for your next order. - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-voucher.php:24 - - - Here is the code of your voucher: - Here is the code of your voucher: - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-voucher.php:23 - - - Referral Program - Referral Program - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-voucher.php:19 - - - We have created a voucher in your name for referring a friend. - We have created a voucher in your name for referring a friend. - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-voucher.php:22 - - - , with an amount of - , with an amount of - Context: -File: modules/ps_emailgenerator/templates/modules/referralprogram/referralprogram-voucher.php:23 - - - diff --git a/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf b/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf index 4c688ffe010bd..e752c9dfb3854 100644 --- a/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf +++ b/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf @@ -20,187 +20,192 @@ Subscribed Subscribed - Line: 220 + Line: 221 Subscribed on Subscribed on - Line: 226 + Line: 231 Newsletter registrations Newsletter registrations - Line: 238 + Line: 243 Unsubscribe Unsubscribe - Line: 290 + Line: 295 Would you like to send a verification email after subscription? Would you like to send a verification email after subscription? - Line: 842 + Line: 850 Would you like to send a confirmation email after subscription? Would you like to send a confirmation email after subscription? - Line: 859 + Line: 867 Welcome voucher code Welcome voucher code - Line: 876 + Line: 884 Leave blank to disable by default. Leave blank to disable by default. - Line: 893 + Line: 901 Newsletter conditions Newsletter conditions - Line: 883 + Line: 891 This text will be displayed beneath the newsletter subscribe button. This text will be displayed beneath the newsletter subscribe button. - Line: 889 + Line: 897 Export customers' addresses Export customers' addresses - Line: 935 + Line: 943 Customers' country Customers' country - Line: 941 + Line: 949 Filter customers by country. Filter customers by country. - Line: 942 + Line: 950 Newsletter subscribers Newsletter subscribers - Line: 954 + Line: 962 Filter customers who have subscribed to the newsletter or not, and who have an account or not. Filter customers who have subscribed to the newsletter or not, and who have an account or not. - Line: 955 + Line: 963 Customers can subscribe to your newsletter when registering, or by entering their email in the newsletter form. Customers can subscribe to your newsletter when registering, or by entering their email in the newsletter form. - Line: 956 + Line: 964 All subscribers All subscribers - Line: 962 + Line: 970 Subscribers with account Subscribers with account - Line: 963 + Line: 971 Subscribers without account Subscribers without account - Line: 964 + Line: 972 Non-subscribers Non-subscribers - Line: 965 + Line: 973 Partner offers subscribers Partner offers subscribers - Line: 982 + Line: 990 Filter customers who have agreed to receive your partners' offers or not. Filter customers who have agreed to receive your partners' offers or not. - Line: 974 + Line: 982 Partner offers subscribers have agreed to receive your partners' offers. Partner offers subscribers have agreed to receive your partners' offers. - Line: 975 + Line: 983 All customers All customers - Line: 981 + Line: 989 Partner offers non-subscribers Partner offers non-subscribers - Line: 983 + Line: 991 Search for addresses Search for addresses - Line: 1027 + Line: 1035 Email address to search Email address to search - Line: 1033 + Line: 1041 Example: contact@prestashop.com or @prestashop.com Example: contact@prestashop.com or @prestashop.com - Line: 1036 + Line: 1044 No customers found with these filters! No customers found with these filters! - Line: 1095 + Line: 1103 The .CSV file has been successfully exported: %d customers found. The .CSV file has been successfully exported: %d customers found. - Line: 1104 + Line: 1112 Download the file Download the file - Line: 1106 + Line: 1114 WARNING: When opening this .csv file with Excel, choose UTF-8 encoding to avoid strange characters. WARNING: When opening this .csv file with Excel, choose UTF-8 encoding to avoid strange characters. - Line: 1111 + Line: 1119 Error: Write access limited Error: Write access limited - Line: 1210 + Line: 1220 No result found! No result found! - Line: 1118 + Line: 1126 -- Select associated page -- -- Select associated page -- - Line: 1131 + Line: 1139 Newsletter subscription: no email to delete, this customer has not registered. Newsletter subscription: no email to delete, this customer has not registered. - Line: 1267 + Line: 1277 Newsletter subscription: no email to export, this customer has not registered. Newsletter subscription: no email to export, this customer has not registered. - Line: 1277 + Line: 1287 + + + Iso language + Iso language + Line: 227 diff --git a/app/Resources/translations/default/ModulesFacetedsearchAdmin.xlf b/app/Resources/translations/default/ModulesFacetedsearchAdmin.xlf index e71e0e0f8baf8..a48ad58a1f316 100644 --- a/app/Resources/translations/default/ModulesFacetedsearchAdmin.xlf +++ b/app/Resources/translations/default/ModulesFacetedsearchAdmin.xlf @@ -5,57 +5,57 @@ Faceted search Faceted search - Line: 57 + Line: 101 Displays a block allowing multiple filters. Displays a block allowing multiple filters. - Line: 58 + Line: 102 "%s" is not a valid url "%s" is not a valid url - Line: 618 + Line: 1195 Filter template name required (cannot be empty) Filter template name required (cannot be empty) - Line: 1043 + Line: 579 You must select at least one category. You must select at least one category. - Line: 1045 + Line: 581 Your filter Your filter - Line: 1153 + Line: 670 was updated successfully. was updated successfully. - Line: 1154 + Line: 674 was added successfully. was added successfully. - Line: 1154 + Line: 675 Settings saved successfully Settings saved successfully - Line: 1169 + Line: 689 Filter template deleted, categories updated (reverted to default Filter template). Filter template deleted, categories updated (reverted to default Filter template). - Line: 1184 + Line: 704 Filter template not found Filter template not found - Line: 1186 + Line: 706 Root @@ -65,156 +65,145 @@ My template - %s My template - %s - Line: 1252 + Line: 754 My template %s My template %s - Line: 2675 + Line: 1072 - + + + + No limit + No limit + Line: 29 + + + + Categories used for this template: Categories used for this template: - Line: 14 + Line: 26 Categories selection is disabled because you have no categories or you are in a "all shops" context. Categories selection is disabled because you have no categories or you are in a "all shops" context. - Line: 20 + Line: 32 + + + + You must select at least one filter You must select at least one filter - Line: 409 + Line: 36 + + + + Template name: Template name: - Line: 7 + Line: 26 Only as a reminder Only as a reminder - Line: 10 + Line: 29 + + + + + + + Warning! Your hosting provider is using the Suhosin patch for PHP, which limits the maximum number of fields allowed in a form: + Warning! Your hosting provider is using the Suhosin patch for PHP, which limits the maximum number of fields allowed in a form: + Line: 37 + + + for suhosin.post.max_vars. + for suhosin.post.max_vars. + Line: 39 + + + for suhosin.request.max_vars. + for suhosin.request.max_vars. + Line: 40 + + Please ask your hosting provider to increase the Suhosin limit to + Please ask your hosting provider to increase the Suhosin limit to + Line: 41 + + + Warning! Your PHP configuration limits the maximum number of fields allowed in a form: + Warning! Your PHP configuration limits the maximum number of fields allowed in a form: + Line: 43 + + + for max_input_vars. + for max_input_vars. + Line: 44 + + + Please ask your hosting provider to increase this limit to + Please ask your hosting provider to increase this limit to + Line: 45 + + + %s at least, or you will have to edit the translation files manually. + %s at least, or you will have to edit the translation files manually. + Line: 47 + + + + + Choose shop association: Choose shop association: Line: 27 + + + + Sub-categories filter Sub-categories filter - Line: 61 + Line: 68 Product stock filter Product stock filter - Line: 98 + Line: 100 Product condition filter Product condition filter - Line: 135 + Line: 131 Product brand filter Product brand filter - Line: 172 + Line: 162 Product weight filter (slider) Product weight filter (slider) - Line: 209 + Line: 193 Product price filter (slider) Product price filter (slider) - Line: 243 - - - New filters template - New filters template - Line: 3 - - - You can drag and drop filters to adjust position - You can drag and drop filters to adjust position - Line: 34 - - - Filters: - Filters: - Line: 34 - - - Total filters: %s - Total filters: %s - Line: 40 - - - Filter result limit: - Filter result limit: - Line: 367 - - - No limit - No limit - Line: 370 - - - Filter style: - Filter style: - Line: 379 - - - Checkbox - Checkbox - Line: 382 - - - Radio button - Radio button - Line: 383 - - - Drop-down list - Drop-down list - Line: 384 - - - List of ranges - List of ranges - Line: 261 - - - Attribute group: %name% (%count% attributes) - Attribute group: %name% (%count% attributes) - Line: 281 - - - Attribute group: %name% (%count% attribute) - Attribute group: %name% (%count% attribute) - Line: 290 - - - This group will allow user to select a color - This group will allow user to select a color - Line: 300 - - - Feature: %name% (%count% values) - Feature: %name% (%count% values) - Line: 346 - - - Feature: %name% (%count% value) - Feature: %name% (%count% value) - Line: 355 + Line: 217 @@ -225,200 +214,240 @@ Clear cache Line: 37 - - - - - - Warning! Your hosting provider is using the Suhosin patch for PHP, which limits the maximum number of fields allowed in a form: - Warning! Your hosting provider is using the Suhosin patch for PHP, which limits the maximum number of fields allowed in a form: - Line: 11 - - - for suhosin.post.max_vars. - for suhosin.post.max_vars. - Line: 13 - - - for suhosin.request.max_vars. - for suhosin.request.max_vars. - Line: 14 - - - Please ask your hosting provider to increase the Suhosin limit to - Please ask your hosting provider to increase the Suhosin limit to - Line: 15 - - - Warning! Your PHP configuration limits the maximum number of fields allowed in a form: - Warning! Your PHP configuration limits the maximum number of fields allowed in a form: - Line: 17 - - - for max_input_vars. - for max_input_vars. - Line: 18 - - - Please ask your hosting provider to increase this limit to - Please ask your hosting provider to increase this limit to - Line: 19 - - - %s at least, or you will have to edit the translation files manually. - %s at least, or you will have to edit the translation files manually. - Line: 21 - Indexes and caches Indexes and caches - Line: 25 + Line: 28 Indexing is in progress. Please do not leave this page Indexing is in progress. Please do not leave this page - Line: 27 + Line: 30 Index all missing prices Index all missing prices - Line: 31 + Line: 34 Rebuild entire price index Rebuild entire price index - Line: 32 - - - Build attribute index - Build attribute index - Line: 33 + Line: 35 You can set a cron job that will rebuild price index using the following URL: You can set a cron job that will rebuild price index using the following URL: - Line: 38 + Line: 42 You can set a cron job that will rebuild attribute index using the following URL: You can set a cron job that will rebuild attribute index using the following URL: - Line: 43 + Line: 47 A nightly rebuild is recommended. A nightly rebuild is recommended. - Line: 49 + Line: 53 Filters templates Filters templates - Line: 53 + Line: 57 Created on Created on - Line: 62 + Line: 66 Actions Actions - Line: 63 + Line: 67 Do you really want to delete this filter template? Do you really want to delete this filter template? - Line: 86 + Line: 90 No filter template found. No filter template found. - Line: 102 + Line: 106 Add new template Add new template - Line: 106 + Line: 110 Show the number of matching products Show the number of matching products - Line: 114 + Line: 118 Show products from subcategories Show products from subcategories - Line: 130 + Line: 134 Category filter depth (0 for no limits, 1 by default) Category filter depth (0 for no limits, 1 by default) - Line: 146 + Line: 150 Use tax to filter price Use tax to filter price - Line: 152 + Line: 156 Use rounding to filter price Use rounding to filter price - Line: 168 + Line: 172 (in progress) (in progress) - Line: 196 + Line: 200 URL indexing finished URL indexing finished - Line: 197 + Line: 201 Attribute indexing finished Attribute indexing finished - Line: 198 + Line: 202 URL indexing failed URL indexing failed - Line: 199 + Line: 203 Attribute indexing failed Attribute indexing failed - Line: 200 + Line: 204 Price indexing finished Price indexing finished - Line: 201 + Line: 205 Price indexing failed Price indexing failed - Line: 202 + Line: 206 (in progress, %s products price to index) (in progress, %s products price to index) - Line: 203 + Line: 207 Loading... Loading... - Line: 204 + Line: 208 You selected -All categories-: all existing filter templates will be deleted. Is it OK? You selected -All categories-: all existing filter templates will be deleted. Is it OK? - Line: 205 + Line: 209 You must select at least one category You must select at least one category + Line: 210 + + + Build attributes and features indexes + Build attributes and features indexes + Line: 36 + + + + + + + New filters template + New filters template + Line: 29 + + + You can drag and drop filters to adjust position + You can drag and drop filters to adjust position + Line: 41 + + + Filters: + Filters: + Line: 41 + + + Total filters: %s + Total filters: %s + Line: 47 + + + Filter result limit: + Filter result limit: + Line: 195 + + + Filter style: + Filter style: + Line: 201 + + + Checkbox + Checkbox + Line: 204 + + + Radio button + Radio button + Line: 205 + + + Drop-down list + Drop-down list Line: 206 + + List of ranges + List of ranges + Line: 77 + + + Attribute group: %name% (%count% attributes) + Attribute group: %name% (%count% attributes) + Line: 115 + + + Attribute group: %name% (%count% attribute) + Attribute group: %name% (%count% attribute) + Line: 124 + + + This group will allow user to select a color + This group will allow user to select a color + Line: 134 + + + Feature: %name% (%count% values) + Feature: %name% (%count% values) + Line: 174 + + + Feature: %name% (%count% value) + Feature: %name% (%count% value) + Line: 183 + + + Build attribute index + Build attribute index + Line: 33 + diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 02dd401ab73f8..96d31312da82c 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -4013,7 +4013,7 @@ protected function uploadImage($id, $name, $dir, $ext = false, $width = null, $h // Evaluate the memory required to resize the image: if it's too much, you can't resize it. if (!ImageManager::checkImageMemoryLimit($tmp_name)) { - $this->errors[] = $this->trans('Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings. ', array(), 'Admin.Notifications.Error'); + $this->errors[] = $this->trans('Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings.', array(), 'Admin.Notifications.Error'); } // Copy new image diff --git a/mails/themes/classic/components/footer.html.twig b/mails/themes/classic/components/footer.html.twig index 17c0d9d6a0625..c16cc57d514e6 100644 --- a/mails/themes/classic/components/footer.html.twig +++ b/mails/themes/classic/components/footer.html.twig @@ -3,6 +3,6 @@ - {{ '{shop_name} powered by PrestaShop™'|trans({}, 'Emails.Body', locale)|raw }} + {{ '{shop_name} powered by PrestaShop™'|trans({'{prestashop_url}': 'https://www.prestashop.com/?utm_source=marchandprestashop&utm_medium=e-mail=utm_campaign=footer_1-7'}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/account.html.twig b/mails/themes/classic/core/account.html.twig index 386e2f87af49a..f71f74f958e27 100644 --- a/mails/themes/classic/core/account.html.twig +++ b/mails/themes/classic/core/account.html.twig @@ -22,12 +22,12 @@ {% if templateType == 'html' %}

- {{ 'Your {shop_name} login details'|trans({}, 'Emails.Body', locale) }} + {{ 'Your login email address on {shop_name}'|trans({}, 'Emails.Body', locale)|raw }}

{% endif %} - {{ 'Here are your login details:'|trans({}, 'Emails.Body', locale)|raw }}
+ {{ 'Here is your login email address:'|trans({}, 'Emails.Body', locale)|raw }}
{{ 'E-mail address:'|trans({}, 'Emails.Body', locale)|raw }} {email} diff --git a/mails/themes/classic/core/bankwire.html.twig b/mails/themes/classic/core/bankwire.html.twig index 7f1b5876e099f..3b9ed56d701a3 100644 --- a/mails/themes/classic/core/bankwire.html.twig +++ b/mails/themes/classic/core/bankwire.html.twig @@ -27,7 +27,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] has been placed successfully and will be [1]shipped as soon as we receive your payment[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/cheque.html.twig b/mails/themes/classic/core/cheque.html.twig index 7677b3c9eb77f..0b68a66a40293 100644 --- a/mails/themes/classic/core/cheque.html.twig +++ b/mails/themes/classic/core/cheque.html.twig @@ -27,7 +27,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] has been placed successfully and will be [1]shipped as soon as we receive your payment[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/credit_slip.html.twig b/mails/themes/classic/core/credit_slip.html.twig index e40777f8688a3..1d90e91371566 100644 --- a/mails/themes/classic/core/credit_slip.html.twig +++ b/mails/themes/classic/core/credit_slip.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'We have generated a credit slip in your name for order with the reference {order_name}.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We have generated a credit slip in your name for order with the reference [1]{order_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/download_product.html.twig b/mails/themes/classic/core/download_product.html.twig index ac1a1060a0db8..65537b703118c 100644 --- a/mails/themes/classic/core/download_product.html.twig +++ b/mails/themes/classic/core/download_product.html.twig @@ -27,7 +27,7 @@ {% endif %} - {{ 'You have {nbProducts} product(s) now available for download using the following link(s):'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'You have [1]{nbProducts}[1] product(s) now available for download using the following link(s):'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{virtualProducts} diff --git a/mails/themes/classic/core/employee_password.html.twig b/mails/themes/classic/core/employee_password.html.twig index a645b7059f24b..67b23299bf1e6 100644 --- a/mails/themes/classic/core/employee_password.html.twig +++ b/mails/themes/classic/core/employee_password.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'Here is your personal login information for {shop_name}:'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'Here is your personal login information for [1]{shop_name}[/1]:'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'First name:'|trans({}, 'Emails.Body', locale)|raw }} {firstname}
{{ 'Last name:'|trans({}, 'Emails.Body', locale)|raw }} {lastname}
{{ 'E-mail address:'|trans({}, 'Emails.Body', locale)|raw }} {email} diff --git a/mails/themes/classic/core/forward_msg.html.twig b/mails/themes/classic/core/forward_msg.html.twig index e7d5fd1027216..421d7a5020c5d 100644 --- a/mails/themes/classic/core/forward_msg.html.twig +++ b/mails/themes/classic/core/forward_msg.html.twig @@ -26,9 +26,9 @@ {% endif %} - {{ '{employee} wanted to forward this discussion to you.'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ '[1]{employee}[/1] wanted to forward this discussion to you.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'Discussion history:'|trans({}, 'Emails.Body', locale)|raw }} {messages}

- {{ '{employee} added "{comment}"'|trans({}, 'Emails.Body', locale)|raw }} + {{ '[1]{employee}[/1] added [1]"{comment}"[/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/guest_to_customer.html.twig b/mails/themes/classic/core/guest_to_customer.html.twig index 274aad8d87e95..75e0096d7fcdf 100644 --- a/mails/themes/classic/core/guest_to_customer.html.twig +++ b/mails/themes/classic/core/guest_to_customer.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'Your guest account for {shop_name} has been transformed into a customer account.'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'Your guest account for [1]{shop_name}[/1] has been transformed into a customer account.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'E-mail address:'|trans({}, 'Emails.Body', locale)|raw }} {email} diff --git a/mails/themes/classic/core/in_transit.html.twig b/mails/themes/classic/core/in_transit.html.twig index 873a3910d8b0f..5f173499580c0 100644 --- a/mails/themes/classic/core/in_transit.html.twig +++ b/mails/themes/classic/core/in_transit.html.twig @@ -51,7 +51,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} is currently in transit.'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'Your order with the reference [1]{order_name}[/1] is currently in transit.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'You can track your package using the following link:'|trans({}, 'Emails.Body', locale)|raw }} {{ '{followup}'|trans({}, 'Emails.Body', locale) }} diff --git a/mails/themes/classic/core/log_alert.html.twig b/mails/themes/classic/core/log_alert.html.twig index ab2fe70d1db91..d8805d9c9ae2d 100644 --- a/mails/themes/classic/core/log_alert.html.twig +++ b/mails/themes/classic/core/log_alert.html.twig @@ -26,8 +26,8 @@ {% endif %} - {{ 'Warning: you have received a new log alert in your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}

- {{ 'You can check for it in the "Tools" > "Logs" section of your Back Office.'|trans({}, 'Emails.Body', locale)|raw }} + {{ '[1]Warning:[/1] you have received a new log alert in your Back Office.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

+ {{ 'You can check for it in the [1]Advanced Parameters > Logs[/1] section of your back office.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/order_canceled.html.twig b/mails/themes/classic/core/order_canceled.html.twig index aa7d251b88edd..91639a8b316be 100644 --- a/mails/themes/classic/core/order_canceled.html.twig +++ b/mails/themes/classic/core/order_canceled.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} from {shop_name} has been canceled.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been canceled.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/order_changed.html.twig b/mails/themes/classic/core/order_changed.html.twig index 1f7acd495b587..e8d052ef06f7c 100644 --- a/mails/themes/classic/core/order_changed.html.twig +++ b/mails/themes/classic/core/order_changed.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} from {shop_name} has been changed by the merchant.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been changed by the merchant.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/order_merchant_comment.html.twig b/mails/themes/classic/core/order_merchant_comment.html.twig index b04edaf0fa85c..6231a32ffe8e8 100644 --- a/mails/themes/classic/core/order_merchant_comment.html.twig +++ b/mails/themes/classic/core/order_merchant_comment.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'You have received a new message from {shop_name} regarding order with the reference {order_name}.'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'You have received a new message from [1]{shop_name}[/1] regarding order with the reference [1]{order_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'Message:'|trans({}, 'Emails.Body', locale)|raw }} {message} diff --git a/mails/themes/classic/core/password_query.html.twig b/mails/themes/classic/core/password_query.html.twig index 9168b6bae6fe9..67e5053aad2d7 100644 --- a/mails/themes/classic/core/password_query.html.twig +++ b/mails/themes/classic/core/password_query.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'You have requested to reset your {shop_name} login details.'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'You have requested to reset your [1]{shop_name}[/1] login details.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'Please note that this will change your current password.'|trans({}, 'Emails.Body', locale)|raw }}

{{ 'To confirm this action, please use the following link:'|trans({}, 'Emails.Body', locale)|raw }}
{url} diff --git a/mails/themes/classic/core/productoutofstock.html.twig b/mails/themes/classic/core/productoutofstock.html.twig index 14faa55873fe0..037d00f1ba025 100644 --- a/mails/themes/classic/core/productoutofstock.html.twig +++ b/mails/themes/classic/core/productoutofstock.html.twig @@ -28,7 +28,7 @@ {{ 'The remaining stock is now less than the specified minimum of'|trans({}, 'Emails.Body', locale)|raw }} {last_qty}.

{{ 'Remaining stock:'|trans({}, 'Emails.Body', locale)|raw }} {qty}

- {{ 'You are advised to open the product\'s admin Product Page in order to replenish your inventory.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Replenish your inventory, go to the [1]Catalog > Stocks[/1] section of your back office to manage your stock.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/core/shipped.html.twig b/mails/themes/classic/core/shipped.html.twig index 07e0e50e91922..929c8fae126ba 100644 --- a/mails/themes/classic/core/shipped.html.twig +++ b/mails/themes/classic/core/shipped.html.twig @@ -27,7 +27,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} has been shipped.'|trans({}, 'Emails.Body', locale)|raw }}
+ {{ 'Your order with the reference [1]{order_name}[/1] has been shipped.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
{{ 'Thank you for shopping with {shop_name}!'|trans({}, 'Emails.Body', locale) }} diff --git a/mails/themes/classic/core/test.html.twig b/mails/themes/classic/core/test.html.twig index c07e9f9a8bdb2..fb0c4ba926b83 100644 --- a/mails/themes/classic/core/test.html.twig +++ b/mails/themes/classic/core/test.html.twig @@ -12,7 +12,9 @@ - {{ 'This is a test e-mail from your shop.

If you can read this, the test was successful!'|trans({}, 'Emails.Body', locale)|raw }}. + {{ 'This is a [1]test e-mail[/1] from your shop.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}. +

+ {{ 'If you can read this, the test was successful!'|trans({}, 'Emails.Body', locale)|raw }}. diff --git a/mails/themes/classic/core/voucher.html.twig b/mails/themes/classic/core/voucher.html.twig index 5b17b8847ce34..8a458a627c731 100644 --- a/mails/themes/classic/core/voucher.html.twig +++ b/mails/themes/classic/core/voucher.html.twig @@ -26,8 +26,8 @@ {% endif %} - {{ 'A voucher has been created in your name as a result of your order with the reference {order_name}.'|trans({}, 'Emails.Body', locale)|raw }}

- {{ 'Voucher code: {voucher_num} in the amount of {voucher_amount}'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'A voucher has been created in your name as a result of your order with the reference [1]{order_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

+ {{ '[1]Voucher code: {voucher_num}[/1] in the amount of [1]{voucher_amount}[/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'Simply copy/paste this code during the payment process for your next order.'|trans({}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/followup/followup_1.html.twig b/mails/themes/classic/modules/followup/followup_1.html.twig index 36b75d69e993b..b925be984f4cf 100644 --- a/mails/themes/classic/modules/followup/followup_1.html.twig +++ b/mails/themes/classic/modules/followup/followup_1.html.twig @@ -28,7 +28,7 @@ {{ 'We noticed that during your last visit on {shop_name}, you did not complete the order you had started.'|trans({}, 'Emails.Body', locale) }}

{{ 'Your cart has been saved, you can resume your order by visiting our shop:'|trans({}, 'Emails.Body', locale)|raw }} {shop_url}

- {{ 'As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'As an incentive, we can give you a discount of [1]{amount}%[/1] off your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/followup/followup_2.html.twig b/mails/themes/classic/modules/followup/followup_2.html.twig index 8d44169597273..aff0137d03124 100644 --- a/mails/themes/classic/modules/followup/followup_2.html.twig +++ b/mails/themes/classic/modules/followup/followup_2.html.twig @@ -20,7 +20,7 @@ - {{ 'As our way of saying thanks, we want to give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'As our way of saying thanks, we want to give you a discount of [1]{amount}%[/1] off your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'Here is your coupon:'|trans({}, 'Emails.Body', locale)|raw }} {voucher_num}

{{ 'Enter this code in your shopping cart to get your discount.'|trans({}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/followup/followup_3.html.twig b/mails/themes/classic/modules/followup/followup_3.html.twig index 7ce574ad8325d..764771a371c83 100644 --- a/mails/themes/classic/modules/followup/followup_3.html.twig +++ b/mails/themes/classic/modules/followup/followup_3.html.twig @@ -27,7 +27,7 @@ {% endif %} - {{ 'As appreciation for your loyalty, we want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!'|trans({}, 'Emails.Body', locale)|raw }}

+ {{ 'As appreciation for your loyalty, we want to give you a discount of [1]{amount}%[/1] valid on your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'Here is your coupon:'|trans({}, 'Emails.Body', locale)|raw }} {voucher_num}

{{ 'Enter this code in your shopping cart to get your discount.'|trans({}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/followup/followup_4.html.twig b/mails/themes/classic/modules/followup/followup_4.html.twig index ecfc395f40fd9..210d7e97cd8c7 100644 --- a/mails/themes/classic/modules/followup/followup_4.html.twig +++ b/mails/themes/classic/modules/followup/followup_4.html.twig @@ -28,7 +28,7 @@ {{ 'You are one of our best customers, however you have not placed an order in {days_threshold} days.'|trans({}, 'Emails.Body', locale) }}

{{ 'Your cart has been saved, you can resume your order by visiting our shop:'|trans({}, 'Emails.Body', locale)|raw }} {shop_url}

- {{ 'We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We wish to thank you for the trust you have placed in us and want to give you a discount of [1]{amount}%[/1] valid on your next order! This offer is valid for [1]{days}[/1] days, so do not waste a moment!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/ps_emailalerts/order_changed.html.twig b/mails/themes/classic/modules/ps_emailalerts/order_changed.html.twig index 8226f37331794..6b23dd8107423 100644 --- a/mails/themes/classic/modules/ps_emailalerts/order_changed.html.twig +++ b/mails/themes/classic/modules/ps_emailalerts/order_changed.html.twig @@ -26,7 +26,7 @@ {% endif %} - {{ 'Your order with the reference {order_name} has been modified.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] has been modified.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/ps_emailalerts/productoutofstock.html.twig b/mails/themes/classic/modules/ps_emailalerts/productoutofstock.html.twig index 14faa55873fe0..037d00f1ba025 100644 --- a/mails/themes/classic/modules/ps_emailalerts/productoutofstock.html.twig +++ b/mails/themes/classic/modules/ps_emailalerts/productoutofstock.html.twig @@ -28,7 +28,7 @@ {{ 'The remaining stock is now less than the specified minimum of'|trans({}, 'Emails.Body', locale)|raw }} {last_qty}.

{{ 'Remaining stock:'|trans({}, 'Emails.Body', locale)|raw }} {qty}

- {{ 'You are advised to open the product\'s admin Product Page in order to replenish your inventory.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Replenish your inventory, go to the [1]Catalog > Stocks[/1] section of your back office to manage your stock.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/referralprogram/referralprogram-congratulations.html.twig b/mails/themes/classic/modules/referralprogram/referralprogram-congratulations.html.twig index e7186021dd505..6359e4036184a 100644 --- a/mails/themes/classic/modules/referralprogram/referralprogram-congratulations.html.twig +++ b/mails/themes/classic/modules/referralprogram/referralprogram-congratulations.html.twig @@ -19,8 +19,8 @@ - {{ 'Your referred friend {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!'|trans({}, 'Emails.Body', locale)|raw }}

- {{ 'We are pleased to offer you a voucher worth {discount_display} (voucher # {discount_name}) that you can use on your next order.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your referred friend [1]{sponsored_firstname} {sponsored_lastname}[/1] has placed his or her first order on {shop_name}!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

+ {{ 'We are pleased to offer you a voucher worth [1]{discount_display} (voucher # {discount_name})[/1] that you can use on your next order.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/classic/modules/referralprogram/referralprogram-invitation.html.twig b/mails/themes/classic/modules/referralprogram/referralprogram-invitation.html.twig index 353d9bfe4af4c..450fd5daf1b7b 100644 --- a/mails/themes/classic/modules/referralprogram/referralprogram-invitation.html.twig +++ b/mails/themes/classic/modules/referralprogram/referralprogram-invitation.html.twig @@ -19,9 +19,9 @@ - {{ 'Your friend {firstname} {lastname} wants to refer you on {shop_name}!'|trans({}, 'Emails.Body', locale)|raw }}

- {{ 'We are pleased to offer you a voucher worth {discount} that you can use on your next order.'|trans({}, 'Emails.Body', locale)|raw }} - {{ 'Get referred and earn a discount voucher of {discount}!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your friend [1]{firstname} {lastname}[/1] wants to refer you on {shop_name}!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

+ {{ 'We are pleased to offer you a voucher worth [1]{discount}[/1] that you can use on your next order.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} + {{ 'Get referred and earn a discount voucher of [1]{discount}![/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} {{ 'It\'s very easy to sign up. Just click here!'|trans({}, 'Emails.Body', locale)|raw }} diff --git a/mails/themes/modern/components/footer.html.twig b/mails/themes/modern/components/footer.html.twig index 0d43d3a974105..022cf082090fb 100644 --- a/mails/themes/modern/components/footer.html.twig +++ b/mails/themes/modern/components/footer.html.twig @@ -39,7 +39,7 @@ -
Powered by PrestaShop +
Powered by PrestaShop
diff --git a/mails/themes/modern/core/bankwire.html.twig b/mails/themes/modern/core/bankwire.html.twig index b1492f2012380..ce4dcf218e1e3 100644 --- a/mails/themes/modern/core/bankwire.html.twig +++ b/mails/themes/modern/core/bankwire.html.twig @@ -253,7 +253,7 @@
- {{ 'Your order with the reference {order_name} has been placed successfully. You can expect delivery as soon as your payment is received.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] has been placed successfully. You can expect [1]delivery as soon as your payment is received[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/cheque.html.twig b/mails/themes/modern/core/cheque.html.twig index faf4e2ca1dbfd..3cfa5b1724266 100644 --- a/mails/themes/modern/core/cheque.html.twig +++ b/mails/themes/modern/core/cheque.html.twig @@ -253,7 +253,7 @@
- {{ 'Your order with the reference {order_name} has been placed successfully. You can expect delivery as soon as your payment is received.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] has been placed successfully. You can expect [1]delivery as soon as your payment is received[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/credit_slip.html.twig b/mails/themes/modern/core/credit_slip.html.twig index e14d5e6ba7927..b642f1e82b2cc 100644 --- a/mails/themes/modern/core/credit_slip.html.twig +++ b/mails/themes/modern/core/credit_slip.html.twig @@ -244,7 +244,7 @@
- {{ 'A credit slip has been generated in your name for order with the reference {order_name}.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'A credit slip has been generated in your name for order with the reference [1]{order_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/download_product.html.twig b/mails/themes/modern/core/download_product.html.twig index 47b0a7419b091..52e29ffca329f 100644 --- a/mails/themes/modern/core/download_product.html.twig +++ b/mails/themes/modern/core/download_product.html.twig @@ -50,7 +50,7 @@
- {{ 'Thank you for your order with the reference {order_name} from {shop_name}'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Thank you for your order with the reference {order_name} from [1]{shop_name}[/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
@@ -253,7 +253,7 @@
- {{ 'You have {nbProducts} product(s) now available for download using the following link(s):'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'You have [1]{nbProducts}[/1] product(s) now available for download using the following link(s):'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/employee_password.html.twig b/mails/themes/modern/core/employee_password.html.twig index ac1fa81fb5478..3df4c3905c043 100644 --- a/mails/themes/modern/core/employee_password.html.twig +++ b/mails/themes/modern/core/employee_password.html.twig @@ -244,7 +244,7 @@
- {{ 'Here is your identification information on {shop_name}'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Here is your identification information on [1]{shop_name}[/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/forward_msg.html.twig b/mails/themes/modern/core/forward_msg.html.twig index eb455000b4097..2091bd7036c64 100644 --- a/mails/themes/modern/core/forward_msg.html.twig +++ b/mails/themes/modern/core/forward_msg.html.twig @@ -244,7 +244,7 @@
- {{ '{employee} wanted to forward this discussion to you.'|trans({}, 'Emails.Body', locale)|raw }} + {{ '[1]{employee}[/1] wanted to forward this discussion to you.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
@@ -258,7 +258,7 @@
- {{ '{employee} added {comment}'|trans({}, 'Emails.Body', locale)|raw }} + {{ '[1]{employee}[/1] added [1]{comment}[/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/guest_to_customer.html.twig b/mails/themes/modern/core/guest_to_customer.html.twig index ee4b0c59b6531..f27740f5150bc 100644 --- a/mails/themes/modern/core/guest_to_customer.html.twig +++ b/mails/themes/modern/core/guest_to_customer.html.twig @@ -244,7 +244,7 @@
- {{ 'Congratulations, your guest account for {shop_name} has been turned into a customer account!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Congratulations, your guest account for [1]{shop_name}[/1] has been turned into a customer account!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/in_transit.html.twig b/mails/themes/modern/core/in_transit.html.twig index b247392d06fd3..fe0a67cd7cca0 100644 --- a/mails/themes/modern/core/in_transit.html.twig +++ b/mails/themes/modern/core/in_transit.html.twig @@ -249,7 +249,7 @@
- {{ 'Your order with the reference {order_name} is on its way.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] is on its way.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/log_alert.html.twig b/mails/themes/modern/core/log_alert.html.twig index 7831e2817136f..086475edacc00 100644 --- a/mails/themes/modern/core/log_alert.html.twig +++ b/mails/themes/modern/core/log_alert.html.twig @@ -244,14 +244,14 @@
- {{ 'WARNING: you have received a new log alert in your back office.'|trans({}, 'Emails.Body', locale)|raw }} + {{ '[1]WARNING:[/1] you have received a new log alert in your back office.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
- {{ 'You can check for it in the "Advanced Parameters" > "Logs" section of your back office.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'You can check for it in the [1]Advanced Parameters > Logs[/1] section of your back office.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/order_canceled.html.twig b/mails/themes/modern/core/order_canceled.html.twig index e624d3ddf9511..11a1df57d9fa2 100644 --- a/mails/themes/modern/core/order_canceled.html.twig +++ b/mails/themes/modern/core/order_canceled.html.twig @@ -243,7 +243,14 @@
- {{ 'Your order with the reference {order_name} from {shop_name} has been canceled by the merchant.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been canceled by the merchant.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} +
+ + + + +
+ {{ 'Go to your customer account to learn more about it.'|trans({}, 'Emails.Body', locale) }}
@@ -281,65 +288,6 @@ class="" width="604px" > - - - diff --git a/mails/themes/modern/core/order_conf.html.twig b/mails/themes/modern/core/order_conf.html.twig index 54d855a0041f7..1c470d94a6883 100644 --- a/mails/themes/modern/core/order_conf.html.twig +++ b/mails/themes/modern/core/order_conf.html.twig @@ -50,7 +50,7 @@ diff --git a/mails/themes/modern/core/order_customer_comment.html.twig b/mails/themes/modern/core/order_customer_comment.html.twig index ed9c2c2422ff8..afc11cb4aae7b 100644 --- a/mails/themes/modern/core/order_customer_comment.html.twig +++ b/mails/themes/modern/core/order_customer_comment.html.twig @@ -250,7 +250,7 @@
- -
- - - - - - -
- -
- - - - -
-
- {{ 'Go to your customer account to learn more about it.'|trans({}, 'Emails.Body', locale)|raw }} -
-
-
- -
-
- - - - - + diff --git a/mails/themes/modern/core/order_changed.html.twig b/mails/themes/modern/core/order_changed.html.twig index e1db03bda898b..1ba3b54ac144f 100644 --- a/mails/themes/modern/core/order_changed.html.twig +++ b/mails/themes/modern/core/order_changed.html.twig @@ -243,7 +243,7 @@
- {{ 'Your order with the reference {order_name} from {shop_name} has been changed by the merchant.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been changed by the merchant.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
- {{ 'Thank you for shopping on {shop_name}!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Thank you for shopping on [1]{shop_name}[/1]!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
- {{ 'Customer:'|trans({}, 'Emails.Body', locale)|raw }} {firstname} {lastname} ({email})
+ {{ 'Customer:'|trans({}, 'Emails.Body', locale)|raw }} {firstrname} {lastname} ({email})
diff --git a/mails/themes/modern/core/order_merchant_comment.html.twig b/mails/themes/modern/core/order_merchant_comment.html.twig index c7df5cfd008af..2d69fb2fc2ae4 100644 --- a/mails/themes/modern/core/order_merchant_comment.html.twig +++ b/mails/themes/modern/core/order_merchant_comment.html.twig @@ -244,7 +244,7 @@
- {{ 'You have received a new message from {shop_name} regarding order with the reference {order_name}.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'You have received a new message from [1]{shop_name}[/1] regarding order with the reference [1]{order_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/password_query.html.twig b/mails/themes/modern/core/password_query.html.twig index 03bb2353c7ddc..1ef5efd58c0cc 100644 --- a/mails/themes/modern/core/password_query.html.twig +++ b/mails/themes/modern/core/password_query.html.twig @@ -244,7 +244,7 @@
- {{ 'You have requested to reset your {shop_name} login details.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'You have requested to reset your [1]{shop_name}[/1] login details.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/payment.html.twig b/mails/themes/modern/core/payment.html.twig index 950f10e4da3dc..af9b2b8a9d437 100644 --- a/mails/themes/modern/core/payment.html.twig +++ b/mails/themes/modern/core/payment.html.twig @@ -243,7 +243,7 @@
- {{ 'Your payment for order with the reference {order_name} was successfully processed.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your payment for order with the reference [1]{order_name}[/1] was successfully processed.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/payment_error.html.twig b/mails/themes/modern/core/payment_error.html.twig index a52a1cf6ef5d9..fa9991a90717c 100644 --- a/mails/themes/modern/core/payment_error.html.twig +++ b/mails/themes/modern/core/payment_error.html.twig @@ -243,7 +243,7 @@
- {{ 'We have encountered an error while processing your payment for your order with the reference {order_name} from {shop_name}. Please contact us as soon as possible.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We have encountered an error while processing your payment for your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1]. Please contact us as soon as possible.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}

{{ 'You can expect delivery as soon as your payment is received.'|trans({}, 'Emails.Body', locale)|raw }}

diff --git a/mails/themes/modern/core/preparation.html.twig b/mails/themes/modern/core/preparation.html.twig index 823242d3fbb42..6cb47d796f743 100644 --- a/mails/themes/modern/core/preparation.html.twig +++ b/mails/themes/modern/core/preparation.html.twig @@ -243,7 +243,7 @@
- {{ 'We are currently processing your order with the reference {order_name} from {shop_name}.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We are currently processing your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/productoutofstock.html.twig b/mails/themes/modern/core/productoutofstock.html.twig index 8f484ba454f56..7a7e1a3bf2cab 100644 --- a/mails/themes/modern/core/productoutofstock.html.twig +++ b/mails/themes/modern/core/productoutofstock.html.twig @@ -176,7 +176,7 @@
- {{ 'There are now less than {last_qty} items in stock.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'There are now less than [1]{last_qty}[/1] items in stock.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
@@ -189,7 +189,7 @@
- {{ 'Replenish your inventory, go to the "Catalog" > "Stocks" section of your back office to manage your stock.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Replenish your inventory, go to the [1]Catalog > Stocks[/1] section of your back office to manage your stock.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/refund.html.twig b/mails/themes/modern/core/refund.html.twig index 1fcb1560154e9..9476e570a32b4 100644 --- a/mails/themes/modern/core/refund.html.twig +++ b/mails/themes/modern/core/refund.html.twig @@ -185,7 +185,7 @@
- {{ 'We have processed your refund for your order with the reference {order_name} from {shop_name}.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We have processed your refund for your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/shipped.html.twig b/mails/themes/modern/core/shipped.html.twig index d82f720bf8eac..9958803ed0d40 100644 --- a/mails/themes/modern/core/shipped.html.twig +++ b/mails/themes/modern/core/shipped.html.twig @@ -244,7 +244,7 @@
- {{ 'Your order with the reference {order_name} has been shipped.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] has been shipped.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/test.html.twig b/mails/themes/modern/core/test.html.twig index ad39dbe12d459..9c91b502d65a7 100644 --- a/mails/themes/modern/core/test.html.twig +++ b/mails/themes/modern/core/test.html.twig @@ -177,7 +177,7 @@
- {{ 'Here is a test email from your shop.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Here is a test [1]email[/1] from your shop.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/core/voucher.html.twig b/mails/themes/modern/core/voucher.html.twig index 20861ac0f6784..148219ae1ddd3 100644 --- a/mails/themes/modern/core/voucher.html.twig +++ b/mails/themes/modern/core/voucher.html.twig @@ -243,14 +243,14 @@
- {{ 'We are pleased to inform you that a voucher has been generated in your name for order with the reference {order_name}.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We are pleased to inform you that a voucher has been generated in your name for order with the reference [1]{order_name}[/1].'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
- {{ 'VOUCHER CODE: {voucher_num} in the amount of {voucher_amount}'|trans({}, 'Emails.Body', locale)|raw }} + {{ '[1]VOUCHER CODE: {voucher_num}[/1] in the amount of [1]{voucher_amount}[/1]'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/followup/followup_1.html.twig b/mails/themes/modern/modules/followup/followup_1.html.twig index 3c72f68fa97d7..8d6f4d63fa939 100644 --- a/mails/themes/modern/modules/followup/followup_1.html.twig +++ b/mails/themes/modern/modules/followup/followup_1.html.twig @@ -258,7 +258,7 @@
- {{ 'We are pleased to offer you a discount of {amount}% off your next order. And this offer is valid for {days} days, so do not wait any longer!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We are pleased to offer you a discount of [1]{amount}%[/1] off your next order. And this offer is valid for [1]{days}[/1] days, so do not wait any longer!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/followup/followup_2.html.twig b/mails/themes/modern/modules/followup/followup_2.html.twig index a1817737b28dd..149bb337a818b 100644 --- a/mails/themes/modern/modules/followup/followup_2.html.twig +++ b/mails/themes/modern/modules/followup/followup_2.html.twig @@ -186,7 +186,7 @@
- {{ 'We are pleased to offer you a discount of {amount}% off your next order. And this offer is valid for {days} days, so do not wait any longer!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We are pleased to offer you a discount of [1]{amount}%[/1] off your next order. And this offer is valid for [1]{days}[/1] days, so do not wait any longer!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/followup/followup_3.html.twig b/mails/themes/modern/modules/followup/followup_3.html.twig index 047c503783041..829a474495f04 100644 --- a/mails/themes/modern/modules/followup/followup_3.html.twig +++ b/mails/themes/modern/modules/followup/followup_3.html.twig @@ -186,7 +186,7 @@
- {{ 'We are pleased to offer you a discount of {amount}% off your next order. And this offer is valid for {days} days, so do not wait any longer!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We are pleased to offer you a discount of [1]{amount}%[/1] off your next order. And this offer is valid for [1]{days}[/1] days, so do not wait any longer!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/followup/followup_4.html.twig b/mails/themes/modern/modules/followup/followup_4.html.twig index 940322c51e7bb..b17872806efcb 100644 --- a/mails/themes/modern/modules/followup/followup_4.html.twig +++ b/mails/themes/modern/modules/followup/followup_4.html.twig @@ -258,7 +258,7 @@
- {{ 'We are pleased to offer you a discount of {amount}% off your next order. And this offer is valid for {days} days, so do not wait any longer!'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'We are pleased to offer you a discount of [1]{amount}%[/1] off your next order. And this offer is valid for [1]{days}[/1] days, so do not wait any longer!'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/ps_emailalerts/new_order.html.twig b/mails/themes/modern/modules/ps_emailalerts/new_order.html.twig index 2dc382f3cde7d..e5caa542a0228 100644 --- a/mails/themes/modern/modules/ps_emailalerts/new_order.html.twig +++ b/mails/themes/modern/modules/ps_emailalerts/new_order.html.twig @@ -50,7 +50,7 @@
- {{ 'A new order was placed on {shop_name} by the following customer:'|trans({}, 'Emails.Body', locale)|raw }} {firstname} {lastname} ({email})
+ {{ 'A new order was placed on [1]{shop_name}[/1] by the following customer:'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }} {firstname} {lastname} ({email})
diff --git a/mails/themes/modern/modules/ps_emailalerts/order_changed.html.twig b/mails/themes/modern/modules/ps_emailalerts/order_changed.html.twig index 7f64897491cc4..be251fbdb1193 100644 --- a/mails/themes/modern/modules/ps_emailalerts/order_changed.html.twig +++ b/mails/themes/modern/modules/ps_emailalerts/order_changed.html.twig @@ -244,7 +244,7 @@
- {{ 'Your order with the reference {order_name} from {shop_name} has been changed by the merchant.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Your order with the reference [1]{order_name}[/1] from [1]{shop_name}[/1] has been changed by the merchant.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/ps_emailalerts/productoutofstock.html.twig b/mails/themes/modern/modules/ps_emailalerts/productoutofstock.html.twig index b4f6cb703962c..625a9fbd43764 100644 --- a/mails/themes/modern/modules/ps_emailalerts/productoutofstock.html.twig +++ b/mails/themes/modern/modules/ps_emailalerts/productoutofstock.html.twig @@ -242,7 +242,7 @@
- {{ 'There are now less than {last_qty} items in stock.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'There are now less than [1]{last_qty}[/1] items in stock.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
@@ -255,7 +255,7 @@
- {{ 'Replenish your inventory, go to the "Catalog" > "Stocks" section of your back office to manage your stock.'|trans({}, 'Emails.Body', locale)|raw }} + {{ 'Replenish your inventory, go to the [1]Catalog > Stocks[/1] section of your back office to manage your stock.'|trans({'[1]': '', '[/1]': ''}, 'Emails.Body', locale)|raw }}
diff --git a/mails/themes/modern/modules/referralprogram/referralprogram-congratulations.html.twig b/mails/themes/modern/modules/referralprogram/referralprogram-congratulations.html.twig index 2492af3bda89b..a612b8bb0f444 100644 --- a/mails/themes/modern/modules/referralprogram/referralprogram-congratulations.html.twig +++ b/mails/themes/modern/modules/referralprogram/referralprogram-congratulations.html.twig @@ -1,6 +1,6 @@ {% extends '@MailThemes/modern/components/layout.html.twig' %} -{% block title %}{{ 'Refferalprogram Congratulations'|trans({}, 'Emails.Body', locale) }}{% endblock %} +{% block title %}{{ 'Refferal program Congratulations'|trans({}, 'Emails.Body', locale) }}{% endblock %} {% block content %}