dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #886 from djfm/bootstrap

Browse Source 
//emails
This commit is contained in:
Gregory Roussac
2013-10-24 07:09:10 -07:00
parent 667647f891 572f7c725d
commit 3f11dde2f6
17 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mails/en/src/bankwire.php
+1 -1
View File
@@ -12,7 +12,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Awaiting wire payment'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Awaiting wire payment'); ?>
</p>
<span>
<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
mails/en/src/cheque.php
+1 -1
View File
@@ -12,7 +12,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Awaiting check payment'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Awaiting check payment'); ?>
</p>
<span>
<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
mails/en/src/download_product.php
+1 -1
View File
@@ -3,7 +3,7 @@
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
<span class="subtitle"><?php echo t('Thank you for your order from <strong>{shop_name}'); ?></span>
<span class="subtitle"><?php echo t('Thank you for your order from <strong>{shop_name}</strong>'); ?></span>
</td>
</tr>
<tr>
mails/en/src/forward_msg.php
+2 -2
View File
@@ -14,9 +14,9 @@
<?php echo t('Customer service - Forwarded discussion'); ?>
</p>
<span>
<span><strong>{employee}</strong></span> <?php echo t('wanted to forward this discussion to you.'); ?> <br /><br />
<?php echo t('<span><strong>{employee}</strong></span> wanted to forward this discussion to you.'); ?> <br /><br />
<span><strong><?php echo t('Discussion history:'); ?></strong></span> {messages}<br /><br />
<span><strong>{employee}</strong></span> <?php echo t('added'); ?> <span><strong>"{comment}"</strong></span>
<?php echo t('<span><strong>{employee}</strong></span> added <span><strong>"{comment}"</strong></span>'); ?>
</span>
</td>
</tr>
mails/en/src/in_transit.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - In transit'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('In transit'); ?>
</p>
<span>
<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> is currently in transit.'); ?> <br /><br />
mails/en/src/order_canceled.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Order cancelled'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Order cancelled'); ?>
</p>
<span>
<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> from <span><strong>{shop_name}</strong></span> has been cancelled.'); ?><br />
mails/en/src/order_changed.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Order changed'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Order changed'); ?>
</p>
<span>
<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> from <span><strong>{shop_name}</strong></span> has been changed by the merchant.'); ?><br />
mails/en/src/order_conf.php
+1 -1
View File
@@ -15,7 +15,7 @@
<?php echo t('Order details'); ?>
</p>
<span>
<span><strong><?php echo t('Order:'); ?></strong></span> {order_name} <?php echo t('placed on'); ?> {date}<br /><br />
<span><strong><?php echo t('Order:'); ?></strong></span> {order_name} <?php echo t('Placed on'); ?> {date}<br /><br />
<span><strong><?php echo t('Payment:'); ?></strong></span> {payment}
</span>
</td>
mails/en/src/outofstock.php
+1 -1
View File
@@ -12,7 +12,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Item(s) out of stock'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Item(s) out of stock'); ?>
</p>
<span>
<?php echo t('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.'); ?>
mails/en/src/password_query.php
+1 -1
View File
@@ -16,7 +16,7 @@
<span>
<?php echo t('You have requested to reset your <span><strong>{shop_name}</strong></span> login details.'); ?><br/><br/>
<?php echo t('Please note that this will change your current password.'); ?><br/><br/>
<?php echo t('To confirm this action, please use the following link:<br /> <a href="{url}">{url}</a>'); ?>
<?php echo t('To confirm this action, please use the following link:'); ?> <br /> <a href="{url}">{url}</a>
</span>
</td>
</tr>
mails/en/src/payment.php
+1 -1
View File
@@ -12,7 +12,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Payment processed'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Payment processed'); ?>
</p>
<span>
<?php echo t('Your payment for order with the reference <strong><span>{order_name}</span></strong> was successfully processed.'); ?>
mails/en/src/payment_error.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Payment processing error'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Payment processing error'); ?>
</p>
<span>
<?php echo t('There is a problem with your payment for <strong><span>{shop_name}</span></strong> order with the reference <strong><span>{order_name}</span></strong>. Please contact us at your earliest convenience.'); ?><br/>
mails/en/src/preparation.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order {order_name} - Processing'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Processing'); ?>
</p>
<span>
<?php echo t('We are currently processing your <strong><span>{shop_name}</span></strong> order with the reference <strong><span>{order_name}</span></strong>.'); ?>
mails/en/src/refund.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Refund processed for order with the reference {order_name}'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Refund processed'); ?>
</p>
<span>
<?php echo t('We have processed your <strong><span>{shop_name}</strong></span> refund for order with the reference <strong><span>{order_name}</strong></span>.'); ?>
mails/en/src/shipped.php
+1 -1
View File
@@ -12,7 +12,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Shipped'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Shipped'); ?>
</p>
<span>
<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been shipped.'); ?><br />
mails/en/src/voucher.php
+1 -1
View File
@@ -11,7 +11,7 @@
<tr>
<td class="box">
<p>
<?php echo t('Your order with the reference {order_name} - Voucher created'); ?>
<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Voucher created'); ?>
</p>
<span>
<?php echo t('A voucher has been created in your name as a result of your order with the reference <span><strong>{order_name}</strong></span>.'); ?><br/><br/>
mails/en/src/voucher_new.php
+1 -1
View File
@@ -14,7 +14,7 @@
<?php echo t('This is to inform you about the creation of a voucher.'); ?>
</p>
<span>
<?php echo t('Here is the code of your voucher: <span><strong>{voucher_num}</strong></span>'); ?><br/><br/>
<?php echo t('Here is the code of your voucher:'); ?> <span><strong>{voucher_num}</strong></span><br/><br/>
<?php echo t('Simply copy/paste this code during the payment process for your next order.'); ?>
</td>
</tr>