From 3e8330dcb358e343d30fc20d3283081f16eb2f0a Mon Sep 17 00:00:00 2001 From: djfm Date: Thu, 24 Oct 2013 13:58:14 +0000 Subject: [PATCH 1/2] // small fixes on php email templates --- mails/en/src/bankwire.php | 2 +- mails/en/src/cheque.php | 2 +- mails/en/src/download_product.php | 2 +- mails/en/src/forward_msg.php | 4 ++-- mails/en/src/in_transit.php | 2 +- mails/en/src/order_canceled.php | 2 +- mails/en/src/order_changed.php | 2 +- mails/en/src/order_conf.php | 2 +- mails/en/src/outofstock.php | 2 +- mails/en/src/password_query.php | 2 +- mails/en/src/payment.php | 2 +- mails/en/src/payment_error.php | 2 +- mails/en/src/preparation.php | 2 +- mails/en/src/refund.php | 2 +- mails/en/src/shipped.php | 2 +- mails/en/src/voucher.php | 2 +- mails/en/src/voucher_new.php | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mails/en/src/bankwire.php b/mails/en/src/bankwire.php index ddea4f0ec..1fea3a3a3 100644 --- a/mails/en/src/bankwire.php +++ b/mails/en/src/bankwire.php @@ -12,7 +12,7 @@

- +  - 

{order_name} has been placed successfully and will be shipped as soon as we receive your payment.'); ?> diff --git a/mails/en/src/cheque.php b/mails/en/src/cheque.php index 12f3662b5..44c9e176d 100644 --- a/mails/en/src/cheque.php +++ b/mails/en/src/cheque.php @@ -12,7 +12,7 @@

- +  - 

{order_name} has been placed successfully and will be shipped as soon as we receive your payment.'); ?> diff --git a/mails/en/src/download_product.php b/mails/en/src/download_product.php index b77b22877..b528308c2 100644 --- a/mails/en/src/download_product.php +++ b/mails/en/src/download_product.php @@ -3,7 +3,7 @@
- {shop_name}'); ?> + {shop_name}'); ?> diff --git a/mails/en/src/forward_msg.php b/mails/en/src/forward_msg.php index a1f3048f8..d08284c98 100644 --- a/mails/en/src/forward_msg.php +++ b/mails/en/src/forward_msg.php @@ -14,9 +14,9 @@

- {employee}

+ {employee} wanted to forward this discussion to you.'); ?>

{messages}

- {employee} "{comment}" + {employee} added "{comment}"'); ?> diff --git a/mails/en/src/in_transit.php b/mails/en/src/in_transit.php index 4b1005870..21621a37c 100644 --- a/mails/en/src/in_transit.php +++ b/mails/en/src/in_transit.php @@ -11,7 +11,7 @@

- +  - 

{order_name} is currently in transit.'); ?>

diff --git a/mails/en/src/order_canceled.php b/mails/en/src/order_canceled.php index 40802554d..cd1187ac8 100644 --- a/mails/en/src/order_canceled.php +++ b/mails/en/src/order_canceled.php @@ -11,7 +11,7 @@

- +  - 

{order_name} from {shop_name} has been cancelled.'); ?>
diff --git a/mails/en/src/order_changed.php b/mails/en/src/order_changed.php index 3256f3901..30a996d44 100644 --- a/mails/en/src/order_changed.php +++ b/mails/en/src/order_changed.php @@ -11,7 +11,7 @@

- +  - 

{order_name} from {shop_name} has been changed by the merchant.'); ?>
diff --git a/mails/en/src/order_conf.php b/mails/en/src/order_conf.php index c9cbee9ff..d4a706eb5 100644 --- a/mails/en/src/order_conf.php +++ b/mails/en/src/order_conf.php @@ -15,7 +15,7 @@

- {order_name} {date}

+ {order_name} {date}

{payment} diff --git a/mails/en/src/outofstock.php b/mails/en/src/outofstock.php index e4cb5935d..8518b7843 100644 --- a/mails/en/src/outofstock.php +++ b/mails/en/src/outofstock.php @@ -12,7 +12,7 @@

- +  - 

diff --git a/mails/en/src/password_query.php b/mails/en/src/password_query.php index 908e03a4c..c9f3a4402 100644 --- a/mails/en/src/password_query.php +++ b/mails/en/src/password_query.php @@ -16,7 +16,7 @@ {shop_name} login details.'); ?>



- {url}'); ?> +
{url} diff --git a/mails/en/src/payment.php b/mails/en/src/payment.php index 8926cf09b..742c488fb 100644 --- a/mails/en/src/payment.php +++ b/mails/en/src/payment.php @@ -12,7 +12,7 @@

- +  - 

{order_name} was successfully processed.'); ?> diff --git a/mails/en/src/payment_error.php b/mails/en/src/payment_error.php index b6c681606..ca1e975c3 100644 --- a/mails/en/src/payment_error.php +++ b/mails/en/src/payment_error.php @@ -11,7 +11,7 @@

- +  - 

{shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.'); ?>
diff --git a/mails/en/src/preparation.php b/mails/en/src/preparation.php index 66306c961..0280feef4 100644 --- a/mails/en/src/preparation.php +++ b/mails/en/src/preparation.php @@ -11,7 +11,7 @@

- +  - 

{shop_name} order with the reference {order_name}.'); ?> diff --git a/mails/en/src/refund.php b/mails/en/src/refund.php index fd680c25f..f3d4b6168 100644 --- a/mails/en/src/refund.php +++ b/mails/en/src/refund.php @@ -11,7 +11,7 @@

- +  - 

{shop_name} refund for order with the reference {order_name}.'); ?> diff --git a/mails/en/src/shipped.php b/mails/en/src/shipped.php index 7958f19f7..f69757895 100644 --- a/mails/en/src/shipped.php +++ b/mails/en/src/shipped.php @@ -12,7 +12,7 @@

- +  - 

{order_name} has been shipped.'); ?>
diff --git a/mails/en/src/voucher.php b/mails/en/src/voucher.php index 2888c4293..d184fb1af 100644 --- a/mails/en/src/voucher.php +++ b/mails/en/src/voucher.php @@ -11,7 +11,7 @@

- +  - 

{order_name}.'); ?>

diff --git a/mails/en/src/voucher_new.php b/mails/en/src/voucher_new.php index 605fa7e02..515d66598 100644 --- a/mails/en/src/voucher_new.php +++ b/mails/en/src/voucher_new.php @@ -14,7 +14,7 @@

- {voucher_num}'); ?>

+ {voucher_num}

From 572f7c725df4dabed0fb61d6fa0e9abfd989458d Mon Sep 17 00:00:00 2001 From: djfm Date: Thu, 24 Oct 2013 14:04:50 +0000 Subject: [PATCH 2/2] // small html fix --- mails/en/src/order_conf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mails/en/src/order_conf.php b/mails/en/src/order_conf.php index d4a706eb5..37e4dbdb8 100644 --- a/mails/en/src/order_conf.php +++ b/mails/en/src/order_conf.php @@ -15,7 +15,7 @@

- {order_name} {date}

+ {order_name} {date}

{payment}