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

Aggiornamento Traduzioni ...

Browse Source
This commit is contained in:
Paolo Arena
2020-03-31 20:33:54 +02:00
parent 8bf9b504e1
commit 5f5bf7771b
6 changed files with 201 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/App.scss
View File

@@ -575,6 +575,10 @@ $heightBtn: 100%;
content: url('statics/icons/flag_sm.svg');
}
.fa-flag-ng:before {
content: url('statics/icons/flag_ng.svg');
}
.fa-flag-co:before {
content: url('statics/icons/flag_co.svg');
}
@@ -583,6 +587,10 @@ $heightBtn: 100%;
content: url('statics/icons/flag_ro.svg');
}
.fa-flag-ve:before {
content: url('statics/icons/flag_ve.svg');
}
.fa-flag-cl:before {
content: url('statics/icons/flag_cl.svg');
}

58
src/db/i18n_website.js
View File

@@ -34,6 +34,7 @@ const msg_website = {
evento: 'Evento',
eventodef: 'Evento:',
prova: 'prova',
dbop: 'Operazioni',
statusreg: {
reg: 'Partecipanti',
giainlista: 'Gia in Lista',
@@ -77,6 +78,59 @@ const msg_website = {
download: 'MATERIALE DISPONIBILE',
},
},
si: {
pages: {
home: 'Domača stran',
profile: 'Profil',
payment: 'Plačila',
regok: 'Registracija potrjena',
presentazione: 'Predstavitev',
presentazione2: 'Predstavitev',
invita: 'Povabi osebe',
SignUp: 'Nova Registracija',
SignUp2: 'Registracija',
SignIn: 'Vpis',
status: 'Statistika',
nextzoom: 'Naslednji Zoom (Conferenze)',
requestresetpwd: 'Prošnja za ponastavitev Gesla',
vreg: 'Preveri Registracijo',
dashboard:'Tabla',
statoattuale:'TrenutniStatus',
posizione_in_programmazione:'Seznam \'Plovbe',
posizione_in_nave:'Seznam Ladiji',
nave:'Ladje',
Admin: 'Administrator',
evento: 'Dogodek',
eventodef: 'Dogodek:',
statusreg: {
reg:'Udeleženci',
giainlista:'Že na seznamu',
newreg:'Zadnje Registracije:',
nationality: 'Nacionalnost',
verified:'Preveri',
nonverified:'Ni preverjeno',
req7: 'Z 7 koraki vstopis na seznam za \'plovbo',
req9: 'Z 9-imi koraki pomagaš, da AYNI Raste!',
req: 'Koraki',
people: 'Pov.',
peoplelegend: 'Število \'Povabljenih'
}
},
msg: {
myAppNameShort: 'Ayni',
myAppName: 'Ayni',
myAppDescription: 'Ayni',
keywords_base: 'Ayni',
myDescriz: '',
sottoTitoloApp: '',
sottoTitoloApp2: '',
sottoTitoloApp3: '',
sottoTitoloApp4: '',
},
homepage: {
titlecontatti: 'Kontakt',
},
},
es: {
pages: {
home: 'Home',
@@ -339,9 +393,7 @@ const msg_website = {
homepage: {},
pages: {},
msg: {},
text: {
}
text: {}
}
}

4
src/db/static_data.ts
View File

@@ -508,6 +508,7 @@ export function preloadedimages() {
const arrLangUsed = [
'it',
'si',
'enUs',
'es',
'pt',
@@ -516,10 +517,11 @@ const arrLangUsed = [
const lang_available: ILang[] = [
{ label: 'Italiano', icon: 'fa-flag-it', value: 'it', image: '../statics/icons/flag_it.svg', short: 'IT' },
{ label: 'Slovenski', icon: 'fa-flag-si', value: 'si', image: '../statics/icons/flag_si.svg', short: 'SI' },
{ label: 'English', icon: 'fa-flag-us', value: 'enUs', image: '../statics/icons/flag_gb.svg', short: 'EN' },
{ label: 'Español', icon: 'fa-flag-es', value: 'es', image: '../statics/icons/flag_es.svg', short: 'ES' },
{ label: 'Português', icon: 'fa-flag-pt', value: 'pt', image: '../statics/icons/flag_pt.svg', short: 'PT' },
{ label: 'Français', icon: 'fa-flag-fr', value: 'fr', image: '../statics/icons/flag_fr.svg', short: 'FR' }
{ label: 'Français', icon: 'fa-flag-fr', value: 'fr', image: '../statics/icons/flag_fr.svg', short: 'FR' },
// { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' },
]

3
src/root/home/home.vue
View File

@@ -15,13 +15,14 @@
<q-img src="statics/images/background.jpg" class="logo"></q-img>
</div>
<!--
<div class="row justify-center">
<div class="text-h5 boldhigh text-uppercase"> {{ $t('event.dateTimeStart') }}</div>
</div>
<div class="text-center">
<q-img src="statics/images/data_start.jpg" class="data_start"></q-img>
</div>
-->
<div v-if="isLogged">
<CVerifyEmail v-if="!isEmailVerified">

74
src/router/index.ts
View File

@@ -5,9 +5,10 @@ import { PositionResult } from 'vue-router/types/router'
import { IMyRoute, IMyRouteRecord, cfgrouter } from './route-config'
import { ProgressBar } from '@src/store/Modules/Interface'
import { isEqual } from 'lodash'
import { UserStore } from '@store'
import { GlobalStore, UserStore } from '@store'
import { tools } from '@src/store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
import { static_data } from '@src/db/static_data'
Vue.use(VueRouter)
/*
@@ -15,6 +16,11 @@ Vue.use(VueRouter)
* directly export the Router instantiation
*/
let TIMER = null
let TIMER_RITORNA = ''
let TIMER_STATE = 0
let TIMER_RESTORE = ''
const Router = new VueRouter({
scrollBehavior: () => ({ x: 0, y: 0 } as PositionResult),
routes: cfgrouter.getmenu(),
@@ -56,6 +62,70 @@ Router.beforeEach(async (to: IMyRoute, from: IMyRoute, next) => {
return
}
*/
// console.log('LOAD from e to: ', from, to)
if (!!GlobalStore) {
if (!GlobalStore.state.finishLoading) {
let eseguicheck = true
// Controlla se c'è nella lista allora non eseguire il controllo:
for (const route of static_data.routes) {
if (route.path === to.path) {
eseguicheck = false
break
}
}
if (eseguicheck) {
if (!TIMER && to.path !== '/') {
// console.log('TIMER')
TIMER = setInterval(() => {
// console.log('SETINTERVAL')
if (GlobalStore.state.finishLoading) {
if (!!TIMER) {
// console.log('TIMER_STATE', TIMER_STATE, 'TIMER_RITORNA', TIMER_RITORNA)
if (TIMER_STATE === 2) {
clearInterval(TIMER)
TIMER = null
// console.log('TERMINA INTERVALLO')
// next('/prova')
// return
}
if (TIMER_RITORNA !== '') {
next(TIMER_RITORNA)
TIMER_STATE = 2
return
} else {
if (TIMER_STATE === 0) {
TIMER_RESTORE = to.path
next('/')
TIMER_STATE = 1
return
}
}
}
}
}, 200)
}
}
}
if (GlobalStore.state.finishLoading) {
if (!!TIMER) {
// console.log('TIMER_STATE', TIMER_STATE, 'to.path', to.path)
if (TIMER_RITORNA === '' && TIMER_RESTORE !== '') {
TIMER_RITORNA = TIMER_RESTORE
// onsole.log('TIMER_RITORNA', TIMER_RITORNA)
}
}
}
// await tools.aspettansec(4000)
}
if (from.name && from.matched[0].name === to.name && from.meta.isModal) {
next()
@@ -64,6 +134,7 @@ Router.beforeEach(async (to: IMyRoute, from: IMyRoute, next) => {
}
else if (from.name === to.name && isEqual(from.params, to.params)) {
console.log('Route interceptor log: <2>')
console.log('from e to: ', from, to)
next()
} else {
if (!to.meta.transparent && !to.meta.isModal) {
@@ -140,7 +211,6 @@ Router.beforeEach(async (to: IMyRoute, from: IMyRoute, next) => {
}
}
// if (to.meta.middleware) {
// const middleware = Array.isArray(to.meta.middleware)
// ? to.meta.middleware

6
src/router/route-config.ts
View File

@@ -43,6 +43,12 @@ export const cfgrouter = {
const arrroutes: IListRoutes[] = []
console.log('GETMENU')
if (!!GlobalStore) {
GlobalStore.actions.addDynamicPages()
}
for (const route of static_data.routes) {
tools.addRoute(arrroutes, route)
}