Merge pull request #137 from Quetzacoalt91/wording-replaced-files

Fix wording with replaced files
PrestaShop · Aug 17, 2018 · 37b87ca · 37b87ca
2 parents d9da091 + cb263e3
commit 37b87ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/classes/UpgradePage.php b/classes/UpgradePage.php
@@ -360,7 +360,8 @@ private function getJsParams($ajaxResult)
                 'confirmPreserveFileOptions' => $translator->trans('Please confirm that you want to preserve file options.', array(), $translationDomain),
                 'lessOptions' => $translator->trans('Less options', array(), $translationDomain),
                 'moreOptions' => $translator->trans('More options (Expert mode)', array(), $translationDomain),
-                'filesWillBeDeleted' => $translator->trans('Theses files will be deleted', array(), $translationDomain),
+                'filesWillBeDeleted' => $translator->trans('These files will be deleted', array(), $translationDomain),
+                'filesWillBeReplaced' => $translator->trans('These files will be replaced', array(), $translationDomain),
             ),
         );
 

diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
   },
   "config": {
     "preferred-install": "dist",
+    "prepend-autoloader": false,
     "platform": {
         "php": "5.6"
     }

diff --git a/js/upgrade.js b/js/upgrade.js
@@ -52,7 +52,8 @@ if (typeof input === 'undefined') {
       confirmPreserveFileOptions: "Please confirm that you want to preserve file options.",
       lessOptions: "Less options",
       moreOptions: "More options (Expert mode)",
-      filesWillBeDeleted: "Theses files will be deleted"
+      filesWillBeDeleted: "These files will be deleted",
+      filesWillBeReplaced: "These files will be replaced",
     }
   };
 }
@@ -717,7 +718,7 @@ $(document).ready(function() {
           addModifiedFileList(input.translation.filesWillBeDeleted, answer.result.deleted, "diffImportant", "#diffList");
         }
         if (answer.result.modified.length) {
-          addModifiedFileList(input.translation.filesWillBeDeleted, answer.result.modified, "diffImportant", "#diffList");
+          addModifiedFileList(input.translation.filesWillBeReplaced, answer.result.modified, "diffImportant", "#diffList");
         }
 
         $("#toggleDiffList").bind("click", function(e) {