From e513118cbcdba75e536cf475968aceb4e5453ed6 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Tue, 31 Mar 2020 20:34:49 +0200 Subject: [PATCH] Aggiornamento Traduzioni ... --- src/components/CGuidelines/CGuidelines.vue | 1887 +++++++++-------- src/components/CMyNave/CMyNave.scss | 18 + src/components/CMyNave/CMyNave.ts | 92 +- src/components/CMyNave/CMyNave.vue | 123 +- src/components/CStatus/CStatus.ts | 2 +- src/components/CVideoPromo/CVideoPromo.vue | 7 +- src/components/Header/Header.ts | 8 +- src/components/PagePolicy/PagePolicy.vue | 126 +- src/model/GlobalStore.ts | 2 + .../admin/listadoninavi/listadoninavi.ts | 21 +- .../admin/listadoninavi/listadoninavi.vue | 59 +- src/rootgen/admin/tablesList/tablesList.vue | 2 +- src/statics/i18n.js | 7 + src/statics/lang/enUs.js | 58 +- src/statics/lang/es.js | 80 +- src/statics/lang/fr.js | 66 +- src/statics/lang/it.js | 24 +- src/statics/lang/italiano.txt | 602 ++++++ src/statics/lang/pt.js | 4 +- src/statics/lang/si.js | 487 +++++ src/statics/lang/sloveno.txt | 487 +++++ src/statics/lang/sloveno_parte3_server.txt | 54 + src/store/Modules/GlobalStore.ts | 64 +- src/store/Modules/UserStore.ts | 23 + src/store/Modules/fieldsTable.ts | 1 + src/store/Modules/tools.ts | 19 +- src/views/admin/dbop/dbop.ts | 2 +- src/views/admin/dbop/dbop.vue | 16 +- 28 files changed, 3362 insertions(+), 979 deletions(-) create mode 100755 src/statics/lang/italiano.txt create mode 100644 src/statics/lang/si.js create mode 100644 src/statics/lang/sloveno.txt create mode 100644 src/statics/lang/sloveno_parte3_server.txt diff --git a/src/components/CGuidelines/CGuidelines.vue b/src/components/CGuidelines/CGuidelines.vue index 635f09b..a24d77f 100755 --- a/src/components/CGuidelines/CGuidelines.vue +++ b/src/components/CGuidelines/CGuidelines.vue @@ -1,876 +1,1087 @@ diff --git a/src/components/CMyNave/CMyNave.scss b/src/components/CMyNave/CMyNave.scss index cf0234b..0dece24 100755 --- a/src/components/CMyNave/CMyNave.scss +++ b/src/components/CMyNave/CMyNave.scss @@ -67,6 +67,9 @@ font-weight: bold; width: 100px; } +.passoint{ + width: 90px; +} .gift{ margin: 4px; @@ -89,6 +92,21 @@ color: blue; } +.titlenave{ + width: 55px; + text-align: center; +} + +.datanave{ + width: 80px; + text-align: center; +} + +.datanave_int{ + width: 60px; + text-align: center; +} + .dati { color: blue; font-size: 1.25rem; diff --git a/src/components/CMyNave/CMyNave.ts b/src/components/CMyNave/CMyNave.ts index 5eec479..1b965cf 100755 --- a/src/components/CMyNave/CMyNave.ts +++ b/src/components/CMyNave/CMyNave.ts @@ -167,6 +167,9 @@ export default class CMyNave extends MixinNave { } public getNavePartByInd(ind) { + + this.getrigaNaveByInd(ind) + if (!!this.navi_partenza[ind]) return tools.getstrshortDate(this.navi_partenza[ind].date_start) else @@ -407,10 +410,19 @@ export default class CMyNave extends MixinNave { } public gettitlenave(ind) { + let ris = '' if (ind === 1) return this.getRiganave(this.nave.riga) + '.' + this.getColnave(this.nave.col) - else - return (this.getrigaNaveByInd(ind)) + '.x' + else { + ris = (this.getrigaNaveByInd(ind)) + '.' + this.getcolNaveByInd(ind) + } + let add = '' + // for (let index = 0; index < (4 - ris.length); index++) { + // add += ' ' + // } + + ris = add + ris + return ris } public getdatanave(rec) { @@ -425,13 +437,37 @@ export default class CMyNave extends MixinNave { } } - return this.getNavePartByInd(rec.ind) + const riga = this.getrigaNaveByInd(rec.ind) + const col = this.getcolNaveByInd(rec.ind) + const mynavepart = this.getnavePartenzaByRigaCol(riga, col) + if (!!mynavepart) { + if (!!mynavepart.date_start) + return tools.getstrshortDate(mynavepart.date_start) + } + return ' --/-- ' + // return this.getNavePartByInd(rec.ind) + } + + public getnavePartenzaByRigaCol(riga, col) { + for (const mynave of this.navi_partenza) { + if (!!mynave) { + if ((mynave.riga === riga) && (mynave.col === col)) { + return mynave + } + } + } + return null } public getrigaNaveByInd(ind) { return this.getRiganave(this.nave.riga + ind - 1) } + public getcolNaveByInd(ind) { + const miacol = this.nave.col * Math.pow(2, ind - 1) + return this.getColnave(miacol) + } + public NaveeseguitabyInd(riga) { return (this.riga >= riga) } @@ -451,14 +487,23 @@ export default class CMyNave extends MixinNave { // console.log('this.rigadoni', this.rigadoni, 'ind', rec.ind) if (!rec.ind) return '' + + const riga = this.getrigaNaveByInd(rec.ind) + const col = this.getcolNaveByInd(rec.ind) + const mynavepart = this.getnavePartenzaByRigaCol(riga, col) + if (!!mynavepart) { + if (mynavepart.DoniConfermati > 0) { + return 'fas fa-gift' + } + } if (this.rigadoni >= this.getrigaNaveByInd(rec.ind)) { - return 'fas fa-gift' + // return 'fas fa-gift' } } public async InviaMsgANave(msgobj, navemediatore) { - let msgtitle = translate('dashboard.invia_link_chat') + let msgtitle = translate('dashboard.controlla_donatori') let msginvia = msgtitle if (msgobj.inviareale) { msgtitle = translate('dashboard.invia_link_chat') @@ -506,11 +551,11 @@ export default class CMyNave extends MixinNave { } public gettitlemediatore() { - return this.getdatastr(this.partenza_primo_donatore()) + ' ' + 'NAVE' + ' ' + this.mediatore.riga + '.' + this.mediatore.col + ' ' + '🎁' + 'AYNI' + return this.getdatastr(this.partenza_primo_donatore()) + ' ' + this.$t('dashboard.nave') + ' ' + this.getisProvvisoriaMediatoreStr() + this.mediatore.riga + '.' + this.mediatore.col + ' ' + '🎁' + 'AYNI' } public gettitledonatore() { - return this.getdatastr(this.donatore_navepers.date_start) + ' ' + 'NAVE' + ' ' + this.donatore_navepers.riga + '.' + this.donatore_navepers.col + ' ' + '🎁' + 'AYNI' + return this.getdatastr(this.donatore_navepers.date_start) + ' ' + this.$t('dashboard.nave') + ' ' + this.getisProvvisoriaStr() + this.donatore_navepers.riga + '.' + this.donatore_navepers.col + ' ' + '🎁' + 'AYNI' } public gettesto() { @@ -518,17 +563,46 @@ export default class CMyNave extends MixinNave { } public getisProvvisoriaStr() { + let istemp = false + if (!!this.donatore_navepers) { if (this.donatore_navepers.provvisoria) { - return ' Temporanea ' + istemp = true } + } else { + istemp = true + } + if (istemp) { + return ' ' + this.$t('dashboard.temporanea') + ' ' } return '' } + public getisProvvisoriaMediatoreStr() { + let istemp = false + + if (!!this.mediatore_navepers) { + if (this.mediatore_navepers.provvisoria) { + istemp = true + } + } else { + istemp = true + } + if (istemp) { + return ' ' + this.$t('dashboard.temporanea') + ' ' + } + return '' + } + + public isDefinitivaMediatore() { + if (!!this.mediatore_navepers) + return (!this.mediatore_navepers.provvisoria) + return false + } + public getindex(recdonatore, index) { if (recdonatore.ind_order === this.nave.rec.donatore.recmediatore.ind_order && (recdonatore.num_tess === 2)) - return 'TESS' + return this.$t('dashboard.ritessitura') return 'D' + (index) } diff --git a/src/components/CMyNave/CMyNave.vue b/src/components/CMyNave/CMyNave.vue index 8f43cfb..0b6e7ad 100755 --- a/src/components/CMyNave/CMyNave.vue +++ b/src/components/CMyNave/CMyNave.vue @@ -21,8 +21,8 @@ align="justify" narrow-indicator > - - + + @@ -31,14 +31,14 @@ {{getposizione()}} -
+
N
-
Nome
dei Passaggi
+
-
Nave
-
Data
Partenza
-
Doni
Inviati
+
{{$t('dashboard.nave')}}
+
+
@@ -53,12 +53,12 @@
-
+
- {{ gettitlenave(rec.ind) }} +
-
+
{{ getdatanave(rec) }} @@ -74,7 +74,7 @@
-
SOGNATORI:
+
{{$t('dashboard.sognatori')}}:
A{{3 - index}} - {{ sognatore.name }} {{ sognatore.surname }} @@ -82,7 +82,7 @@
-
MEDIATORE:
+
{{$t('dashboard.mediatore')}}:
{{ nave.rec.mediatore.recmediatore.name }} {{ nave.rec.mediatore.recmediatore.surname }} ({{ @@ -90,7 +90,7 @@
-
INTERMEDIO3:
+
{{$t('dashboard.intermedio')}}3:
B{{index + 1}} - {{ terra.name }} {{ terra.surname }} ({{ terra.username }}) @@ -100,7 +100,7 @@
-
INTERMEDIO2:
+
{{$t('dashboard.intermedio')}}2:
C{{index + 1}} - {{ aria.name }} {{ aria.surname }} ({{ aria.username }}) - @@ -109,7 +109,7 @@
-
DONATORI:
+
{{$t('dashboard.donatori')}}:
{{ getindex(donatore, index + 1) }} - {{ donatore.name }} {{ donatore.surname }} @@ -122,27 +122,30 @@
-
+
- +
+ - + -
- +
+ - + +
+
@@ -157,8 +160,8 @@ narrow-indicator > - - + + @@ -168,7 +171,7 @@
-
SOGNATORI:
+
{{$t('dashboard.sognatori')}}:
A{{3 - index}} - {{ sognatore.name }} {{ sognatore.surname }} @@ -176,7 +179,7 @@
-
MEDIATORE:
+
{{$t('dashboard.mediatore')}}:
{{ nave.rec.donatore.recmediatore.name }} {{ nave.rec.donatore.recmediatore.surname }} ({{ @@ -184,7 +187,7 @@
-
INTERMEDIO3:
+
{{$t('dashboard.intermedio')}}3:
B{{index + 1}} - {{ terra.name }} {{ terra.surname }} ({{ terra.username @@ -194,7 +197,7 @@
-
INTERMEDIO2:
+
{{$t('dashboard.intermedio')}}2:
C{{index + 1}} - {{ aria.name }} {{ aria.surname }} ({{ aria.username @@ -203,7 +206,7 @@
-
DONATORI:
+
{{$t('dashboard.donatori')}}:
@@ -224,7 +227,7 @@
- Per entrare nella Gift Chat, clicca qui:
+ {{$t('dashboard.gift_chat')}}:
-
Quando effettuare il Regalo: {{ getGiornoDelDono() }}
+
{{$t('dashboard.quando_eff_il_tuo_dono')}}: {{ getGiornoDelDono() }}
- Metodi Disponibili: + {{$t('dashboard.metodi_disponibili')}}:
- Importo: 33€ + {{$t('dashboard.importo')}}: 33€

+ + + + + + + +
-
- - E' arrivato il momento di Effettuare il proprio Dono!
- Inviare tramite PayPal a: {{ getemailPagamentoSognatore() - }}
- (Scegliere l'opzione "Invia ad Amici")
- - - - - - - +
{{$t('dashboard.clicca_conferma_dono')}}:
@@ -329,30 +328,30 @@
- Doni Ricevuti: + {{$t('dashboard.doni_ricevuti')}}:
{{getDoniConfermati()}}
- Doni Inviati (da confermare): + {{$t('dashboard.doni_inviati_da_confermare')}}:
{{getDoniAttesaDiConferma()}}
- Doni Mancanti: + {{$t('dashboard.doni_mancanti')}}:
{{getDoniMancanti()}}
-