Strutturato le Traduzioni del Sito Specifico

Inizio creazione di SalviamoIlPianeta.app

src/components/CMyDashboard/CMyDashboard.vue

@@ -163,7 +163,7 @@
         <div class="row items-center q-pa-xs">
           <CCardState :mytext="$t('pages.statusreg.req')" :myval="9" :myperc="100" size="50px" size_mob="40px"
                       fontsize="0.75rem" myclass="my-card-small-stat" mycolor="green"></CCardState>
-          <div class="bg-blue text-white clBorderxs q-ml-sm">{{$t('pages.statusreg.req9')}}</div>
+          <div class="bg-blue text-white clBorderxs q-ml-sm">{{$t('pages.statusreg.req9', {sitename: $t('ws.sitename')})}}</div>
         </div>
         <div class="row items-center q-pa-xs">
           <CCardState :mytext="$t('pages.statusreg.people')" :myval="2" :myperc="100" size="50px" size_mob="40px"

src/components/CMyNave/CMyNave.ts

@@ -628,11 +628,11 @@ export default class CMyNave extends MixinNave {
   }
 
   public gettitlemediatore() {
-    return this.getdatastr(this.partenza_primo_donatore()) + ' ' + this.$t('dashboard.nave') + ' ' + this.getisProvvisoriaMediatoreStr() + 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 + ' ' + '🎁' + this.$t('ws.sitename')
   }
 
   public gettitledonatore() {
-    return this.getdatastr(this.donatore_navepers.date_start) + ' ' + this.$t('dashboard.nave') + ' ' + this.getisProvvisoriaStr() + 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 + ' ' + '🎁' + this.$t('ws.sitename')
   }
 
   public gettesto() {

src/components/CMyNave/CMyNave.vue

@@ -472,7 +472,7 @@
                                         </q-btn>
                                     </div>
                                     <div class="q-ma-sm text-center clBorderSteps">
-                                        <div>TELEGRAM AYNI BOT {{$t('dialog.sendmsg')}} -> {{seluser.name }} {{
+                                        <div>TELEGRAM {{$t('ws.sitename')}} BOT {{$t('dialog.sendmsg')}} -> {{seluser.name }} {{
                                             seluser.surname }}:
                                         </div>
                                         <q-input type="textarea"

src/components/CMyPage/CMyPage.ts

@@ -29,9 +29,9 @@ export default class CMyPage extends Vue {
 
   // public metaInfo() {
   //   return {
-  //     // title: this.$t('msg.myAppName'),
+  //     // title: this.$t('ws.sitename'),
   //     title: 'PROVA TITOLOOOOOOO!!!!!!!!!!!!!!!!!!!!**************************',
-  //     titleTemplate: (title) => `${this.title} - ${this.$t('msg.myAppName')}`,
+  //     titleTemplate: (title) => `${this.title} - ${this.$t('ws.sitename')}`,
   //     meta: {
   //       keywords: { name: 'keywords', content: this.keywords },
   //       description: { name: 'description', content: this.description },

src/components/CMyRequirement/CMyRequirement.vue

@@ -11,7 +11,7 @@
 
         <div v-if="!isextralist(seluser)">
           <div v-for="(req, index) of arrrequisiti">
-            <CRequisito :icon="req.icon" :text="(index + 1) + `. ` + $t(req.textlang) + req.textadd(seluser)"
+            <CRequisito :icon="req.icon" :text="(index + 1) + `. ` + $t(req.textlang, {botname: $t('ws.botname')}) + req.textadd(seluser)"
                         :icon_error="geticonerror(true)"
                         :no_check="false"
                         :isok="req.isok(seluser)"
@@ -82,7 +82,7 @@
 
           <div v-if="!isextralist(seluser)">
             <div v-for="(req, index) of arrrequisiti_liberi">
-              <CRequisito :icon="req.icon" :text="$t(req.textlang) + req.textadd(seluser)"
+              <CRequisito :icon="req.icon" :text="$t(req.textlang, {botname: $t('ws.botname')}) + req.textadd(seluser)"
                           :icon_error="geticonerror(false)"
                           :no_check="true"
                           :isok="req.isok(seluser)"

src/components/CSignUpNotevole/CSignUpNotevole.ts

@@ -47,11 +47,6 @@ export default class CSignUpNotevole extends MixinBase {
   public duplicate_username: boolean = false
   public showdisclaimer: boolean = false
 
-  public options = [
-    { label: 'Sono già registrato sulla Chat di Ayni', value: true, color: 'green' },
-    { label: 'Nuova Registrazione', value: false, color: 'blue' },
-  ]
-
   public signup: ISignupOptions = {
     email: process.env.TEST_EMAIL || '',
     username: process.env.TEST_USERNAME || '',
@@ -288,9 +283,6 @@ export default class CSignUpNotevole extends MixinBase {
   }
 
   get gettitlereg() {
-    if (!this.nuovareg)
-      return this.$t('pages.SignUp_alreadylista')
-    else
-      return this.$t('pages.SignUp')
+    return this.$t('pages.SignUp')
   }
 }

src/components/CSignUpNotevole/CSignUpNotevole.vue

@@ -255,7 +255,7 @@
         <q-card-section class="inset-shadow">
           <PagePolicy
             owneremail="ayni.gifteconomy@gmail.com"
-            SiteName="Ayni"
+            :SiteName="$t('ws.sitename')"
             ownerDataName="Ayni"
             managerData="Ayni"
             includeData="dati anagrafici (ragione sociale, nome, cognome), recapiti (telefono, indirizzo email)"

src/components/CSignUpSIP/CSignUp-validate.ts

@@ -0,0 +1,43 @@
+import { ISignupOptions } from 'model'
+import { email, minLength, required, sameAs } from 'vuelidate/lib/validators'
+// import { ValidationRuleset } from 'vuelidate'
+import { complexity, registeredemail, registereduser, aportadorexist } from '../../validation'
+
+export interface TSignup { signup: ISignupOptions, validationGroup: string[] }
+
+export const validations = {
+  signup: {
+    repeatPassword: {
+      required,
+      sameAsPassword: sameAs('password')
+    },
+    password: {
+      required,
+      minLength: minLength(8),
+      complexity
+    },
+    username: {
+      required,
+      minLength: minLength(6),
+      registereduser
+    },
+    name: {
+      required
+    },
+    surname: {
+      required
+    },
+    email: {
+      email,
+      registeredemail,
+      required
+    },
+    terms: {
+      required
+    },
+    aportador_solidario: {
+      aportadorexist,
+      required
+    }
+  }
+}

src/components/CSignUpSIP/CSignUpSIP.scss

@@ -0,0 +1,34 @@
+.signup {
+  width: 100%;
+  margin: 0 auto;
+  max-width: 450px;
+}
+
+
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.clCellCode {
+  border-radius: 32px;
+  border-right: #2d2260;
+  height: 50px;
+  font-size: 1rem;
+  padding: 8px;
+}
+
+.clCell {
+  border-radius: 32px;
+  border-right: #2d2260;
+  height: 50px;
+  font-size: 1rem;
+  padding: 8px;
+}
+
+.vue-country-select{
+  border-radius: 32px;
+}
+
+

src/components/CSignUpSIP/CSignUpSIP.ts

@@ -0,0 +1,289 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+import { UserStore } from '@store'
+import { tools } from '../../store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+
+import { ISignupOptions, IUserState, IUserFields } from 'model'
+import { validations, TSignup } from './CSignUp-validate'
+
+import { validationMixin } from 'vuelidate'
+
+import { Logo } from '../../components/logo'
+import { DefaultProfile } from '../../store/Modules/UserStore'
+
+import 'vue-country-code/dist/vue-country-code.css'
+import { serv_constants } from '@src/store/Modules/serv_constants'
+
+import VueCountryCode from 'vue-country-code'
+import { registereduser } from '../../validation'
+import MixinBase from '../../mixins/mixin-base'
+import { CTitleBanner } from '../CTitleBanner'
+import { PagePolicy } from '../PagePolicy'
+
+Vue.use(VueCountryCode)
+// import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
+
+@Component({
+  name: 'CSignUp',
+  mixins: [validationMixin],
+  validations,
+  components: { Logo, CTitleBanner, PagePolicy }
+})
+
+export default class CSignUpSIP extends MixinBase {
+  @Prop({ required: false, default: false }) public showadultcheck: boolean
+  @Prop({ required: false, default: false }) public showcell: boolean
+  @Prop({ required: false, default: false }) public showaportador: boolean
+  @Prop({ required: false, default: false }) public shownationality: boolean
+
+  public $v
+  public $q
+  public $t: any
+  public countryname: string = ''
+  public iamadult: boolean = false
+
+  public duplicate_email: boolean = false
+  public duplicate_username: boolean = false
+  public showdisclaimer: boolean = false
+
+
+  public signup: ISignupOptions = {
+    email: process.env.TEST_EMAIL || '',
+    username: process.env.TEST_USERNAME || '',
+    name: process.env.TEST_NAME || '',
+    surname: process.env.TEST_SURNAME || '',
+    password: process.env.TEST_PASSWORD || '',
+    repeatPassword: process.env.TEST_PASSWORD || '',
+    terms: !process.env.PROD,
+    profile: DefaultProfile,
+    aportador_solidario: process.env.TEST_APORTADOR,
+  }
+
+  public created() {
+    this.$v.$reset()
+
+    this.signup.aportador_solidario = this.$route.params.invited
+
+    console.log('1) aportador_solidario', this.signup.aportador_solidario)
+
+    if (!this.signup.aportador_solidario)
+      this.signup.aportador_solidario = tools.getCookie(tools.APORTADOR_SOLIDARIO, this.signup.aportador_solidario)
+
+    if (!this.signup.aportador_solidario || this.signup.aportador_solidario === 'undefined') {
+      this.signup.aportador_solidario = tools.APORTADOR_NONE
+    }
+    this.$v.signup.aportador_solidario.$touch()
+
+    console.log('this.signup.aportador_solidario', this.signup.aportador_solidario)
+  }
+
+  // @Watch('signup.already_registered')
+  // public changealreadyreg() {
+  //   if (this.signup.already_registered) {
+  //     this.signup.aportador_solidario = tools.APORTADOR_NONE
+  //   } else {
+  //     this.signup.aportador_solidario = this.$route.params.invited
+  //   }
+  //   this.$v.signup.aportador_solidario.$touch()
+  // }
+
+  @Watch('$route.params.invited')
+  public changeaportador() {
+    if (this.showaportador) {
+      console.log('changeaportador', this.$route.params.invited)
+      if (!this.signup.aportador_solidario)
+        this.signup.aportador_solidario = this.$route.params.invited
+    }
+  }
+
+  get allowSubmit() {
+
+    let error = this.$v.$error || this.$v.$invalid
+
+    if (this.showadultcheck)
+      error = error || !this.iamadult
+
+    if (this.showcell)
+      error = error || this.signup.profile.cell.length <= 6
+
+    return !error
+  }
+
+  /*
+  validations: {
+    isAsync: true,
+    form: {
+      email: {
+        required, email,
+        isUnique: value => {
+          if (value === '') return true;
+          return axios.get(process.env.MONGODB_HOST + '/email/' + value)
+            .then(res => {
+              return (res.status !== 200)
+            }).catch((e) => {
+              return true;
+            })
+        }
+      },
+      password: {required, minLength: minLength(8), maxLength: maxLength(20)},
+      username: {
+        required, minLength: minLength(6), maxLength: maxLength(20),
+        isUnique: value => {
+          if (value === '') return true;
+          return axios.get(process.env.MONGODB_HOST + '/users/' + value)
+            .then(res => {
+              return (res.status !== 200)
+            }).catch((e) => {
+              return true;
+            })
+        }
+      },
+      repeatPassword: {
+        sameAsPassword: sameAs('password')
+      },
+      terms: {required},
+
+    }
+  }, */
+  public env() {
+    return process.env
+  }
+
+  public errorMsg(cosa: string, item: any) {
+    try {
+      if (!item.$error) {
+        return ''
+      }
+      // console.log('errorMsg', cosa, item)
+      if (item.$params.email && !item.email) {
+        return this.$t('reg.err.email')
+      }
+
+      if (cosa === 'repeatpassword') {
+        if (!item.sameAsPassword) {
+          return this.$t('reg.err.sameaspassword')
+        }
+      }
+
+      // console.log('item', item)
+
+      if (item.minLength !== undefined) {
+        if (!item.minLength) {
+          return this.$t('reg.err.atleast') + ` ${item.$params.minLength.min} ` + this.$t('reg.err.char')
+        }
+      }
+      if (item.complexity !== undefined) {
+        if (!item.complexity) {
+          return this.$t('reg.err.complexity')
+        }
+      }
+// if (!item.maxLength) { return this.$t('reg.err.notmore') + ` ${item.$params.maxLength.max} ` + this.$t('reg.err.char') }
+
+      if (item.required !== undefined) {
+        if (!item.required) {
+          return this.$t('reg.err.required')
+        }
+      }
+
+      // console.log('    ....avanti')
+      if (cosa === 'email') {
+        // console.log("EMAIL " + item.isUnique);
+        // console.log(item);
+        if (!item.isUnique) {
+          return this.$t('reg.err.duplicate_email')
+        }
+      } else if (cosa === 'username') {
+        // console.log(item);
+        if (!item.isUnique) {
+          return this.$t('reg.err.duplicate_username')
+        }
+      } else if (cosa === 'aportador_solidario') {
+        // console.log(item);
+        if (!item.aportadorexist) {
+          // console.log('!item.aportadorexist !')
+          return this.$t('reg.err.aportador_not_exist')
+        }
+      } else if ((cosa === 'name') || (cosa === 'surname')) {
+        // console.log(item);
+      }
+
+      return ''
+    } catch (error) {
+      // console.log("ERR : " + error);
+    }
+  }
+
+  public submitOk() {
+    this.$v.signup.$touch()
+
+    this.signup.username = tools.removespaces(this.signup.username)
+
+    this.duplicate_email = false
+    this.duplicate_username = false
+
+    if (!this.signup.terms) {
+      tools.showNotif(this.$q, this.$t('reg.err.terms'))
+      return
+    }
+
+    if (this.$v.signup.$error) {
+      tools.showNotif(this.$q, this.$t('reg.err.errore_generico'))
+      return
+    }
+
+    this.signup.name = tools.CapitalizeAllWords(this.signup.name).trim()
+    this.signup.surname = tools.CapitalizeAllWords(this.signup.surname).trim()
+    this.signup.profile.cell = tools.removespaces(this.signup.profile.cell).trim()
+    this.signup.profile.intcode_cell = this.signup.profile.intcode_cell.trim()
+
+    this.$q.loading.show({ message: this.$t('reg.incorso') })
+
+    console.log(this.signup)
+    return UserStore.actions.signup(tools.clone(this.signup))
+      .then((ris) => {
+        if (tools.SignUpcheckErrors(this, ris.code, ris.msg))
+          this.$q.loading.hide()
+      }).catch((error) => {
+        console.log('ERROR = ' + error)
+        this.$q.loading.hide()
+      })
+
+  }
+
+  public intcode_change(coderec) {
+    // console.log('intcode', coderec)
+    this.signup.profile.intcode_cell = '+' + coderec.dialCode
+    this.signup.profile.iso2_cell = coderec.iso2
+  }
+
+  public selectcountry({ name, iso2, dialCode }) {
+    // console.log(name, iso2, dialCode)
+    this.signup.profile.nationality = iso2
+    this.countryname = name
+  }
+
+  public inputUsername(value) {
+    this.signup.username = value.trim()
+  }
+
+  get nuovareg() {
+    return (this.signup.aportador_solidario !== tools.APORTADOR_NONE)
+  }
+
+  get getplaceholdercell() {
+    if (this.signup.aportador_solidario !== tools.APORTADOR_NONE)
+      return this.$t('reg.cell')
+    else
+      return this.$t('reg.cellreg')
+  }
+
+  get regvisibile() {
+    return true
+    // return this.signup.already_registered || (!this.signup.already_registered && this.signup.aportador_solidario)
+  }
+
+  get gettitlereg() {
+      return this.$t('pages.SignUp')
+  }
+}

src/components/CSignUpSIP/CSignUpSIP.vue

@@ -0,0 +1,282 @@
+<template>
+    <div>
+        <div class="text-center">
+            <p>
+                <logo mystyle="height:200px;"></logo>
+                <CTitleBanner :title="gettitlereg"></CTitleBanner>
+            </p>
+        </div>
+
+        <q-banner
+                v-if="!nuovareg"
+                rounded
+                class="bg-primary text-white"
+                style="text-align: center; font-size:1rem;">
+            <span class="mybanner" v-html="$t('reg.reg_lista_prec')"></span>
+        </q-banner>
+
+        <br>
+        <q-banner
+                v-if="!nuovareg"
+                rounded
+                class="bg-warning text-black"
+                style="text-align: center; font-size:1rem;">
+            <span class="mybanner">{{ $t('reg.nuove_registrazioni')}}</span>
+        </q-banner>
+
+        <!--Prova URL :  {{env('PROVA_PAOLO')}}-->
+
+        <div class="q-gutter-sm">
+
+            <!--<q-option-group-->
+            <!--:options="options"-->
+            <!--label="Notifications"-->
+            <!--type="radio"-->
+            <!--v-model="signup.already_registered"-->
+            <!--&gt;</q-option-group>-->
+
+            <!--<q-toggle dark color="green"
+                      v-model="signup.already_registered"
+                      :label="$t('reg.already_registered')">
+            </q-toggle>-->
+            <br>
+
+            <q-input
+                    v-if="showaportador && signup.aportador_solidario !== tools.APORTADOR_NONE"
+                    bg-color="lightblue"
+                    :readonly="true"
+                    v-model="signup.aportador_solidario"
+                    rounded outlined
+                    @blur="$v.signup.aportador_solidario.$touch"
+                    :error="$v.signup.aportador_solidario.$error"
+                    :error-message="errorMsg('aportador_solidario', $v.signup.aportador_solidario)"
+                    maxlength="20"
+                    debounce="1000"
+
+                    :label="$t('reg.aportador_solidario')">
+
+                <template v-slot:prepend>
+                    <q-icon name="person"/>
+                </template>
+
+            </q-input>
+
+            <div v-if="regvisibile">
+                <q-input
+                        v-model="signup.email"
+                        rounded outlined
+                        @blur="$v.signup.email.$touch"
+                        :error="$v.signup.email.$error"
+                        :error-message="errorMsg('email', $v.signup.email)"
+                        @keydown.space="(event) => event.preventDefault()"
+                        maxlength="50"
+                        debounce="1000"
+                        :label="$t('reg.email')">
+
+                    <template v-slot:prepend>
+                        <q-icon name="email"/>
+                    </template>
+
+                </q-input>
+
+                <q-input
+                        v-model="signup.username"
+                        rounded outlined
+                        @blur="$v.signup.username.$touch"
+                        :error="$v.signup.username.$error"
+                        @keydown.space="(event) => event.preventDefault()"
+                        maxlength="20"
+                        debounce="1000"
+                        :error-message="errorMsg('username', $v.signup.username)"
+                        :label="$t('reg.username')">
+
+                    <template v-slot:prepend>
+                        <q-icon name="person"/>
+                    </template>
+
+                </q-input>
+
+                <q-input
+                        v-model="signup.name"
+                        rounded outlined
+                        @blur="$v.signup.name.$touch"
+                        :error="$v.signup.name.$error"
+                        maxlength="30"
+                        debounce="1000"
+                        :error-message="errorMsg('name', $v.signup.name)"
+                        :label="$t('reg.name')">
+
+                    <template v-slot:prepend>
+                        <q-icon name="person"/>
+                    </template>
+
+                </q-input>
+
+                <q-input
+                        v-model="signup.surname"
+                        rounded outlined
+                        @blur="$v.signup.surname.$touch"
+                        :error="$v.signup.surname.$error"
+                        maxlength="30"
+                        debounce="1000"
+                        :error-message="errorMsg('surname', $v.signup.surname)"
+                        :label="$t('reg.surname')">
+
+                    <template v-slot:prepend>
+                        <q-icon name="person"/>
+                    </template>
+
+                </q-input>
+
+                <q-input
+                        v-model="signup.password"
+                        type="password"
+                        rounded outlined
+                        @blur="$v.signup.password.$touch"
+                        :error="$v.signup.password.$error"
+                        :error-message="`${errorMsg('password', $v.signup.password)}`"
+                        maxlength="30"
+                        :label="$t('reg.password')">
+
+                    <template v-slot:prepend>
+                        <q-icon name="vpn_key"/>
+                    </template>
+
+                </q-input>
+
+                <q-input
+                        v-model="signup.repeatPassword"
+                        type="password"
+                        maxlength="30"
+                        rounded outlined
+                        @blur="$v.signup.repeatPassword.$touch"
+                        :error="$v.signup.repeatPassword.$error"
+                        :error-message="`${errorMsg('repeatpassword', $v.signup.repeatPassword)}`"
+
+                        :label="$t('reg.repeatPassword')">
+
+                    <template v-slot:prepend>
+                        <q-icon name="vpn_key"/>
+                    </template>
+
+                </q-input>
+
+                <!--:hint="$t('reg.tips.repeatpassword')"-->
+
+                <q-input
+                        v-if="shownationality"
+                        v-model="countryname"
+                        :readonly="true"
+                        rounded outlined
+
+                        debounce="1000"
+                        :label="$t('reg.nationality')">
+
+                    <template v-slot:prepend>
+                        <vue-country-code
+                                @onSelect="selectcountry"
+                                :preferredCountries="tools.getprefCountries"
+                                :dropdownOptions="{ disabledDialCode: true }"
+                        >
+
+                        </vue-country-code>
+                    </template>
+
+                </q-input>
+
+                <div v-if="!tools.isMobile()"><br></div>
+
+                <vue-tel-input
+                        v-if="showcell"
+                        @country-changed="intcode_change"
+                        v-model="signup.profile.cell"
+                        :preferredCountries="tools.getprefCountries"
+                        :placeholder="getplaceholdercell"
+                        maxlength="20"
+                        autocomplete="off"
+                        mode="international"
+                        :enabledCountryCode="false"
+                        inputClasses="clCell"
+                        wrapperClasses="clCellCode">
+                </vue-tel-input>
+
+                <br>
+                <div class="text-center">
+                    <q-btn rounded size="sm" color="positive" @click="showdisclaimer = true"
+                           :label="$t('privacy_policy')">
+                    </q-btn>
+                </div>
+
+                <q-checkbox
+                        v-model="signup.terms"
+                        color="secondary"
+                        @blur="$v.signup.terms.$touch"
+                        :error="$v.signup.terms.$error"
+                        :error-message="`${errorMsg('terms', $v.signup.terms)}`"
+                        :label="$t('reg.terms')">
+
+                </q-checkbox>
+
+                <q-checkbox
+                        v-if="showadultcheck"
+                        v-model="iamadult"
+                        color="secondary"
+                        :label="$t('reg.onlyadult')">
+                </q-checkbox>
+
+                <div v-if="showadultcheck">
+                    <br>
+                </div>
+
+                <div class="wrapper">
+                    <q-btn rounded size="lg" color="positive" @click="submitOk" :disabled='!allowSubmit'
+                           :label="$t('reg.submit')">
+                    </q-btn>
+                </div>
+            </div>
+
+        </div>
+
+        <!--
+
+                <div align="center">
+            <q-btn rounded size="lg" color="primary" @click="submitOk" :disable="">{{$t('reg.submit')}}
+            </q-btn>
+        </div>
+
+        -->
+
+        <q-dialog v-model="showdisclaimer">
+            <q-card :style="`min-width: `+ tools.myheight_dialog() + `px;`">
+                <q-toolbar class="bg-primary text-white">
+                    <q-toolbar-title>
+                        Policy
+                    </q-toolbar-title>
+                    <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+                </q-toolbar>
+                <q-card-section class="inset-shadow">
+                    <PagePolicy
+                            owneremail="noisalviamoilpianeta@gmail.com"
+                            SiteName="SalviamoIlPianeta"
+                            ownerDataName="SalviamoIlPianeta"
+                            managerData="SalviamoIlPianeta"
+                            includeData="dati anagrafici (ragione sociale, nome, cognome), recapiti (telefono, indirizzo email)"
+                            url="noisalviamoilpianeta@gmail.com"
+                            lastdataupdate="9 Aprile 2020"
+                            country="Italia"
+                    >
+
+                    </PagePolicy>
+                </q-card-section>
+            </q-card>
+
+        </q-dialog>
+
+    </div>
+</template>
+
+<script lang="ts" src="./CSignUpSIP.ts">
+</script>
+<style lang="scss" scoped>
+    @import './CSignUpSIP.scss';
+</style>

src/components/CSignUpSIP/index.ts

@@ -0,0 +1 @@
+export {default as CSignUpSIP} from './CSignUpSIP.vue'

src/components/CStatus/CStatus.ts

@@ -371,9 +371,9 @@ export default class CStatus extends MixinBase {
 
   get telegramtext() {
     if (this.TelegVerificato)
-      return this.$t('reg.telegram') + ' ' + this.$t('pages.statusreg.verified')
+      return this.$t('reg.telegram', {botname: this.$t('ws.botname')}) + ' ' + this.$t('pages.statusreg.verified')
     else
-      return this.$t('reg.telegram') + ' ' + this.$t('pages.statusreg.nonverified')
+      return this.$t('reg.telegram', {botname: this.$t('ws.botname')}) + ' ' + this.$t('pages.statusreg.nonverified')
   }
 
   get paymenttext() {
@@ -402,7 +402,7 @@ export default class CStatus extends MixinBase {
   }
 
   public gettextstep(step, index) {
-    let tit = (index + 1) + ' - ' + this.$t(step.title)
+    let tit = (index + 1) + ' - ' + this.$t(step.title, {botname: this.$t('ws.botname'), sitename: this.$t('ws.sitename')})
 
     if (step.funcok())
       tit += ' ' + this.$t(step.funcok())

src/components/CStatus/CStatus.vue

@@ -97,7 +97,7 @@
                     </div>
                     <div v-else-if="mystep.title === 'steps.paymenttype'">
                         <div v-if="mystep.descr">
-                            <div v-html="$t(mystep.descr)"></div>
+                            <div v-html="$t(mystep.descr, {sitename: $t('pages.sitename')})"></div>
                         </div>
 
                         <CTitleBanner class="q-pa-xs" :title="$t('steps.paymenttype_paypal')" bgcolor="bg-primary"
@@ -331,7 +331,7 @@
 
 
                         <CRequisiti v-if="Completato9Req" :statebool="Completato9Req"
-                                    :msgTrue="$t('steps.enter_nave_9req_ok')"
+                                    :msgTrue="$t('steps.enter_nave_9req_ok', {sitename: $t('pages.sitename')})"
                                     :msgFalse="$t('steps.enter_nave_9req_ko')">
                         </CRequisiti>
 

src/components/CVerifyEmail/CVerifyTelegram.vue

@@ -9,21 +9,21 @@
 
       </CCopyBtn>
 
-      <div class="text-h6 text-center" v-html="$t('reg.teleg_torna_sul_bot')">
+      <div class="text-h6 text-center" v-html="$t('reg.teleg_torna_sul_bot', {botname: $t('ws.botname')})">
       </div>
     </div>
 
     <div v-if="!TelegVerificato" class="q-pa-sm q-gutter-sm">
       <div v-if="!TelegCode"><strong>{{ $t('components.authentication.telegram.open')}}</strong></div>
       <div class="q-ma-md">
-        <q-btn rounded color="primary" icon="fab fa-telegram" :label="$t('components.authentication.telegram.openbot')"
+        <q-btn rounded color="primary" icon="fab fa-telegram" :label="$t('components.authentication.telegram.openbot', {botname: $t('ws.sitename') })"
                type="a"
                :href="getLinkBotTelegram" target="_blank"></q-btn>
         <br>
       </div>
-      <strong>{{ $t('components.authentication.telegram.ifclose')}}</strong>
+      <strong>{{ $t('components.authentication.telegram.ifclose', {botname: $t('ws.botname') })}}</strong>
       <div class="q-my-sm">
-        <q-img src="statics/images/ayni_bot.jpg" class="" alt="AYNI BOT" style="height: 100px; width: 250px;">
+        <q-img src="statics/images/ayni_bot.jpg" class="" :alt="$t('ws.sitename')" style="height: 100px; width: 250px;">
         </q-img>
       </div>
     </div>

src/components/CVerifyTelegram/CVerifyEmail.vue

@@ -6,7 +6,7 @@
     <q-chip v-else color="negative" text-color="white" icon="email">
       {{ `Email ` + $t('pages.statusreg.nonverified') }}
     </q-chip>
-    <div v-if="!isEmailVerified" v-html="$t('components.authentication.email_verification.link_sent')">
+    <div v-if="!isEmailVerified" v-html="$t('components.authentication.email_verification.link_sent', {botname: $t('site.botname') })">
 
     </div>
     <div v-if="!isEmailVerified" v-html="$t('components.authentication.email_verification.se_non_ricevo')">

src/components/CVideoPromo/CVideoPromo.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
 
-    <CTitleBanner title="Video AYNI"></CTitleBanner>
+    <CTitleBanner :title="`Video ` + $t('site.sitename')"></CTitleBanner>
     <CImgText src="">
 
-      <CTitleBanner class="q-pa-xs" :title="$t('steps.video_intro_1')" bgcolor="bg-primary"
+      <CTitleBanner class="q-pa-xs" :title="$t('steps.video_intro_1', {sitename: $t('ws.sitename')})" bgcolor="bg-primary"
                     clcolor="text-white"
                     myclass="myshad" canopen="true" :visible="true">
 
@@ -12,7 +12,7 @@
 
         </CVideo>
       </CTitleBanner>
-      <CTitleBanner class="q-pa-xs" :title="$t('steps.video_intro_2')" bgcolor="bg-primary"
+      <CTitleBanner class="q-pa-xs" :title="$t('steps.video_intro_2', {sitename: $t('ws.sitename')})" bgcolor="bg-primary"
                     clcolor="text-white"
                     myclass="myshad" canopen="true" :visible="false">
 

src/components/Header/Header.vue

@@ -32,7 +32,7 @@
         <q-btn ripple
                size="md"
                id="newvers" v-if="isNewVersionAvailable" color="secondary" rounded icon="refresh"
-               class="btnNewVersShow" @click="RefreshApp" :label="$t('notification.newVersionAvailable')"/>
+               class="btnNewVersShow" @click="RefreshApp()" :label="$t('notification.newVersionAvailable')"/>
 
 
         <q-toolbar-title class="row items-center">

src/components/index.ts

@@ -24,6 +24,7 @@ export * from './CPreloadImages'
 export * from './CSignIn'
 export * from './CSignUp'
 export * from './CSignUpNotevole'
+export * from './CSignUpSIP'
 export * from './CEventsCalendar'
 export * from './CMySingleEvent'
 export * from './CDate'

src/components/logo/logo.ts

@@ -14,6 +14,6 @@ export default class Logo extends Vue {
   }
 
   get logoalt() {
-    return this.$t('msg.myAppName')
+    return this.$t('ws.sitename')
   }
 }