From 99696d16f8532a72bd106bd70be895df9c5ea746 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 08:49:30 +0100 Subject: [PATCH 1/7] rename Wallet to My Account --- admin/src/components/NavBar.vue | 2 +- admin/src/locales/de.json | 2 +- admin/src/locales/en.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 0e8ad8acf..afc9b9507 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -19,7 +19,7 @@ > {{ $store.state.openCreations }} {{ $t('navbar.open_creation') }} - {{ $t('navbar.wallet') }} + {{ $t('navbar.my-account') }} {{ $t('navbar.logout') }} diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index a9a2bc382..bbade7d52 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -28,7 +28,7 @@ "open_creation": "Offene Schöpfungen", "overview": "Übersicht", "user_search": "Nutzersuche", - "wallet": "Wallet" + "my-account": "Mein Konto" }, "not_open_creations": "Keine offenen Schöpfungen", "open_creation": "Offene Schöpfung", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index ee2b9b36d..85be8b8e2 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -28,7 +28,7 @@ "open_creation": "Open creations", "overview": "Overview", "user_search": "User search", - "wallet": "Wallet" + "my-account": "My Account" }, "not_open_creations": "No open creations", "open_creation": "Open creation", From 4161a6194a539c265eb564cbaf94c8a4dff29185 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 08:50:30 +0100 Subject: [PATCH 2/7] yarn locales fix --- admin/src/locales/de.json | 4 ++-- admin/src/locales/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index bbade7d52..d3b87383a 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -25,10 +25,10 @@ "navbar": { "logout": "Abmelden", "multi_creation": "Mehrfachschöpfung", + "my-account": "Mein Konto", "open_creation": "Offene Schöpfungen", "overview": "Übersicht", - "user_search": "Nutzersuche", - "my-account": "Mein Konto" + "user_search": "Nutzersuche" }, "not_open_creations": "Keine offenen Schöpfungen", "open_creation": "Offene Schöpfung", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 85be8b8e2..517b69379 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -25,10 +25,10 @@ "navbar": { "logout": "Logout", "multi_creation": "Multiple creation", + "my-account": "My Account", "open_creation": "Open creations", "overview": "Overview", - "user_search": "User search", - "my-account": "My Account" + "user_search": "User search" }, "not_open_creations": "No open creations", "open_creation": "Open creation", From 9d7be547fa2c431281db7088c287ad916f3683a4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:47:16 +0100 Subject: [PATCH 3/7] remove text publisher.infoNoRegister from register --- frontend/src/views/Pages/Register.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 070d80bb9..c734df852 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -145,7 +145,6 @@ class="text-center mt-1 shadow-lg p-3 mb-5 rounded" > {{ $t('publisher.infoText') }} - {{ $t('publisher.infoNoRegister') }}
From fb4bbac8aa7790245d77221a9b5480ae7881d8e4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:47:47 +0100 Subject: [PATCH 4/7] remove text publisher.infoNoRegister from locales de --- frontend/src/locales/de.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1af76e4df..5e59e3af0 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -120,7 +120,6 @@ "overview": "Übersicht", "privacy_policy": "Datenschutzerklärung", "publisher": { - "infoNoRegister": "Dies ist für die Registrieung nicht nötig.", "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!", "publisherId": "Publisher-Id" }, From d168ca2b1a49d935e597f3c4e385cae564919b25 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:48:12 +0100 Subject: [PATCH 5/7] remove text publisher.infoNoRegister from locales en --- frontend/src/locales/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 71ce6f9ef..d30d16717 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -120,7 +120,6 @@ "overview": "Overview", "privacy_policy": "Privacy policy", "publisher": { - "infoNoRegister": "This is not necessary for registration.", "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!", "publisherId": "PublisherID" }, From 0c6a86dc1e1808c444bc77e30cc265475a96d8de Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 10:39:34 +0100 Subject: [PATCH 6/7] change look width radius and boder style inset --- frontend/src/views/Pages/AccountOverview.vue | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue index f03a1f65b..1c69f5368 100644 --- a/frontend/src/views/Pages/AccountOverview.vue +++ b/frontend/src/views/Pages/AccountOverview.vue @@ -1,33 +1,24 @@