Aggiornamento Traduzioni ...

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

View File

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

View File

@@ -16,11 +16,11 @@ const msg_website = {
nextzoom: 'Prossimi Zoom (Conferenze)', nextzoom: 'Prossimi Zoom (Conferenze)',
requestresetpwd: 'Richiesta Reset Password', requestresetpwd: 'Richiesta Reset Password',
vreg: 'Verifica Reg', vreg: 'Verifica Reg',
dashboard:'Lavagna', dashboard: 'Lavagna',
statoattuale:'Stato Attuale', statoattuale: 'Stato Attuale',
posizione_in_programmazione:'Lista d\'Imbarco', posizione_in_programmazione: 'Lista d\'Imbarco',
posizione_in_nave:'Lista Navi', posizione_in_nave: 'Lista Navi',
nave:'Nave', nave: 'Nave',
testimonial: 'Testimonianze', testimonial: 'Testimonianze',
Test: 'Test', Test: 'Test',
Category: 'Categorie', Category: 'Categorie',
@@ -34,13 +34,14 @@ const msg_website = {
evento: 'Evento', evento: 'Evento',
eventodef: 'Evento:', eventodef: 'Evento:',
prova: 'prova', prova: 'prova',
dbop: 'Operazioni',
statusreg: { statusreg: {
reg:'Partecipanti', reg: 'Partecipanti',
giainlista:'Gia in Lista', giainlista: 'Gia in Lista',
newreg:'Ultime Registrazioni:', newreg: 'Ultime Registrazioni:',
nationality: 'Nazionalità', nationality: 'Nazionalità',
verified:'Verificata', verified: 'Verificata',
nonverified:'Non Verificata', nonverified: 'Non Verificata',
req7: 'Con 7 passi entri nella lista d\'Imbarco', req7: 'Con 7 passi entri nella lista d\'Imbarco',
req9: 'Con 9 passi aiuti AYNI a Crescere!', req9: 'Con 9 passi aiuti AYNI a Crescere!',
req: 'Passi', req: 'Passi',
@@ -77,6 +78,59 @@ const msg_website = {
download: 'MATERIALE DISPONIBILE', 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: { es: {
pages: { pages: {
home: 'Home', home: 'Home',
@@ -94,11 +148,11 @@ const msg_website = {
nextzoom: 'Próximo Zoom (Conferencias)', nextzoom: 'Próximo Zoom (Conferencias)',
requestresetpwd: 'Solicitud de restablecimiento de contraseña', requestresetpwd: 'Solicitud de restablecimiento de contraseña',
vreg: 'Verifica Reg', vreg: 'Verifica Reg',
dashboard:'Tablero', dashboard: 'Tablero',
statoattuale:'Estado Actual', statoattuale: 'Estado Actual',
posizione_in_programmazione:'Lista de embarque', posizione_in_programmazione: 'Lista de embarque',
posizione_in_nave:'Lista de Naves', posizione_in_nave: 'Lista de Naves',
nave:'Nave', nave: 'Nave',
testimonial: 'Opiniones', testimonial: 'Opiniones',
Test: 'Test', Test: 'Test',
Category: 'Categorie', Category: 'Categorie',
@@ -106,12 +160,12 @@ const msg_website = {
Test1: 'Test1', Test1: 'Test1',
Test2: 'Test2', Test2: 'Test2',
statusreg: { statusreg: {
reg:'Participantes', reg: 'Participantes',
giainlista:'Gia in Lista', giainlista: 'Gia in Lista',
newreg:'Nuevas inscripciones :', newreg: 'Nuevas inscripciones :',
nationality: 'Nacionalidad', nationality: 'Nacionalidad',
verified:'Verificada', verified: 'Verificada',
nonverified:'No Verificada', nonverified: 'No Verificada',
req7: 'Con 7 pasos usted entra en la lista de embarque', req7: 'Con 7 pasos usted entra en la lista de embarque',
req9: 'Con 9 pasos ayuda a AYNI a crecer!', req9: 'Con 9 pasos ayuda a AYNI a crecer!',
req: 'Pasos', req: 'Pasos',
@@ -161,11 +215,11 @@ const msg_website = {
nextzoom: 'Zoom à venir (Conférences)', nextzoom: 'Zoom à venir (Conférences)',
requestresetpwd: 'Pedido de redefinição de senha', requestresetpwd: 'Pedido de redefinição de senha',
vreg: '', vreg: '',
dashboard:'Tablero', dashboard: 'Tablero',
statoattuale:'Status Atual', statoattuale: 'Status Atual',
posizione_in_programmazione:'Lista de Embarque', posizione_in_programmazione: 'Lista de Embarque',
posizione_in_nave:'Lista de Navios', posizione_in_nave: 'Lista de Navios',
nave:'Navios', nave: 'Navios',
testimonial: 'Opiniones', testimonial: 'Opiniones',
Test: 'Test', Test: 'Test',
Category: 'Categorie', Category: 'Categorie',
@@ -173,12 +227,12 @@ const msg_website = {
Test1: 'Test1', Test1: 'Test1',
Test2: 'Test2', Test2: 'Test2',
statusreg: { statusreg: {
reg:'Participantes', reg: 'Participantes',
giainlista:'Já na lista', giainlista: 'Já na lista',
newreg:'Últimas Inscrições:', newreg: 'Últimas Inscrições:',
nationality: 'Nacionalidade', nationality: 'Nacionalidade',
verified:'Verificado', verified: 'Verificado',
nonverified:'Não verificado', nonverified: 'Não verificado',
req7: 'Com 7 passos, o usuário entra na lista de embarque.', req7: 'Com 7 passos, o usuário entra na lista de embarque.',
req9: 'Com 9 passos ajudam a AYNI a crescer!', req9: 'Com 9 passos ajudam a AYNI a crescer!',
req: 'Passos', req: 'Passos',
@@ -231,11 +285,11 @@ const msg_website = {
nextzoom: 'Zoom à venir (Conférences)', nextzoom: 'Zoom à venir (Conférences)',
requestresetpwd: 'Demande de réinitialisation du mot de passe', requestresetpwd: 'Demande de réinitialisation du mot de passe',
vreg: 'Vérifier l\'inscription', vreg: 'Vérifier l\'inscription',
dashboard:'Tableau de bord', dashboard: 'Tableau de bord',
statoattuale:'Situation Actuelle', statoattuale: 'Situation Actuelle',
posizione_in_programmazione:'Liste d\'embarquement', posizione_in_programmazione: 'Liste d\'embarquement',
posizione_in_nave:'Liste des Navires', posizione_in_nave: 'Liste des Navires',
nave:'Navires', nave: 'Navires',
testimonial: 'Commentaires', testimonial: 'Commentaires',
Test: 'Test', Test: 'Test',
Category: 'Categorie', Category: 'Categorie',
@@ -243,12 +297,12 @@ const msg_website = {
Test1: 'Test1', Test1: 'Test1',
Test2: 'Test2', Test2: 'Test2',
statusreg: { statusreg: {
reg:'Participants', reg: 'Participants',
giainlista:'Gia in Lista', giainlista: 'Gia in Lista',
newreg:'Nouvelles inscriptions:', newreg: 'Nouvelles inscriptions:',
nationality: 'Nationalité', nationality: 'Nationalité',
verified:'Vérifié', verified: 'Vérifié',
nonverified:'Non Vérifié', nonverified: 'Non Vérifié',
req7: 'Avec 7 étapes, vous entrez dans la liste d\'embarquement.', req7: 'Avec 7 étapes, vous entrez dans la liste d\'embarquement.',
req9: 'Avec 9 étapes, aidez AYNI à se développer !', req9: 'Avec 9 étapes, aidez AYNI à se développer !',
req: 'Étapes', req: 'Étapes',
@@ -285,11 +339,11 @@ const msg_website = {
nextzoom: 'Upcoming Zoom (Conferences)', nextzoom: 'Upcoming Zoom (Conferences)',
requestresetpwd: 'Password Reset Request', requestresetpwd: 'Password Reset Request',
vreg: 'Check Registration', vreg: 'Check Registration',
dashboard:'Dashboard', dashboard: 'Dashboard',
statoattuale:'Current Status', statoattuale: 'Current Status',
posizione_in_programmazione:'Boarding List', posizione_in_programmazione: 'Boarding List',
posizione_in_nave:'Ships List', posizione_in_nave: 'Ships List',
nave:'Ship', nave: 'Ship',
testimonial: 'Reviews', testimonial: 'Reviews',
Test: 'Test', Test: 'Test',
Category: 'Categorie', Category: 'Categorie',
@@ -297,12 +351,12 @@ const msg_website = {
Test1: 'Test1', Test1: 'Test1',
Test2: 'Test2', Test2: 'Test2',
statusreg: { statusreg: {
reg:'Participants', reg: 'Participants',
giainlista:'Already in the List', giainlista: 'Already in the List',
newreg:'New registrations:', newreg: 'New registrations:',
nationality: 'Nationality', nationality: 'Nationality',
verified:'Verified', verified: 'Verified',
nonverified:'Not Verified', nonverified: 'Not Verified',
req7: 'With 7 steps you enter the boarding list.', req7: 'With 7 steps you enter the boarding list.',
req9: 'With 9 steps help AYNI to grow!', req9: 'With 9 steps help AYNI to grow!',
req: 'Steps', req: 'Steps',
@@ -339,9 +393,7 @@ const msg_website = {
homepage: {}, homepage: {},
pages: {}, pages: {},
msg: {}, msg: {},
text: { text: {}
}
} }
} }

View File

@@ -508,6 +508,7 @@ export function preloadedimages() {
const arrLangUsed = [ const arrLangUsed = [
'it', 'it',
'si',
'enUs', 'enUs',
'es', 'es',
'pt', 'pt',
@@ -516,10 +517,11 @@ const arrLangUsed = [
const lang_available: ILang[] = [ const lang_available: ILang[] = [
{ label: 'Italiano', icon: 'fa-flag-it', value: 'it', image: '../statics/icons/flag_it.svg', short: 'IT' }, { 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: '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: '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: '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' }, // { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' },
] ]

View File

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

View File

@@ -5,9 +5,10 @@ import { PositionResult } from 'vue-router/types/router'
import { IMyRoute, IMyRouteRecord, cfgrouter } from './route-config' import { IMyRoute, IMyRouteRecord, cfgrouter } from './route-config'
import { ProgressBar } from '@src/store/Modules/Interface' import { ProgressBar } from '@src/store/Modules/Interface'
import { isEqual } from 'lodash' import { isEqual } from 'lodash'
import { UserStore } from '@store' import { GlobalStore, UserStore } from '@store'
import { tools } from '@src/store/Modules/tools' import { tools } from '@src/store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext' import { toolsext } from '@src/store/Modules/toolsext'
import { static_data } from '@src/db/static_data'
Vue.use(VueRouter) Vue.use(VueRouter)
/* /*
@@ -15,6 +16,11 @@ Vue.use(VueRouter)
* directly export the Router instantiation * directly export the Router instantiation
*/ */
let TIMER = null
let TIMER_RITORNA = ''
let TIMER_STATE = 0
let TIMER_RESTORE = ''
const Router = new VueRouter({ const Router = new VueRouter({
scrollBehavior: () => ({ x: 0, y: 0 } as PositionResult), scrollBehavior: () => ({ x: 0, y: 0 } as PositionResult),
routes: cfgrouter.getmenu(), routes: cfgrouter.getmenu(),
@@ -50,12 +56,76 @@ Router.beforeEach(async (to: IMyRoute, from: IMyRoute, next) => {
// await LoginStore.actions.checkUserSession(); // await LoginStore.actions.checkUserSession();
// } // }
/* /*
if (!from || !to || from.matched.length <= 0) { if (!from || !to || from.matched.length <= 0) {
next() next()
return 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) { if (from.name && from.matched[0].name === to.name && from.meta.isModal) {
next() next()
@@ -64,6 +134,7 @@ Router.beforeEach(async (to: IMyRoute, from: IMyRoute, next) => {
} }
else if (from.name === to.name && isEqual(from.params, to.params)) { else if (from.name === to.name && isEqual(from.params, to.params)) {
console.log('Route interceptor log: <2>') console.log('Route interceptor log: <2>')
console.log('from e to: ', from, to)
next() next()
} else { } else {
if (!to.meta.transparent && !to.meta.isModal) { if (!to.meta.transparent && !to.meta.isModal) {
@@ -140,7 +211,6 @@ Router.beforeEach(async (to: IMyRoute, from: IMyRoute, next) => {
} }
} }
// if (to.meta.middleware) { // if (to.meta.middleware) {
// const middleware = Array.isArray(to.meta.middleware) // const middleware = Array.isArray(to.meta.middleware)
// ? to.meta.middleware // ? to.meta.middleware

View File

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