Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scan translation keys from email themes #14719

Merged
merged 11 commits into from Aug 8, 2019
Merged

Scan translation keys from email themes #14719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9720e38
Change config to scan mails themes folders, update catalog with missi…
jolelievre Jul 17, 2019
6523854
Improve regex, add missing key
jolelievre Jul 18, 2019
874c8f1
Fix a few wordings in mail
jolelievre Jul 19, 2019
c48ea07
Add tracking for prestashop link
jolelievre Jul 19, 2019
dc2160f
Remove ps_themecusto trads
jolelievre Jul 19, 2019
ec4b43f
Remove extra space
jolelievre Jul 19, 2019
c814f3f
Use bold placeholders in translation keys
jolelievre Jul 30, 2019
7eddb02
Use html character instead of carret
jolelievre Jul 30, 2019
5da0043
Replace bold and warning placeholders with 1 in modern and classic theme
jolelievre Aug 5, 2019
3d26fb6
Use real caret to match catalog translation keys
jolelievre Aug 7, 2019
6d33db1
Update XLF catalogues
jolelievre Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .t9n.yml
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ paths:
- install-dev
- themes
- pdf
- mails/themes
exclude_files:
- src/PrestaShopBundle/Tests
- classes/PrestaShopAutoload.php
Expand All @@ -17,5 +18,6 @@ exclude_files:
- node_modules
- vendor
- tools
- mails
- mails/[a-zA-Z]{2}/
- js
- modules/ps_themecusto
83 changes: 44 additions & 39 deletions app/Resources/translations/default/AdminNotificationsError.xlf
View file
Open in desktop
Expand Up @@ -37,32 +37,32 @@
<trans-unit id="47be00818e1acd46db0092d6586204cf">
<source>This class name does not exist.</source>
<target>This class name does not exist.</target>
<note>Line: 132</note>
<note>Line: 134</note>
</trans-unit>
<trans-unit id="388ed04607290133b78adf251a3e17ed">
<source>This property does not exist in the class or is forbidden.</source>
<target>This property does not exist in the class or is forbidden.</target>
<note>Line: 149</note>
<note>Line: 151</note>
</trans-unit>
<trans-unit id="48524477f4f52618e4ab9f1f6fb1d1a8">
<source>This association has too many elements.</source>
<target>This association has too many elements.</target>
<note>Line: 178</note>
<note>Line: 180</note>
</trans-unit>
<trans-unit id="46e6c4977ebd38ff176e68481ab04275">
<source>This name is not allowed.</source>
<target>This name is not allowed.</target>
<note>Line: 194</note>
<note>Line: 196</note>
</trans-unit>
<trans-unit id="6b6a27e705469286cb83d20ec8e1b885">
<source>Syntax error with this pattern.</source>
<target>Syntax error with this pattern.</target>
<note>Line: 188</note>
<note>Line: 190</note>
</trans-unit>
<trans-unit id="a3084b5f93d22e573824af3ca8f58b73">
<source>This key has already been used.</source>
<target>This key has already been used.</target>
<note>Line: 230</note>
<note>Line: 232</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -280,63 +280,63 @@
<trans-unit id="df2751083713a6a971814c07d88c3eb5">
<source>The 'From' date format is invalid (YYYY-MM-DD)</source>
<target>The 'From' date format is invalid (YYYY-MM-DD)</target>
<note>Line: 906</note>
<note>Line: 892</note>
</trans-unit>
<trans-unit id="f500b8d6f94abcca48cda7c033c64996">
<source>The 'To' date format is invalid (YYYY-MM-DD)</source>
<target>The 'To' date format is invalid (YYYY-MM-DD)</target>
<note>Line: 914</note>
<note>Line: 900</note>
</trans-unit>
<trans-unit id="83379252d4737a0b2a63a9388bb36890">
<source>An error occurred while attempting to delete the image. (cannot load object).</source>
<target>An error occurred while attempting to delete the image. (cannot load object).</target>
<note>Line: 1021</note>
<note>Line: 1007</note>
</trans-unit>
<trans-unit id="2a0c56d5a5183a9b65b8e2817f75ded2">
<source>You cannot delete this item.</source>
<target>You cannot delete this item.</target>
<note>Line: 1108
<note>Line: 1094
Comment: check if some ids are in list_skip_actions and forbid deletion</note>
</trans-unit>
<trans-unit id="efb49241363bce74c7d7899333cdebb5">
<source>An error occurred when attempting to update the required fields.</source>
<target>An error occurred when attempting to update the required fields.</target>
<note>Line: 1314</note>
<note>Line: 1300</note>
</trans-unit>
<trans-unit id="204c3558e41366f3d558ce8e01426a22">
<source>field %s is required.</source>
<target>field %s is required.</target>
<note>Line: 1469</note>
<note>Line: 1455</note>
</trans-unit>
<trans-unit id="c2c0e06097c62422199e29a5574e9fc4">
<source>Cannot add configuration %s</source>
<target>Cannot add configuration %s</target>
<note>Line: 1532</note>
<note>Line: 1518</note>
</trans-unit>
<trans-unit id="2782e6f430c2658c79aecfcecdc0d0e8">
<source>The field %field_name% is required at least in %lang%.</source>
<target>The field %field_name% is required at least in %lang%.</target>
<note>Line: 3713</note>
<note>Line: 3699</note>
</trans-unit>
<trans-unit id="114eadc70de249729e9287a6b450c6e0">
<source>The %field_name% field (%lang%) is invalid.</source>
<target>The %field_name% field (%lang%) is invalid.</target>
<note>Line: 3748</note>
<note>Line: 3734</note>
</trans-unit>
<trans-unit id="b4186b9ed7c957a1cd9f4e7ce916e603">
<source>%s: Incorrect value</source>
<target>%s: Incorrect value</target>
<note>Line: 3954</note>
<note>Line: 3940</note>
</trans-unit>
<trans-unit id="c87956ad745e55231c633c03fe0f0d5b">
<source>An error occurred while assigning a zone to the selection.</source>
<target>An error occurred while assigning a zone to the selection.</target>
<note>Line: 4198</note>
<note>Line: 4184</note>
</trans-unit>
<trans-unit id="93463ceee9a3d376b18ee618bc2fffe4">
<source>You must select at least one element to assign a new zone.</source>
<target>You must select at least one element to assign a new zone.</target>
<note>Line: 4200</note>
<note>Line: 4186</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -904,7 +904,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="417d63b1effb110e438d4b4b9f0fbd95">
<source>The voucher code is invalid.</source>
<target>The voucher code is invalid.</target>
<note>Line: 158</note>
<note>Line: 159</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -1023,17 +1023,17 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="a62d7ffa591311c930a2017b07e55394">
<source>The object cannot be loaded (the identifier is missing or invalid)</source>
<target>The object cannot be loaded (the identifier is missing or invalid)</target>
<note>Line: 475</note>
<note>Line: 476</note>
</trans-unit>
<trans-unit id="df3c280f0aaf0cb0d5c25ab322a8bcf9">
<source>You do not have permission to update this.</source>
<target>You do not have permission to update this.</target>
<note>Line: 328</note>
<note>Line: 329</note>
</trans-unit>
<trans-unit id="044bfaec90b16e5caf72b70a5ae4c872">
<source>You need permission to add this.</source>
<target>You need permission to add this.</target>
<note>Line: 558</note>
<note>Line: 559</note>
</trans-unit>
</body>
</file>
Expand All @@ -1051,12 +1051,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="9cfcd850d8aecc7dda5274b9ef72dda0">
<source>Profile(s) assigned to employee cannot be deleted</source>
<target>Profile(s) assigned to employee cannot be deleted</target>
<note>Line: 280</note>
<note>Line: 281</note>
</trans-unit>
<trans-unit id="7e209672dd8e7e83030559ab95a83d52">
<source>You cannot delete your own profile</source>
<target>You cannot delete your own profile</target>
<note>Line: 284</note>
<note>Line: 285</note>
</trans-unit>
</body>
</file>
Expand All @@ -1083,7 +1083,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="02af8c16ef4efa9fa9e2142372b0b90d">
<source>The %s field is required.</source>
<target>The %s field is required.</target>
<note>Line: 401</note>
<note>Line: 403</note>
</trans-unit>
<trans-unit id="e31f2dac034e1437efa1dbf499509963">
<source>Cannot write into file: %filename%. Please check write permissions.</source>
Expand All @@ -1097,12 +1097,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="11a257a80f8c8d76132470b171de6795">
<source>You do not have permission to delete this.</source>
<target>You do not have permission to delete this.</target>
<note>Line: 344</note>
<note>Line: 345</note>
</trans-unit>
<trans-unit id="e8ae00af8575f645bf6e4358f120cba3">
<source>An unexpected error occurred. [%type% code %code%]</source>
<target>An unexpected error occurred. [%type% code %code%]</target>
<note>Line: 369</note>
<note>Line: 370</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -1144,17 +1144,17 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="505bbc38260c669d0793757e414caecc">
<source>The %s field is not valid</source>
<target>The %s field is not valid</target>
<note>Line: 377</note>
<note>Line: 378</note>
</trans-unit>
<trans-unit id="777e4c7c4a3cc47eb332a7a4022c983e">
<source>Unexpected error occurred.</source>
<target>Unexpected error occurred.</target>
<note>Line: 309</note>
<note>Line: 310</note>
</trans-unit>
<trans-unit id="b3f69fdbd12765a4667492d013ea3d81">
<source>You need permission to edit this.</source>
<target>You need permission to edit this.</target>
<note>Line: 294</note>
<note>Line: 295</note>
</trans-unit>
</body>
</file>
Expand All @@ -1168,12 +1168,17 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="b05c3c0bfce943b86e286e8e8103b6e5">
<source>An error occurred while uploading the image.</source>
<target>An error occurred while uploading the image.</target>
<note>Line: 336</note>
<note>Line: 337</note>
</trans-unit>
<trans-unit id="fa4611fb85bb8f118f562d107ab790d4">
<source>The object cannot be loaded (or found)</source>
<target>The object cannot be loaded (or found)</target>
<note>Line: 309</note>
<note>Line: 310</note>
</trans-unit>
<trans-unit id="66042fc205784775b028ba4ac7acebf3">
<source>Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server's configuration settings.</source>
<target>Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server's configuration settings.</target>
<note>Line: 333</note>
</trans-unit>
</body>
</file>
Expand All @@ -1182,12 +1187,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="1d5dfad5ac415b412c20a05a89d43db6">
<source>An error occurred while deleting this selection.</source>
<target>An error occurred while deleting this selection.</target>
<note>Line: 403</note>
<note>Line: 404</note>
</trans-unit>
<trans-unit id="7f290594963a303db17a5e21dc4cf0b7">
<source>An error occurred while deleting the object.</source>
<target>An error occurred while deleting the object.</target>
<note>Line: 407</note>
<note>Line: 408</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -1232,12 +1237,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="10f97f4fea6d1ff9ffd1ed3260d6220d">
<source>Unable to delete associated images.</source>
<target>Unable to delete associated images.</target>
<note>Line: 739</note>
<note>Line: 743</note>
</trans-unit>
<trans-unit id="2b4de48b49648d3323f20b6371f7e3c1">
<source>You cannot upload more files</source>
<target>You cannot upload more files</target>
<note>Line: 760</note>
<note>Line: 764</note>
</trans-unit>
</body>
</file>
Expand All @@ -1260,7 +1265,7 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="2deae2efe4b65df80c188a31fed3cc17">
<source>The field %s is required.</source>
<target>The field %s is required.</target>
<note>Line: 796</note>
<note>Line: 807</note>
</trans-unit>
</body>
</file>
Expand Down Expand Up @@ -1380,12 +1385,12 @@ Comment: check if some ids are in list_skip_actions and forbid deletion</note>
<trans-unit id="c1c3fb9e8ca710c7a958c50d03829415">
<source>Cannot generate emails because the Symfony container is unavailable.</source>
<target>Cannot generate emails because the Symfony container is unavailable.</target>
<note>Line: 754</note>
<note>Line: 753</note>
</trans-unit>
<trans-unit id="eb98c1e496a76fc9a930ed4731977498">
<source>Cannot generate email templates: %s.</source>
<target>Cannot generate email templates: %s.</target>
<note>Line: 777</note>
<note>Line: 776</note>
</trans-unit>
</body>
</file>
Expand Down