Skip to content

Commit 874c8f1

Browse files
jolelievrejolelievre
committed
Fix a few wordings in mail
1 parent 6523854 commit 874c8f1

File tree

7 files changed

+15
-66
lines changed

7 files changed

+15
-66
lines changed

‎.t9n.yml

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ exclude_files:
2020
- tools
2121
- mails/[a-zA-Z]{2}/
2222
- js
23+
- modules/ps_themecusto

‎mails/themes/classic/core/account.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
{% if templateType == 'html' %}
2323

2424
<p style="border-bottom:1px solid #D6D4D4;">
25-
{{ 'Your {shop_name} login details'|trans({}, 'Emails.Body', locale) }}
25+
{{ 'Your login email address on {shop_name}'|trans({}, 'Emails.Body', locale)|raw }}
2626
</p>
2727

2828
{% endif %}
2929
<span>
30-
{{ 'Here are your login details:'|trans({}, 'Emails.Body', locale)|raw }}<br/>
30+
{{ 'Here is your login email address:'|trans({}, 'Emails.Body', locale)|raw }}<br/>
3131
<span><strong>{{ 'E-mail address:'|trans({}, 'Emails.Body', locale)|raw }} <a href="mailto:{email}">{email}</a></strong></span>
3232
</span>
3333
</font>

‎mails/themes/classic/core/log_alert.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{% endif %}
2828
<span>
2929
{{ '<span><strong>Warning:</strong></span> you have received a new log alert in your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}<br/><br/>
30-
{{ 'You can check for it in the <span><strong>"Tools" &gt; "Logs"</strong></span> section of your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}
30+
{{ 'You can check for it in the <span><strong>Advanced Parameters &gt; Logs</strong></span> section of your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}
3131
</span>
3232
</font>
3333
</td>

‎mails/themes/classic/core/productoutofstock.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<span>
2929
{{ 'The remaining stock is now less than the specified minimum of'|trans({}, 'Emails.Body', locale)|raw }} <strong><span>{last_qty}.</span></strong><br/><br/>
3030
<strong><span>{{ 'Remaining stock:'|trans({}, 'Emails.Body', locale)|raw }}</span></strong> {qty}<br/><br/>
31-
{{ 'You are advised to open the product\'s admin Product Page in order to replenish your inventory.'|trans({}, 'Emails.Body', locale)|raw }}
31+
{{ 'Replenish your inventory, go to the <span><strong>Catalog &gt; Stocks</span></strong> section of your back office to manage your stock.'|trans({}, 'Emails.Body', locale)|raw }}
3232
</span>
3333
</font>
3434
</td>

‎mails/themes/classic/modules/ps_emailalerts/productoutofstock.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<span>
2929
{{ 'The remaining stock is now less than the specified minimum of'|trans({}, 'Emails.Body', locale)|raw }} <strong><span>{last_qty}.</span></strong><br/><br/>
3030
<strong><span>{{ 'Remaining stock:'|trans({}, 'Emails.Body', locale)|raw }}</span></strong> {qty}<br/><br/>
31-
{{ 'You are advised to open the product\'s admin Product Page in order to replenish your inventory.'|trans({}, 'Emails.Body', locale)|raw }}
31+
{{ 'Replenish your inventory, go to the <span><strong>Catalog &gt; Stocks</span></strong> section of your back office to manage your stock.'|trans({}, 'Emails.Body', locale)|raw }}
3232
</span>
3333
</font>
3434
</td>

‎mails/themes/modern/core/order_canceled.html.twig

+8-60
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,13 @@
247247
</div>
248248
</td>
249249
</tr>
250+
<tr>
251+
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
252+
<div style="font-family:Open sans, arial, sans-serif;font-size:14px;line-height:25px;text-align:left;color:#363A41;">
253+
{{ 'Go to your customer account to learn more about it.'|trans({}, 'Emails.Body', locale)|raw }}
254+
</div>
255+
</td>
256+
</tr>
250257
</table>
251258
</td>
252259
</tr>
@@ -281,65 +288,6 @@
281288
class="" width="604px"
282289
>
283290
284-
<table
285-
align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:604px;" width="604"
286-
>
287-
<tr>
288-
<td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
289-
<![endif]-->
290-
<div style="Margin:0px auto;max-width:604px;">
291-
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
292-
<tbody>
293-
<tr>
294-
<td style="direction:ltr;font-size:0px;padding:0 25px 20px;text-align:center;vertical-align:top;">
295-
<!--[if mso | IE]>
296-
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
297-
298-
<tr>
299-
300-
<td
301-
class="" style="vertical-align:top;width:554px;"
302-
>
303-
<![endif]-->
304-
<div class="mj-column-per-100 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
305-
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
306-
<tr>
307-
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
308-
<div style="font-family:Open sans, arial, sans-serif;font-size:14px;line-height:25px;text-align:left;color:#363A41;">
309-
{{ 'Go to your customer account to learn more about it.'|trans({}, 'Emails.Body', locale)|raw }}
310-
</div>
311-
</td>
312-
</tr>
313-
</table>
314-
</div>
315-
<!--[if mso | IE]>
316-
</td>
317-
318-
</tr>
319-
320-
</table>
321-
<![endif]-->
322-
</td>
323-
</tr>
324-
</tbody>
325-
</table>
326-
</div>
327-
<!--[if mso | IE]>
328-
</td>
329-
</tr>
330-
</table>
331-
332-
</td>
333-
</tr>
334-
<![endif]-->
335-
<!-- FIRST TEXT ENDING -->
336-
<!-- SECOND TEXT BEGINING -->
337-
<!--[if mso | IE]>
338-
<tr>
339-
<td
340-
class="" width="604px"
341-
>
342-
343291
<table
344292
align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:604px;" width="604"
345293
>
@@ -391,7 +339,7 @@
391339
</td>
392340
</tr>
393341
<![endif]-->
394-
<!-- SECOND TEXT ENDING -->
342+
<!-- FIRST TEXT ENDING -->
395343
<!--[if mso | IE]>
396344
</table>
397345
<![endif]-->

‎src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ private function getErrorMessages(Exception $e)
330330
],
331331
LanguageImageUploadingException::class => [
332332
LanguageImageUploadingException::MEMORY_LIMIT_RESTRICTION => $this->trans(
333-
'Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings. ',
333+
'Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings.',
334334
'Admin.Notifications.Error'
335335
),
336336
LanguageImageUploadingException::UNEXPECTED_ERROR => $this->trans(

0 commit comments

Comments
 (0)