Address modifications

PrestaShop · Jun 11, 2019 · 2844873 · 2844873
1 parent 4d7accc
commit 2844873
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/classes/ValidateConstraintTranslator.php b/classes/ValidateConstraintTranslator.php
@@ -64,12 +64,12 @@ public function translate($validator)
                 'Shop.Forms.Errors'
             ) . PHP_EOL .
             $this->translator->trans(
-                'The following characters are not accepted: / \ ^ * `',
+                'Invalid characters: 0-9!<>,;?=+()@#"°{}_$%/\^*`',
                 [],
                 'Shop.Forms.Errors'
             ) . PHP_EOL .
             $this->translator->trans(
-                'The characters . and 。 are allowed only if they are directly followed by a space or the end of the string.',
+                'A space is required after . and 。',
                 [],
                 'Shop.Forms.Errors'
             );

diff --git a/classes/form/CustomerFormatter.php b/classes/form/CustomerFormatter.php
@@ -122,10 +122,6 @@ public function getFormat()
                     'Shop.Forms.Labels'
                 )
             )
-            ->addAvailableValue(
-                'comment',
-                $this->translator->trans("Not accepted: / \ ^ * `\nA space is necessary after a \".\"", [], 'Shop.Forms.Help')
-            )
             ->setRequired(true);
 
         $format['lastname'] = (new FormField())
@@ -137,10 +133,6 @@ public function getFormat()
                     'Shop.Forms.Labels'
                 )
             )
-            ->addAvailableValue(
-                'comment',
-                $this->translator->trans("Not accepted: / \ ^ * `\nA space is necessary after a \".\"", [], 'Shop.Forms.Help')
-            )
             ->setRequired(true);
 
         if (Configuration::get('PS_B2B_ENABLE')) {

diff --git a/themes/classic/templates/_partials/form-fields.tpl b/themes/classic/templates/_partials/form-fields.tpl
@@ -170,7 +170,7 @@
           >
           {if isset($field.availableValues.comment)}
             <span class="form-control-comment">
-              {$field.availableValues.comment|nl2br nofilter}
+              {$field.availableValues.comment}
             </span>
           {/if}
         {/block}