diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ed7cbc06b..9719aab20 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -19,17 +19,25 @@ "en": "English" }, "form": { - "cancel":"Abbrechen", + "cancel": "Abbrechen", "reset": "Zurücksetzen", - "close":"schließen", + "close": "schließen", + "edit": "bearbeiten", + "save": "speichern", "receiver":"Empfänger", "sender":"Absender", + "username":"Username", "firstname":"Vorname", "lastname":"Nachname", + "description": "Beschreibung", "email":"E-Mail", "email_repeat":"eMail wiederholen", "password":"Passwort", "password_repeat":"Passwort wiederholen", + "password_old":"altes Passwort", + "password_new":"neues Passwort", + "password_new_repeat":"neues Passwort wiederholen", + "change": "ändern", "amount":"Betrag", "memo":"Nachricht für den Empfänger", "message":"Nachricht", @@ -49,7 +57,8 @@ "validation": { "double": "Das Feld {field} muss eine Dezimalzahl mit zwei Nachkommastellen sein", "is-not": "Du kannst Dir selbst keine Gradidos überweisen" - } + }, + "change_username_info": "Das ändern des Usernamens bedarf mehrerer Schritte." }, "error": { "error":"Fehler" @@ -93,7 +102,9 @@ "add_work":"neuer Gemeinschaftsbeitrag" }, "profil": { - "transactions":"transactions", + "edit": { + + }, "activity": { "chart":"Gemeinschaftsstunden Chart", "new":"Neue Gemeinschaftsstunden eintragen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 9a4a42314..72a2fce2e 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1,7 +1,7 @@ { "message": "hello gradido !!", "welcome":"Welcome!", - "community": "Gemeinschaft", + "community": "Community", "logout":"Logout", "login":"Login", "signup": "Sign up", @@ -22,14 +22,22 @@ "cancel":"Cancel", "reset": "Reset", "close":"Close", + "edit": "Edit", + "save": "save", "receiver":"Receiver", "sender":"Sender", + "username":"Username", "firstname":"Firstname", "lastname":"Lastname", + "description": "Description", "email":"Email", "email_repeat":"Repeat Email", "password":"Password", "password_repeat":"Repeat password", + "password_old":"Old password", + "password_new":"New password", + "password_new_repeat":"Repeat new password", + "change": "change", "amount":"Amount", "memo":"Message for the recipient", "message":"Message", @@ -49,7 +57,8 @@ "validation": { "double": "The {field} field must be a decimal with two digits", "is-not": "You cannot send Gradidos to yourself" - } + }, + "change_username_info": "Changing the username requires several steps." }, "error": { "error":"Error" diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 2933dcb55..5dd4e86a5 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -94,11 +94,11 @@ export default { transactionCount: 0, pending: true, UserProfileTestData: { + username: 'Mustermax', name: 'Max', lastname: 'Mustermann', desc: 'Max Mustermann seine Beschreibung. Max Mustermann seine Beschreibung. Max Mustermann seine Beschreibung. Max Mustermann seine Beschreibung. ', - img: '12345.png', }, } }, diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue index c55d427c0..07c9794f5 100755 --- a/frontend/src/views/Pages/UserProfile/UserCard.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard.vue @@ -15,25 +15,25 @@
{{ $n(transactionCount) }} - Transactions + {{ $t('transactions') }}
-- - Community + {{ $t('community') }}
- - bearbeiten + + {{ $t('form.edit') }}
- bearbeiten - abbrechen + {{ $t('form.edit') }} + {{ $t('form.cancel') }} - speichern + {{ $t('form.save') }}
@@ -41,27 +41,33 @@
- Vorname + {{ $t('form.firstname') }} + + + {{ UserProfileTestData.name }} - {{ UserProfileTestData.name }} - Nachname + {{ $t('form.lastname') }} + + + {{ UserProfileTestData.lastname }} - {{ UserProfileTestData.lastname }} - Beschreibung + {{ $t('form.description') }} + + + {{ UserProfileTestData.desc }} - {{ UserProfileTestData.desc }} - - - UserBild - - {{ UserProfileTestData.img }} - - - - - - - - - - E-Mail - - {{ $store.state.email }} - - - -
+
+ - - Passwort ändern + + E-Mail {{ $t('form.change') }}
- Passwort ändern - abbrechen + E-Mail {{ $t('form.change') }} + {{ $t('form.cancel') }} - speichern + {{ $t('form.save') }} +
+
+
+
+ + + E-Mail + + {{ $store.state.email }} + + + + + +
+ + + + + {{ $t('form.username') }} {{ $t('form.change') }} +
+ + {{ $t('form.username') }} {{ $t('form.change') }} + {{ $t('form.cancel') }} + + {{ $t('form.save') }} +
+
+
+
+ + + {{ $t('form.username') }} + + + @{{ UserProfileTestData.username }} + + + +
+ {{ $t('form.change_username_info') }} +
+
+
+ +
+ + + + + {{ $t('form.password') }} {{ $t('form.change') }} +
+ + {{ $t('form.password') }} {{ $t('form.change') }} + {{ $t('form.cancel') }} + + {{ $t('form.save') }}
-
- - - altes Passwort - +
+ + + {{ $t('form.password_old') }} + - - - - - - - neues Passwort - + + + + + + {{ $t('form.password_new') }} + - - - - - - - - neues Passwort wiederholen - + + + + + + {{ $t('form.password_new_repeat') }} + - - - -
+ + +
+
@@ -150,8 +191,10 @@ export default { }, data() { return { - edit: true, - editpwd: true, + edit_userdata: true, + edit_pwd: true, + edit_email: true, + edit_username: true, edit_button_text: 'edit', } },