diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 92e913bdc..6093f2239 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -44,7 +44,9 @@ }, "setting": { "newsletter": "Newsletter", - "changeNewsletter": "Newsletter Status ändern" + "changeNewsletter": "Newsletter Status ändern", + "newsletterTrue": "Du bist im Newslettersystem von Gradido eingetraten und erhällst regelmäsig Neuigkeiten und Informationen.", + "newsletterFalse": "Du bist aus Newslettersystem von Gradido ausgetragen." }, "form": { "cancel": "Abbrechen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 2fa096d83..d1652965f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -42,6 +42,12 @@ "toCommunity":"To the community", "noDecay": "No Decay" }, + "setting": { + "newsletter": "Newsletter", + "changeNewsletter": "Newsletter status change", + "newsletterTrue": "You have joined the Gradido newsletter system and receive news and information regularly.", + "newsletterFalse": "You are unsubscribed from Gradido's newsletter system." + }, "form": { "cancel":"Cancel", "reset": "Reset", @@ -65,7 +71,6 @@ "change-password": "Change password", "change-name": "Change name", "changeLanguage": "Change language", - "changeNewsletter": "Change newsletter status", "amount":"Amount", "memo":"Message", "message":"Message", diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js index dac242fe5..1e550204e 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js +++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js @@ -42,8 +42,8 @@ describe('UserCard_Newsletter', () => { expect(wrapper.find('div#formusernewsletter').exists()).toBeTruthy() }) - it('has an edit icon', () => { - expect(wrapper.find('svg.bi-pencil').exists()).toBeTruthy() + it('has an edit BFormCheckbox switch', () => { + expect(wrapper.find('.Test-BFormCheckbox').exists()).toBeTruthy() }) }) }) diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue index a38712a77..17fcd65bf 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue @@ -7,11 +7,16 @@