Merge branch 'dev' into oauth2

2022-07-03 19:05:38 +02:00
parent e425cf4ec0 3618756950
commit df49f78d1f
176 changed files with 3782 additions and 2122 deletions
--- a/fittrackee_client/src/components/User/UserAuthForm.vue
+++ b/fittrackee_client/src/components/User/UserAuthForm.vue
@ -191,6 +191,9 @@
  const appConfig: ComputedRef<TAppConfig> = computed(
    () => store.getters[ROOT_STORE.GETTERS.APP_CONFIG]
  )
+  const language: ComputedRef<string> = computed(
+    () => store.getters[ROOT_STORE.GETTERS.LANGUAGE]
+  )
  const registration_disabled: ComputedRef<boolean> = computed(
    () =>
      props.action === 'register' && !appConfig.value.is_registration_enabled
@ -245,6 +248,7 @@
          }
        )
      default:
+        formData['language'] = language.value
        store.dispatch(AUTH_USER_STORE.ACTIONS.LOGIN_OR_REGISTER, {
          actionType,
          formData,