IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

setting changed to settings, remove delete rows

Browse Source
This commit is contained in:
ogerly 2021-09-28 09:41:07 +02:00
parent 4dec84321a
commit f5915d0ada
18 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/LanguageSwitchSelect.vue
View File

@ -14,9 +14,9 @@ export default {
return { return {
selected: null, selected: null,
options: [ options: [
{ value: null, text: this.$t('setting.language.select_language') }, { value: null, text: this.$t('settings.language.select_language') },
{ value: 'de', text: this.$t('setting.language.de') }, { value: 'de', text: this.$t('settings.language.de') },
{ value: 'en', text: this.$t('setting.language.en') }, { value: 'en', text: this.$t('settings.language.en') },
], ],
} }
}, },

6
frontend/src/locales/de.json
View File

@ -76,7 +76,9 @@
"to1": "an", "to1": "an",
"validation": { "validation": {
"gddSendAmount": "Das Feld {_field_} muss eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein", "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": { "gdt": {
@ -102,7 +104,7 @@
"message": "hallo gradido !!", "message": "hallo gradido !!",
"privacy_policy": "Datenschutzerklärung", "privacy_policy": "Datenschutzerklärung",
"send": "Senden", "send": "Senden",
"setting": { "settings": {
"language": { "language": {
"changeLanguage": "Sprache ändern", "changeLanguage": "Sprache ändern",
"de": "Deutsch", "de": "Deutsch",

6
frontend/src/locales/en.json
View File

@ -76,7 +76,9 @@
"to1": "to", "to1": "to",
"validation": { "validation": {
"gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits", "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": { "gdt": {
@ -102,7 +104,7 @@
"message": "hello gradido !!", "message": "hello gradido !!",
"privacy_policy": "Privacy policy", "privacy_policy": "Privacy policy",
"send": "Send", "send": "Send",
"setting": { "settings": {
"language": { "language": {
"changeLanguage": "Change language", "changeLanguage": "Change language",
"de": "Deutsch", "de": "Deutsch",

4
frontend/src/views/Pages/ForgotPassword.spec.js
View File

@ -39,11 +39,11 @@ describe('ForgotPassword', () => {
}) })
it('has a title', () => { 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', () => { 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', () => { describe('back button', () => {

6
frontend/src/views/Pages/ForgotPassword.vue
View File

@ -5,8 +5,8 @@
<div class="header-body text-center mb-7"> <div class="header-body text-center mb-7">
<b-row class="justify-content-center"> <b-row class="justify-content-center">
<b-col xl="5" lg="6" md="8" class="px-2"> <b-col xl="5" lg="6" md="8" class="px-2">
<h1>{{ $t('setting.password.reset') }}</h1> <h1>{{ $t('settings.password.reset') }}</h1>
<p class="text-lead">{{ $t('setting.password.subtitle') }}</p> <p class="text-lead">{{ $t('settings.password.subtitle') }}</p>
</b-col> </b-col>
</b-row> </b-row>
</div> </div>
@ -22,7 +22,7 @@
<input-email v-model="form.email"></input-email> <input-email v-model="form.email"></input-email>
<div class="text-center"> <div class="text-center">
<b-button type="submit" variant="primary"> <b-button type="submit" variant="primary">
{{ $t('setting.password.send_now') }} {{ $t('settings.password.send_now') }}
</b-button> </b-button>
</div> </div>
</b-form> </b-form>

2
frontend/src/views/Pages/Login.spec.js
View File

@ -71,7 +71,7 @@ describe('Login', () => {
describe('links', () => { describe('links', () => {
it('has a link "Forgot Password?"', () => { it('has a link "Forgot Password?"', () => {
expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual( expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual(
'setting.password.forgot_pwd', 'settings.password.forgot_pwd',
) )
}) })

2
frontend/src/views/Pages/Login.vue
View File

@ -40,7 +40,7 @@
<b-row class="mt-3"> <b-row class="mt-3">
<b-col cols="6"> <b-col cols="6">
<router-link to="/password"> <router-link to="/password">
{{ $t('setting.password.forgot_pwd') }} {{ $t('settings.password.forgot_pwd') }}
</router-link> </router-link>
</b-col> </b-col>
<b-col cols="6" class="text-right" v-show="allowRegister"> <b-col cols="6" class="text-right" v-show="allowRegister">

8
frontend/src/views/Pages/ResetPassword.spec.js
View File

@ -71,9 +71,9 @@ describe('ResetPassword', () => {
}) })
it('has a message suggesting to contact the support', () => { 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( 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', () => { describe('Register header', () => {
it('has a welcome message', async () => { 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( expect(wrapper.find('div.header').text()).toContain(
'setting.password.reset-password.text', 'settings.password.reset-password.text',
) )
}) })
}) })

8
frontend/src/views/Pages/ResetPassword.vue
View File

@ -5,13 +5,13 @@
<div class="header-body text-center mb-7"> <div class="header-body text-center mb-7">
<b-row class="justify-content-center"> <b-row class="justify-content-center">
<b-col xl="5" lg="6" md="8" class="px-2"> <b-col xl="5" lg="6" md="8" class="px-2">
<h1>{{ $t('setting.password.reset') }}</h1> <h1>{{ $t('settings.password.reset') }}</h1>
<div class="pb-4" v-if="!pending"> <div class="pb-4" v-if="!pending">
<span v-if="authenticated"> <span v-if="authenticated">
{{ $t('setting.password.reset-password.text') }} {{ $t('settings.password.reset-password.text') }}
</span> </span>
<span v-else> <span v-else>
{{ $t('setting.password.reset-password.not-authenticated') }} {{ $t('settings.password.reset-password.not-authenticated') }}
</span> </span>
</div> </div>
</b-col> </b-col>
@ -29,7 +29,7 @@
<input-password-confirmation v-model="form" :register="register" /> <input-password-confirmation v-model="form" :register="register" />
<div class="text-center"> <div class="text-center">
<b-button type="submit" variant="primary" class="mt-4"> <b-button type="submit" variant="primary" class="mt-4">
{{ $t('setting.password.reset') }} {{ $t('settings.password.reset') }}
</b-button> </b-button>
</div> </div>
</b-form> </b-form>

2
frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
View File

@ -139,7 +139,7 @@ describe('UserCard_FormUserData', () => {
}) })
it('toasts a success message', () => { 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', () => { it('has an edit button again', () => {

4
frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
View File

@ -4,7 +4,7 @@
<b-row class="mb-4 text-right"> <b-row class="mb-4 text-right">
<b-col class="text-right"> <b-col class="text-right">
<a @click="showUserData ? (showUserData = !showUserData) : cancelEdit()"> <a @click="showUserData ? (showUserData = !showUserData) : cancelEdit()">
<span class="pointer mr-3">{{ $t('setting.name.change-name') }}</span> <span class="pointer mr-3">{{ $t('settings.name.change-name') }}</span>
<b-icon v-if="showUserData" class="pointer ml-3" icon="pencil"></b-icon> <b-icon v-if="showUserData" class="pointer ml-3" icon="pencil"></b-icon>
<b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon> <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
</a> </a>
@ -122,7 +122,7 @@ export default {
this.$store.commit('lastName', this.form.lastName) this.$store.commit('lastName', this.form.lastName)
this.$store.commit('description', this.form.description) this.$store.commit('description', this.form.description)
this.showUserData = true this.showUserData = true
this.$toasted.success(this.$t('setting.name.change-success')) this.$toasted.success(this.$t('settings.name.change-success'))
}) })
.catch((error) => { .catch((error) => {
this.$toasted.error(error.message) this.$toasted.error(error.message)

2
frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
View File

@ -47,7 +47,7 @@ describe('UserCard_FormUserPasswort', () => {
}) })
it('has a change password button with text "form.change-password"', () => { 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', () => { it('has a change password button with a pencil icon', () => {

2
frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
View File

@ -4,7 +4,7 @@
<b-row class="mb-4 text-right"> <b-row class="mb-4 text-right">
<b-col class="text-right"> <b-col class="text-right">
<a @click="showPassword ? (showPassword = !showPassword) : cancelEdit()"> <a @click="showPassword ? (showPassword = !showPassword) : cancelEdit()">
<span class="pointer mr-3">{{ $t('setting.password.change-password') }}</span> <span class="pointer mr-3">{{ $t('settings.password.change-password') }}</span>
<b-icon v-if="showPassword" class="pointer ml-3" icon="pencil"></b-icon> <b-icon v-if="showPassword" class="pointer ml-3" icon="pencil"></b-icon>
<b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon> <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
</a> </a>

2
frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
View File

@ -125,7 +125,7 @@ describe('UserCard_FormUsername', () => {
}) })
it('toasts an success message', () => { 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', () => { it('has no edit button anymore', () => {

2
frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
View File

@ -98,7 +98,7 @@ export default {
this.$store.commit('username', this.form.username) this.$store.commit('username', this.form.username)
this.username = this.form.username this.username = this.form.username
this.showUsername = true this.showUsername = true
this.$toasted.success(this.$t('setting.name.change-success')) this.$toasted.success(this.$t('settings.name.change-success'))
}) })
.catch((error) => { .catch((error) => {
this.$toasted.error(error.message) this.$toasted.error(error.message)

4
frontend/src/views/Pages/UserProfile/UserCard_Language.vue
View File

@ -4,7 +4,7 @@
<b-row class="mb-4 text-right"> <b-row class="mb-4 text-right">
<b-col class="text-right"> <b-col class="text-right">
<a @click="showLanguage ? (showLanguage = !showLanguage) : cancelEdit()"> <a @click="showLanguage ? (showLanguage = !showLanguage) : cancelEdit()">
<span class="pointer mr-3">{{ $t('setting.language.changeLanguage') }}</span> <span class="pointer mr-3">{{ $t('settings.language.changeLanguage') }}</span>
<b-icon v-if="showLanguage" class="pointer ml-3" icon="pencil"></b-icon> <b-icon v-if="showLanguage" class="pointer ml-3" icon="pencil"></b-icon>
<b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon> <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
</a> </a>
@ -97,7 +97,7 @@ export default {
this.$i18n.locale = this.language this.$i18n.locale = this.language
localeChanged(this.language) localeChanged(this.language)
this.cancelEdit() this.cancelEdit()
this.$toasted.success(this.$t('setting.language.success')) this.$toasted.success(this.$t('settings.language.success'))
}) })
.catch((error) => { .catch((error) => {
this.language = this.$store.state.language this.language = this.$store.state.language

2
frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
View File

@ -74,7 +74,7 @@ describe('UserCard_Newsletter', () => {
}) })
it('toasts a success message', () => { it('toasts a success message', () => {
expect(toastSuccessMock).toBeCalledWith('setting.newsletter.newsletterFalse') expect(toastSuccessMock).toBeCalledWith('settings.newsletter.newsletterFalse')
}) })
}) })

10
frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
View File

@ -4,7 +4,7 @@
<b-row class="mb-3"> <b-row class="mb-3">
<b-col class="mb-2 col-12"> <b-col class="mb-2 col-12">
<small> <small>
<b>{{ $t('setting.newsletter.newsletter') }}</b> <b>{{ $t('settings.newsletter.newsletter') }}</b>
</small> </small>
</b-col> </b-col>
<b-col class="col-12"> <b-col class="col-12">
@ -17,8 +17,8 @@
> >
{{ {{
newsletterState newsletterState
? $t('setting.newsletter.newsletterTrue') ? $t('settings.newsletter.newsletterTrue')
: $t('setting.newsletter.newsletterFalse') : $t('settings.newsletter.newsletterFalse')
}} }}
</b-form-checkbox> </b-form-checkbox>
</b-col> </b-col>
@ -50,8 +50,8 @@ export default {
this.$store.commit('newsletterState', this.newsletterState) this.$store.commit('newsletterState', this.newsletterState)
this.$toasted.success( this.$toasted.success(
this.newsletterState this.newsletterState
? this.$t('setting.newsletter.newsletterTrue') ? this.$t('settings.newsletter.newsletterTrue')
: this.$t('setting.newsletter.newsletterFalse'), : this.$t('settings.newsletter.newsletterFalse'),
) )
}) })
.catch((error) => { .catch((error) => {