diff --git a/frontend/src/components/LanguageSwitchSelect.vue b/frontend/src/components/LanguageSwitchSelect.vue
index b53b82a18..c547d9af3 100644
--- a/frontend/src/components/LanguageSwitchSelect.vue
+++ b/frontend/src/components/LanguageSwitchSelect.vue
@@ -14,9 +14,9 @@ export default {
return {
selected: null,
options: [
- { value: null, text: this.$t('setting.language.select_language') },
- { value: 'de', text: this.$t('setting.language.de') },
- { value: 'en', text: this.$t('setting.language.en') },
+ { value: null, text: this.$t('settings.language.select_language') },
+ { value: 'de', text: this.$t('settings.language.de') },
+ { value: 'en', text: this.$t('settings.language.en') },
],
}
},
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ac9aa89d4..b43f4b4e5 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -76,7 +76,9 @@
"to1": "an",
"validation": {
"gddSendAmount": "Das Feld {_field_} muss eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein",
- "is-not": "Du kannst dir selbst keine Gradidos überweisen"
+ "is-not": "Du kannst dir selbst keine Gradidos überweisen",
+ "usernmae-regex": "Der Username muss mit einem Buchstaben beginnen auf den mindestens zwei alfanumerische Zeichen folgen müssen.",
+ "usernmae-unique": "Der Username ist bereits vergeben."
}
},
"gdt": {
@@ -102,7 +104,7 @@
"message": "hallo gradido !!",
"privacy_policy": "Datenschutzerklärung",
"send": "Senden",
- "setting": {
+ "settings": {
"language": {
"changeLanguage": "Sprache ändern",
"de": "Deutsch",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1967fc124..8dda1dfbe 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -76,7 +76,9 @@
"to1": "to",
"validation": {
"gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits",
- "is-not": "You cannot send Gradidos to yourself"
+ "is-not": "You cannot send Gradidos to yourself",
+ "usernmae-regex": "The username must start with a letter, followed by at least two alphanumeric characters.",
+ "usernmae-unique": "The username is already taken."
}
},
"gdt": {
@@ -102,7 +104,7 @@
"message": "hello gradido !!",
"privacy_policy": "Privacy policy",
"send": "Send",
- "setting": {
+ "settings": {
"language": {
"changeLanguage": "Change language",
"de": "Deutsch",
diff --git a/frontend/src/views/Pages/ForgotPassword.spec.js b/frontend/src/views/Pages/ForgotPassword.spec.js
index 5f0311fcb..91247d8a6 100644
--- a/frontend/src/views/Pages/ForgotPassword.spec.js
+++ b/frontend/src/views/Pages/ForgotPassword.spec.js
@@ -39,11 +39,11 @@ describe('ForgotPassword', () => {
})
it('has a title', () => {
- expect(wrapper.find('h1').text()).toEqual('setting.password.reset')
+ expect(wrapper.find('h1').text()).toEqual('settings.password.reset')
})
it('has a subtitle', () => {
- expect(wrapper.find('p.text-lead').text()).toEqual('setting.password.subtitle')
+ expect(wrapper.find('p.text-lead').text()).toEqual('settings.password.subtitle')
})
describe('back button', () => {
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index c68b94a56..444e94495 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -5,8 +5,8 @@
- {{ $t('setting.password.reset') }}
- {{ $t('setting.password.subtitle') }}
+ {{ $t('settings.password.reset') }}
+ {{ $t('settings.password.subtitle') }}
@@ -22,7 +22,7 @@
- {{ $t('setting.password.send_now') }}
+ {{ $t('settings.password.send_now') }}
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index 30f6cb4bd..7218384f7 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -71,7 +71,7 @@ describe('Login', () => {
describe('links', () => {
it('has a link "Forgot Password?"', () => {
expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual(
- 'setting.password.forgot_pwd',
+ 'settings.password.forgot_pwd',
)
})
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 90fa5eb61..f5c6f025d 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -40,7 +40,7 @@
- {{ $t('setting.password.forgot_pwd') }}
+ {{ $t('settings.password.forgot_pwd') }}
diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js
index 2df1cd75e..bd1467524 100644
--- a/frontend/src/views/Pages/ResetPassword.spec.js
+++ b/frontend/src/views/Pages/ResetPassword.spec.js
@@ -71,9 +71,9 @@ describe('ResetPassword', () => {
})
it('has a message suggesting to contact the support', () => {
- expect(wrapper.find('div.header').text()).toContain('setting.password.reset')
+ expect(wrapper.find('div.header').text()).toContain('settings.password.reset')
expect(wrapper.find('div.header').text()).toContain(
- 'setting.password.reset-password.not-authenticated',
+ 'settings.password.reset-password.not-authenticated',
)
})
})
@@ -101,9 +101,9 @@ describe('ResetPassword', () => {
describe('Register header', () => {
it('has a welcome message', async () => {
- expect(wrapper.find('div.header').text()).toContain('setting.password.reset')
+ expect(wrapper.find('div.header').text()).toContain('settings.password.reset')
expect(wrapper.find('div.header').text()).toContain(
- 'setting.password.reset-password.text',
+ 'settings.password.reset-password.text',
)
})
})
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index f72100600..81b3d7df7 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -5,13 +5,13 @@
- {{ $t('setting.password.reset') }}
+ {{ $t('settings.password.reset') }}
- {{ $t('setting.password.reset-password.text') }}
+ {{ $t('settings.password.reset-password.text') }}
- {{ $t('setting.password.reset-password.not-authenticated') }}
+ {{ $t('settings.password.reset-password.not-authenticated') }}
@@ -29,7 +29,7 @@
- {{ $t('setting.password.reset') }}
+ {{ $t('settings.password.reset') }}
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
index 0c7cae799..927f1d29d 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
@@ -139,7 +139,7 @@ describe('UserCard_FormUserData', () => {
})
it('toasts a success message', () => {
- expect(toastSuccessMock).toBeCalledWith('setting.name.change-success')
+ expect(toastSuccessMock).toBeCalledWith('settings.name.change-success')
})
it('has an edit button again', () => {
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
index 0cd8ba965..b3cee1ef5 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
@@ -4,7 +4,7 @@
- {{ $t('setting.name.change-name') }}
+ {{ $t('settings.name.change-name') }}
@@ -122,7 +122,7 @@ export default {
this.$store.commit('lastName', this.form.lastName)
this.$store.commit('description', this.form.description)
this.showUserData = true
- this.$toasted.success(this.$t('setting.name.change-success'))
+ this.$toasted.success(this.$t('settings.name.change-success'))
})
.catch((error) => {
this.$toasted.error(error.message)
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
index 048f12ff1..372a1ba1f 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
@@ -47,7 +47,7 @@ describe('UserCard_FormUserPasswort', () => {
})
it('has a change password button with text "form.change-password"', () => {
- expect(wrapper.find('a').text()).toEqual('setting.password.change-password')
+ expect(wrapper.find('a').text()).toEqual('settings.password.change-password')
})
it('has a change password button with a pencil icon', () => {
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 5095f7b74..1f6c34c26 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -4,7 +4,7 @@
- {{ $t('setting.password.change-password') }}
+ {{ $t('settings.password.change-password') }}
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
index 4c667d782..a55c223d7 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
@@ -125,7 +125,7 @@ describe('UserCard_FormUsername', () => {
})
it('toasts an success message', () => {
- expect(toastSuccessMock).toBeCalledWith('setting.name.change-success')
+ expect(toastSuccessMock).toBeCalledWith('settings.name.change-success')
})
it('has no edit button anymore', () => {
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
index eae499c07..f9d46bbba 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
@@ -98,7 +98,7 @@ export default {
this.$store.commit('username', this.form.username)
this.username = this.form.username
this.showUsername = true
- this.$toasted.success(this.$t('setting.name.change-success'))
+ this.$toasted.success(this.$t('settings.name.change-success'))
})
.catch((error) => {
this.$toasted.error(error.message)
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index 0d5872179..8d05620c9 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -4,7 +4,7 @@
- {{ $t('setting.language.changeLanguage') }}
+ {{ $t('settings.language.changeLanguage') }}
@@ -97,7 +97,7 @@ export default {
this.$i18n.locale = this.language
localeChanged(this.language)
this.cancelEdit()
- this.$toasted.success(this.$t('setting.language.success'))
+ this.$toasted.success(this.$t('settings.language.success'))
})
.catch((error) => {
this.language = this.$store.state.language
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
index 8f15a855b..3a70840e1 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
@@ -74,7 +74,7 @@ describe('UserCard_Newsletter', () => {
})
it('toasts a success message', () => {
- expect(toastSuccessMock).toBeCalledWith('setting.newsletter.newsletterFalse')
+ expect(toastSuccessMock).toBeCalledWith('settings.newsletter.newsletterFalse')
})
})
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
index 7b0f124f4..31fd745b2 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
@@ -4,7 +4,7 @@
- {{ $t('setting.newsletter.newsletter') }}
+ {{ $t('settings.newsletter.newsletter') }}
@@ -17,8 +17,8 @@
>
{{
newsletterState
- ? $t('setting.newsletter.newsletterTrue')
- : $t('setting.newsletter.newsletterFalse')
+ ? $t('settings.newsletter.newsletterTrue')
+ : $t('settings.newsletter.newsletterFalse')
}}
@@ -50,8 +50,8 @@ export default {
this.$store.commit('newsletterState', this.newsletterState)
this.$toasted.success(
this.newsletterState
- ? this.$t('setting.newsletter.newsletterTrue')
- : this.$t('setting.newsletter.newsletterFalse'),
+ ? this.$t('settings.newsletter.newsletterTrue')
+ : this.$t('settings.newsletter.newsletterFalse'),
)
})
.catch((error) => {