surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Form Newsletter and others fix

Browse Source
This commit is contained in:
Paolo Arena
2019-07-12 14:09:44 +02:00
parent 7f5076d8f2
commit b11dd46f9f
33 changed files with 119 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/login/signin/signin.ts
View File

@@ -3,6 +3,7 @@ import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { serv_constants } from '../../../store/Modules/serv_constants'
import { tools } from '../../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
import { ISigninOptions, IUserState } from 'model'
import { TSignin, validations } from './signin-validate'
@@ -161,14 +162,14 @@ export default class Signin extends Vue {
}
return riscode
}).then((riscode) => {
if (UserStore.state.lang !== '') {
this.$i18n.locale = UserStore.state.lang
if (toolsext.getLocale() !== '') {
this.$i18n.locale = toolsext.getLocale()
} // Set Lang
else {
UserStore.mutations.setlang(this.$i18n.locale)
} // Set Lang
// console.log('LANG ORA=', UserStore.state.lang)
// console.log('LANG ORA=', toolsext.getLocale())
globalroutines(this, 'loadapp', '')
return riscode