diff --git a/frontend/public/json-example/communitys.json b/frontend/public/json-example/communitys.json index fa6d0a23c..26fb4a8e6 100644 --- a/frontend/public/json-example/communitys.json +++ b/frontend/public/json-example/communitys.json @@ -1,7 +1,7 @@ { "community": [ - {"id": 1, "name": "Community 1", "location": "Ort 1", "description":"description 1 description 1 description 1 description 1 description 1 description 1 description 1 ", "url": "http://localhost:3000/vue/"}, - {"id": 2, "name": "Community 2", "location": "Ort 2", "description":"description 2 description 2 description 2 description 2 description 2 description 2 description 2 ", "url": "https://stage1.gradido.net/vue/"}, - {"id": 3, "name": "Community 3", "location": "Ort 3", "description":"description 3 description 3 description 3 description 3 description 3 description 3 description 3 ", "url": "https://gdd1.gradido.net/vue/"} + {"id": 1, "name": "Gradido Entwicklung", "url": "http://localhost:3000/vue/", "description":"Die lokale Entwicklungsumgebung von Gradido.", "registerUrl": "http://localhost:3000/vue/register"}, + {"id": 2, "name": "Gradido Staging", "url": "https://stage1.gradido.net/vue/", "description":"Der Testserver der Gradido Akademie.", "registerUrl": "https://stage1.gradido.net/vue/register"}, + {"id": 3, "name": "Gradido-Akademie", "url": "https://gdd1.gradido.com/vue/", "description":"Freies Institut für Wirtschaftsbionik.", "registerUrl": "https://gdd1.gradido.com/vue/register"} ] } \ No newline at end of file diff --git a/frontend/src/components/LanguageSwitchSelect.vue b/frontend/src/components/LanguageSwitchSelect.vue index 3467bdafd..545cef4e9 100644 --- a/frontend/src/components/LanguageSwitchSelect.vue +++ b/frontend/src/components/LanguageSwitchSelect.vue @@ -14,8 +14,8 @@ export default { return { selected: null, options: [ - { value: 'de', text: this.$t('languages.de') }, - { value: 'en', text: this.$t('languages.en') }, + { value: 'de', text: this.$t('settings.language.de') }, + { value: 'en', text: this.$t('settings.language.en') }, ], } }, diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4ce3f9f50..2009e446d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -12,9 +12,9 @@ "submit": "Einreichen" } }, - "continue-to-registration": "weiter zur Registrierung", + "continue-to-registration": "Weiter zur Registrierung", "current-community": "Aktuelle Gemeinschaft", - "other-communities": "weitere Gemeinschaften", + "other-communities": "Weitere Gemeinschaften", "switch-to-this-community": "zu dieser Gemeinschaft wechseln" }, "decay": { diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 40c157068..847d1806d 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -68,13 +68,11 @@ export const store = new Vuex.Store({ description: '', token: null, newsletterState: null, - community_name: 'Community 1', community: { - name: 'Community 1', - name2: 'Community 1', - location: 'Ort 1', - description: - 'description 1 description 1 description 1 description 1 description 1 description 1', + name: 'Gradido Entwicklung', + url: 'http://localhost:3000/vue/', + registerUrl: 'http://localhost:3000/vue/register', + description: 'Die lokale Entwicklungsumgebung von Gradido.', }, }, getters: {}, diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue index 444e94495..dce71ebd3 100644 --- a/frontend/src/views/Pages/ForgotPassword.vue +++ b/frontend/src/views/Pages/ForgotPassword.vue @@ -32,7 +32,7 @@
- {{ $t('back') }} + {{ $t('back') }}
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 990e06775..618d2889a 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -19,14 +19,13 @@
- {{ $t('login') }} -
-
- {{ $store.state.community_name }} -
-
- {{ $store.state.community.description }} + {{ $store.state.community.name }} +

+ {{ $store.state.community.description }} +

+ {{ $t('login') }}
+ @@ -44,15 +43,19 @@
- - + + {{ $t('settings.password.forgot_pwd') }} - + - - + + {{ $t('site.login.new_wallet') }} - + diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index fc2d480ae..52f86d6b7 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -1,24 +1,5 @@ - + diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index 81b3d7df7..110f7cc01 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -40,7 +40,7 @@ - {{ $t('back') }} + {{ $t('back') }} diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue index 8d05620c9..4eab36840 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue @@ -106,7 +106,7 @@ export default { }, buildTagFromLanguageString() { - return 'languages.' + this.$store.state.language + return 'settings.language.' + this.$store.state.language }, }, }