diff --git a/frontend/src/components/Auth/AuthMobileStart.vue b/frontend/src/components/Auth/AuthMobileStart.vue
index 09985dd77..690b8f895 100644
--- a/frontend/src/components/Auth/AuthMobileStart.vue
+++ b/frontend/src/components/Auth/AuthMobileStart.vue
@@ -6,7 +6,7 @@
{{ $t('auth.left.gratitude') }}
- {{ $t('auth.left.newCurrency') }}
+ {{ $t('auth.left.oneGratitude') }}
.authNavbar > .nav-link {
- color: #383838 !important;
+ color: #0e79bc !important;
}
.navbar-toggler {
@@ -54,7 +54,7 @@ export default {
}
.authNavbar > .router-link-exact-active {
- color: #0e79bc !important;
+ color: #383838 !important;
}
button.navbar-toggler > span.navbar-toggler-icon {
diff --git a/frontend/src/components/LanguageSwitch2.vue b/frontend/src/components/LanguageSwitch2.vue
index b78154e0a..e88050047 100644
--- a/frontend/src/components/LanguageSwitch2.vue
+++ b/frontend/src/components/LanguageSwitch2.vue
@@ -5,7 +5,7 @@
@click.prevent="saveLocale(lang.code)"
:key="lang.code"
class="pointer pr-2"
- :class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
+ :class="$store.state.language === lang.code ? 'c-grey' : 'c-blau'"
>
{{ lang.name }}
{{ locales.length - 1 > index ? $t('math.pipe') : '' }}
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 13aaea900..d06f0f726 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -9,15 +9,16 @@ const mockAPIcall = jest.fn()
const navigatorClipboardMock = jest.fn()
const mocks = {
- $i18n: {
- locale: 'en',
- },
$t: jest.fn((t) => t),
$d: jest.fn((d) => d),
- $tc: jest.fn((tc) => tc),
$apollo: {
mutate: mockAPIcall,
},
+ $store: {
+ state: {
+ firstName: 'Testy',
+ },
+ },
}
const propsData = {
@@ -77,7 +78,7 @@ describe('TransactionLink', () => {
navigator.clipboard = navigatorClipboard
})
- describe('copy with success', () => {
+ describe('copy link with success', () => {
beforeEach(async () => {
navigatorClipboardMock.mockResolvedValue()
await wrapper.find('.test-copy-link .dropdown-item').trigger('click')
@@ -93,7 +94,26 @@ describe('TransactionLink', () => {
})
})
- describe('copy with error', () => {
+ describe('copy link and text with success', () => {
+ beforeEach(async () => {
+ navigatorClipboardMock.mockResolvedValue()
+ await wrapper.find('.test-copy-text .dropdown-item').trigger('click')
+ })
+
+ it('should call clipboard.writeText', () => {
+ expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
+ 'http://localhost/redeem/c00000000c000000c0000\n' +
+ 'Testy transaction-link.send_you 75 Gradido.\n' +
+ '"Katzenauge, Eulenschrei, was verschwunden komm herbei!"\n' +
+ 'gdd_per_link.credit-your-gradido gdd_per_link.validUntilDate',
+ )
+ })
+ it('toasts success message', () => {
+ expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-and-text-copied')
+ })
+ })
+
+ describe('copy link with error', () => {
beforeEach(async () => {
navigatorClipboardMock.mockRejectedValue()
await wrapper.find('.test-copy-link .dropdown-item').trigger('click')
@@ -103,6 +123,17 @@ describe('TransactionLink', () => {
expect(toastErrorSpy).toBeCalledWith('gdd_per_link.not-copied')
})
})
+
+ describe('copy link and text with error', () => {
+ beforeEach(async () => {
+ navigatorClipboardMock.mockRejectedValue()
+ await wrapper.find('.test-copy-text .dropdown-item').trigger('click')
+ })
+
+ it('toasts an error', () => {
+ expect(toastErrorSpy).toBeCalledWith('gdd_per_link.not-copied')
+ })
+ })
})
describe('qr code modal', () => {
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index c7b7682ec..5618c8696 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -22,6 +22,14 @@
{{ $t('gdd_per_link.copy') }}
+
+
+ {{ $t('gdd_per_link.copy-with-text') }}
+
{
+ this.toastSuccess(this.$t('gdd_per_link.link-and-text-copied'))
+ })
+ .catch(() => {
+ this.$bvModal.show('modalPopoverCopyError' + this.id)
+ this.toastError(this.$t('gdd_per_link.not-copied'))
+ })
+ },
deleteLink() {
this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.delete-the-link')).then(async (value) => {
if (value)
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 9c33ad195..46f58a4a2 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -30,8 +30,8 @@
- {{ $t('welcome') }}
- {{ $t('WelcomeBy', { name: communityName }) }}
+ {{ $t('welcome') }}
+ {{ communityName }}
{{ $t('1000thanks') }}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6be44f30d..378dcc919 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -12,10 +12,9 @@
"hasAccount": "Du hast schon einen Account?",
"hereLogin": "Hier Anmelden",
"learnMore": "Erfahre mehr …",
- "newCurrency": "Die neue Währung",
"oneDignity": "Wir schenken einander und danken mit Gradido.",
"oneDonation": "Du bist ein Geschenk für die Gemeinschaft. 1000 Dank, weil du bei uns bist.",
- "oneGratitude": "Die neue Währung. Für einander, für alle Menschen, für die Natur."
+ "oneGratitude": "Für einander, für alle Menschen, für die Natur."
},
"navbar": {
"aboutGradido": "Über Gradido"
@@ -125,7 +124,9 @@
"gdd_per_link": {
"choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
"copy": "kopieren",
+ "copy-with-text": "Link und Text kopieren",
"created": "Der Link wurde erstellt!",
+ "credit-your-gradido": "Damit die Gradido gutgeschrieben werden können, klicke auf den Link!",
"decay-14-day": "Vergänglichkeit für 14 Tage",
"delete-the-link": "Den Link löschen?",
"deleted": "Der Link wurde gelöscht!",
@@ -133,6 +134,7 @@
"has-account": "Du besitzt bereits ein Gradido Konto?",
"header": "Gradidos versenden per Link",
"isFree": "Gradido ist weltweit kostenfrei.",
+ "link-and-text-copied": "Der Link und deine Nachricht wurden in die Zwischenablage kopiert. Du kannst ihn jetzt in eine E-Mail oder Nachricht einfügen.",
"link-copied": "Link wurde in die Zwischenablage kopiert. Du kannst ihn jetzt in eine E-Mail oder Nachricht einfügen.",
"link-deleted": "Der Link wurde am {date} gelöscht.",
"link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
@@ -149,7 +151,8 @@
"redeemed-title": "eingelöst",
"to-login": "Log dich ein",
"to-register": "Registriere ein neues Konto.",
- "validUntil": "Gültig bis"
+ "validUntil": "Gültig bis",
+ "validUntilDate": "Der Link ist bis zum {date} gültig."
},
"gdt": {
"calculation": "Berechnung der Gradido Transform",
@@ -284,6 +287,5 @@
"send_you": "sendet dir"
},
"via_link": "über einen Link",
- "welcome": "Willkommen",
- "WelcomeBy": "bei {name}"
+ "welcome": "Willkommen in der Gemeinschaft"
}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5a89bb7bb..0bfde65ed 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -12,10 +12,9 @@
"hasAccount": "You already have an account?",
"hereLogin": "Log in here",
"learnMore": "Learn more …",
- "newCurrency": "The new currency",
"oneDignity": "We gift to each other and give thanks with Gradido.",
"oneDonation": "You are a gift for the community. 1000 thanks because you are with us.",
- "oneGratitude": "The new currency. For each other, for all people, for nature."
+ "oneGratitude": "For each other, for all people, for nature."
},
"navbar": {
"aboutGradido": "About Gradido"
@@ -125,7 +124,9 @@
"gdd_per_link": {
"choose-amount": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
"copy": "copy",
+ "copy-with-text": "Copy link and text",
"created": "Link was created!",
+ "credit-your-gradido": "For the Gradido to be credited, click on the link!",
"decay-14-day": "Decay for 14 days",
"delete-the-link": "Delete the link?",
"deleted": "The link was deleted!",
@@ -133,6 +134,7 @@
"has-account": "You already have a Gradido account?",
"header": "Send Gradidos via link",
"isFree": "Gradido is free of charge worldwide.",
+ "link-and-text-copied": "The link and your message have been copied to the clipboard. You can now include it in an email or message.",
"link-copied": "Link has been copied to the clipboard. You can now paste it into an email or message.",
"link-deleted": "The link was deleted on {date}.",
"link-expired": "The link is no longer valid. The validity expired on {date}.",
@@ -149,7 +151,8 @@
"redeemed-title": "redeemed",
"to-login": "Log in",
"to-register": "Register a new account.",
- "validUntil": "Valid until"
+ "validUntil": "Valid until",
+ "validUntilDate": "The link is valid until {date}."
},
"gdt": {
"calculation": "Calculation of Gradido Transform",
@@ -284,6 +287,5 @@
"send_you": "wants to send you"
},
"via_link": "via Link",
- "welcome": "Welcome",
- "WelcomeBy": "by {name}"
+ "welcome": "Welcome to the community"
}