From 7d2801a636dcbf4713a2e46349c64577517218aa Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 29 Oct 2019 11:05:49 +0100
Subject: [PATCH 1/6] after successful login the saved language of the user is
 set

---
 webapp/pages/login.vue | 11 +++++++++++
 webapp/store/auth.js   |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index e969fe46f..4db3a7c3d 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -7,12 +7,18 @@
 <script>
 import LoginForm from '~/components/LoginForm/LoginForm.vue'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
+import { mapGetters } from 'vuex'
 
 export default {
   layout: 'no-header',
   components: {
     LoginForm,
   },
+  computed: {
+    ...mapGetters({
+      user: 'auth/user',
+    }),
+  },
   asyncData({ store, redirect }) {
     if (store.getters['auth/user'].termsAndConditionsAgreedVersion === VERSION) {
       redirect('/')
@@ -20,6 +26,11 @@ export default {
   },
   methods: {
     handleSuccess() {
+      const currentLocale = this.$i18n.locale()
+      const userSettingLocale = this.user.locale
+      if (currentLocale !== userSettingLocale) {
+        this.$i18n.set(userSettingLocale)
+      }
       this.$router.replace(this.$route.query.path || '/')
     },
   },
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 90c59a8f5..472bcb8c6 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -46,6 +46,9 @@ export const getters = {
   termsAndConditionsAgreed(state) {
     return state.user && state.user.termsAndConditionsAgreedVersion === VERSION
   },
+  locale(state) {
+    return state.locale
+  },
 }
 
 export const actions = {
@@ -84,6 +87,7 @@ export const actions = {
             role
             about
             locationName
+            locale
             contributionsCount
             commentedCount
             allowEmbedIframes

From bbfc5294eacac1324c705bcd40c32243ec9d8625 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 29 Oct 2019 14:41:06 +0100
Subject: [PATCH 2/6] auth.test.js test locale white User/locale

---
 webapp/store/auth.test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/store/auth.test.js b/webapp/store/auth.test.js
index e45fec693..ad398520f 100644
--- a/webapp/store/auth.test.js
+++ b/webapp/store/auth.test.js
@@ -13,6 +13,7 @@ const currentUser = {
   email: 'user@example.org',
   avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
   role: 'user',
+  locale: 'de',
 }
 const successfulLoginResponse = { data: { login: token } }
 const successfulCurrentUserResponse = { data: { currentUser } }
@@ -126,6 +127,7 @@ describe('actions', () => {
                 email: 'user@example.org',
                 avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
                 role: 'user',
+                locale: 'de',
               },
             ],
           ]),

From 9a246dea8d49b3e720a7c5ee6ecdf121ef632dbc Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 1 Nov 2019 13:14:46 +0100
Subject: [PATCH 3/6] remove getter locale

remove getter locale
---
 webapp/store/auth.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 472bcb8c6..35046446b 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -46,9 +46,6 @@ export const getters = {
   termsAndConditionsAgreed(state) {
     return state.user && state.user.termsAndConditionsAgreedVersion === VERSION
   },
-  locale(state) {
-    return state.locale
-  },
 }
 
 export const actions = {

From 056f2d32a138ddb39c7b861ecd81a1d3a8697fb0 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 1 Nov 2019 13:23:06 +0100
Subject: [PATCH 4/6] change

this.$i18n.set(this.user.locale)
---
 webapp/pages/login.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 4db3a7c3d..b9228cde5 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -25,12 +25,8 @@ export default {
     }
   },
   methods: {
-    handleSuccess() {
-      const currentLocale = this.$i18n.locale()
-      const userSettingLocale = this.user.locale
-      if (currentLocale !== userSettingLocale) {
-        this.$i18n.set(userSettingLocale)
-      }
+    handleSuccess() {      
+      this.$i18n.set(this.user.locale)   
       this.$router.replace(this.$route.query.path || '/')
     },
   },

From fea0b60c2d2fc75bed952b68919094d7dae14742 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 4 Nov 2019 20:55:08 +0100
Subject: [PATCH 5/6] Fix lint errors

---
 webapp/pages/login.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index b9228cde5..25480a0df 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -25,8 +25,8 @@ export default {
     }
   },
   methods: {
-    handleSuccess() {      
-      this.$i18n.set(this.user.locale)   
+    handleSuccess() {
+      this.$i18n.set(this.user.locale)
       this.$router.replace(this.$route.query.path || '/')
     },
   },

From 826924ad7e49c0b9c9623842ee685b20f3c4c08e Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 7 Nov 2019 11:42:58 +0100
Subject: [PATCH 6/6] change

this.$i18n.set(this.user.locale || 'en')
---
 webapp/pages/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 25480a0df..d7548706c 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -26,7 +26,7 @@ export default {
   },
   methods: {
     handleSuccess() {
-      this.$i18n.set(this.user.locale)
+      this.$i18n.set(this.user.locale || 'en')
       this.$router.replace(this.$route.query.path || '/')
     },
   },