diff --git a/src/app/pages/account-profile-user/account-profile-user/account-profile-user.component.html b/src/app/pages/account-profile-user/account-profile-user/account-profile-user.component.html
index fbad2a633e..81d4f73907 100644
--- a/src/app/pages/account-profile-user/account-profile-user/account-profile-user.component.html
+++ b/src/app/pages/account-profile-user/account-profile-user/account-profile-user.component.html
@@ -20,7 +20,7 @@
{{ 'account.update_profile.heading' | translate }}
label="account.update_profile.firstname.label"
[errorMessages]="{
required: 'account.firstname.error.required',
- noSpecialChars: 'error.forbiddensymbols'
+ noSpecialChars: 'account.name.error.forbidden.chars'
}"
>
@@ -30,7 +30,7 @@ {{ 'account.update_profile.heading' | translate }}
label="account.update_profile.lastname.label"
[errorMessages]="{
required: 'account.lastname.error.required',
- noSpecialChars: 'error.forbiddensymbols'
+ noSpecialChars: 'account.name.error.forbidden.chars'
}"
>
diff --git a/src/app/shared/address-forms/components/address-form-de/address-form-de.factory.ts b/src/app/shared/address-forms/components/address-form-de/address-form-de.factory.ts
index c908bdf3ca..b45bca32e7 100644
--- a/src/app/shared/address-forms/components/address-form-de/address-form-de.factory.ts
+++ b/src/app/shared/address-forms/components/address-form-de/address-form-de.factory.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { AddressFormFactory } from 'ish-shared/address-forms/components/address-form/address-form.factory';
+import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
@Injectable()
export class AddressFormDEFactory extends AddressFormFactory {
@@ -14,8 +15,8 @@ export class AddressFormDEFactory extends AddressFormFactory {
group() {
return this.fb.group({
title: [''],
- firstName: ['', Validators.required],
- lastName: ['', Validators.required],
+ firstName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
+ lastName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
addressLine1: ['', Validators.required],
addressLine2: [],
addressLine3: [],
diff --git a/src/app/shared/address-forms/components/address-form-default/address-form-default.factory.ts b/src/app/shared/address-forms/components/address-form-default/address-form-default.factory.ts
index 34b49e36a0..485bf47dae 100644
--- a/src/app/shared/address-forms/components/address-form-default/address-form-default.factory.ts
+++ b/src/app/shared/address-forms/components/address-form-default/address-form-default.factory.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { AddressFormFactory } from 'ish-shared/address-forms/components/address-form/address-form.factory';
+import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
@Injectable()
export class AddressFormDefaultFactory extends AddressFormFactory {
@@ -13,8 +14,8 @@ export class AddressFormDefaultFactory extends AddressFormFactory {
group() {
return this.fb.group({
- firstName: ['', Validators.required],
- lastName: ['', Validators.required],
+ firstName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
+ lastName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
title: [''],
addressLine1: ['', Validators.required],
addressLine2: [],
diff --git a/src/app/shared/address-forms/components/address-form-fr/address-form-fr.factory.ts b/src/app/shared/address-forms/components/address-form-fr/address-form-fr.factory.ts
index 0d1c73b226..4fc92c675a 100644
--- a/src/app/shared/address-forms/components/address-form-fr/address-form-fr.factory.ts
+++ b/src/app/shared/address-forms/components/address-form-fr/address-form-fr.factory.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { AddressFormFactory } from 'ish-shared/address-forms/components/address-form/address-form.factory';
+import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
@Injectable()
export class AddressFormFRFactory extends AddressFormFactory {
@@ -14,8 +15,8 @@ export class AddressFormFRFactory extends AddressFormFactory {
group() {
return this.fb.group({
title: [''],
- firstName: ['', Validators.required],
- lastName: ['', Validators.required],
+ firstName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
+ lastName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
addressLine1: ['', Validators.required],
addressLine2: [],
postalCode: ['', [Validators.required, Validators.pattern('[0-9]{5}')]],
diff --git a/src/app/shared/address-forms/components/address-form-gb/address-form-gb.factory.ts b/src/app/shared/address-forms/components/address-form-gb/address-form-gb.factory.ts
index 5657b37b93..4231f9931f 100644
--- a/src/app/shared/address-forms/components/address-form-gb/address-form-gb.factory.ts
+++ b/src/app/shared/address-forms/components/address-form-gb/address-form-gb.factory.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { AddressFormFactory } from 'ish-shared/address-forms/components/address-form/address-form.factory';
+import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
@Injectable()
export class AddressFormGBFactory extends AddressFormFactory {
@@ -14,8 +15,8 @@ export class AddressFormGBFactory extends AddressFormFactory {
group() {
return this.fb.group({
title: [''],
- firstName: ['', Validators.required],
- lastName: ['', Validators.required],
+ firstName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
+ lastName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
addressLine1: ['', Validators.required],
addressLine2: [],
addressLine3: [],
diff --git a/src/app/shared/address-forms/components/address-form-us/address-form-us.factory.ts b/src/app/shared/address-forms/components/address-form-us/address-form-us.factory.ts
index 37f27ef9d8..7c48cae8a3 100644
--- a/src/app/shared/address-forms/components/address-form-us/address-form-us.factory.ts
+++ b/src/app/shared/address-forms/components/address-form-us/address-form-us.factory.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { AddressFormFactory } from 'ish-shared/address-forms/components/address-form/address-form.factory';
+import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
@Injectable()
export class AddressFormUSFactory extends AddressFormFactory {
@@ -13,8 +14,8 @@ export class AddressFormUSFactory extends AddressFormFactory {
group() {
return this.fb.group({
- firstName: ['', Validators.required],
- lastName: ['', Validators.required],
+ firstName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
+ lastName: ['', [Validators.required, SpecialValidators.noSpecialChars]],
addressLine1: ['', Validators.required],
addressLine2: [],
city: ['', Validators.required],