Merge pull request #9200 from eternoendless/fix-wording

Fix duplicate wording
PrestaShop · Jun 20, 2018 · 5c043f8 · 5c043f8
2 parents bf55787 + adffda0
commit 5c043f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -263,7 +263,7 @@
 				</div>
 				<div class="form-group">
 					<label for="forceIDs" class="control-label col-lg-4">
-						<span data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='If you enable this option, your imported items\' ID number will be used as-is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.' d='Admin.Advparameters.Help'}">
+						<span data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='If you enable this option, your imported items\' ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.' d='Admin.Advparameters.Help'}">
 							{l s='Force all ID numbers' d='Admin.Advparameters.Feature'}
 						</span>
 					</label>

diff --git a/app/Resources/translations/default/AdminAdvparametersHelp.xlf b/app/Resources/translations/default/AdminAdvparametersHelp.xlf
@@ -410,8 +410,8 @@ File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
 File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:283</note>
       </trans-unit>
       <trans-unit id="423347880e13d3bf4a0e37ef28ace1b8">
-        <source>If you enable this option, your imported items' ID number will be used as-is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.</source>
-        <target>If you enable this option, your imported items' ID number will be used as-is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.</target>
+        <source>If you enable this option, your imported items' ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.</source>
+        <target>If you enable this option, your imported items' ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.</target>
         <note>Context:
 File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:266</note>
       </trans-unit>
@@ -425,12 +425,6 @@ File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
         <note>Context:
 File: src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/Blocks/import_panel.html.twig:42</note>
       </trans-unit>
-      <trans-unit id="404943b27a337c2bf69271e61d9dc66a">
-        <source>If you enable this option, your imported items ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.</source>
-        <target>If you enable this option, your imported items ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.</target>
-        <note>Context:
-File: src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/Blocks/import_panel.html.twig:154</note>
-      </trans-unit>
     </body>
   </file>
   <file original="admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl" source-language="en-US" target-language="en" datatype="plaintext">

diff --git a/...opBundle/Resources/views/Admin/Configure/AdvancedParameters/Blocks/import_panel.html.twig b/...opBundle/Resources/views/Admin/Configure/AdvancedParameters/Blocks/import_panel.html.twig
@@ -151,7 +151,7 @@
             </div>
 
             <div class="form-group js-force-ids-form-group">
-                {{ ps.label_with_help(('Force all ID numbers'|trans), ('If you enable this option, your imported items ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items.'|trans({}, 'Admin.Advparameters.Help'))) }}
+                {{ ps.label_with_help(('Force all ID numbers'|trans), ("If you enable this option, your imported items' ID number will be used as is. If you do not enable this option, the imported ID numbers will be ignored, and PrestaShop will instead create auto-incremented ID numbers for all the imported items."|trans({}, 'Admin.Advparameters.Help'))) }}
                 {{ form_errors(importForm.forceIDs) }}
                 {{ form_widget(importForm.forceIDs) }}
             </div>