From dd9642d445e3753ca5240c853ed6f7339e2e6ad8 Mon Sep 17 00:00:00 2001 From: Aman upadhyay Date: Tue, 19 Nov 2019 14:33:35 +0530 Subject: [PATCH 1/2] language changes --- resources/assets/js/plugins/es.js | 16 ++++++++++++++++ resources/assets/js/plugins/fr.js | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js index d5b49cd1..6c43c839 100644 --- a/resources/assets/js/plugins/es.js +++ b/resources/assets/js/plugins/es.js @@ -565,8 +565,16 @@ export default { host: 'Host de correo', port: 'Puerto de correo', driver: 'Conductor de correo', + secret: 'Secreto', password: 'Contraseña de correo', username: 'Nombre de usuario de correo', + mailgun_secret: 'Mailgun Secreto', + mailgun_domain: 'Domino', + mailgun_endpoint: 'Mailgun Punto Final', + ses_secret: 'SES Secreto', + ses_key: 'SES llave', + from_name: 'Del nombre del correo', + from_mail: 'Desde la dirección de correo', mail_config: 'Configuración de correo', encryption: 'Cifrado de correo', mail_config_desc: 'Los detalles a continuación se utilizarán para actualizar el entorno de correo. También puede cambiar los detalles en cualquier momento después de iniciar sesión.' @@ -732,8 +740,16 @@ export default { host: 'Host de correo', port: 'Puerto de correo', driver: 'Conductor de correo', + secret: 'Secreto', password: 'Contraseña de correo', username: 'Nombre de usuario de correo', + mailgun_secret: 'Mailgun Secreto', + mailgun_domain: 'Domino', + mailgun_endpoint: 'Mailgun Punto Final', + ses_secret: 'SES Secreto', + ses_key: 'SES llave', + from_name: 'Del nombre del correo', + from_mail: 'Desde la dirección de correo', mail_config: 'Configuración de correo', encryption: 'Cifrado de correo', mail_config_desc: 'Los detalles a continuación se utilizarán para actualizar el entorno de correo. También puede cambiar los detalles en cualquier momento después de iniciar sesión.' diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js index ce755db0..5b8e1882 100644 --- a/resources/assets/js/plugins/fr.js +++ b/resources/assets/js/plugins/fr.js @@ -566,6 +566,14 @@ export default { port: 'Port mail', driver: 'Pilote de courrier', password: 'Mot de passe mail', + secret: 'Secret', + mailgun_secret: 'Mailgun Secret', + mailgun_domain: 'Domaine', + mailgun_endpoint: 'Mailgun Point Final', + ses_secret: 'SES Secret', + ses_key: 'SES clé', + from_name: 'Nom de messagerie', + from_mail: 'De ladresse mail', username: "Mail Nom d'utilisateur", mail_config: 'Configuration du courrier', encryption: 'Chiffrement du courrier', @@ -736,6 +744,14 @@ export default { port: 'Port mail', driver: 'Pilote de courrier', password: 'Mot de passe mail', + secret: 'Secret', + mailgun_secret: 'Mailgun Secret', + mailgun_domain: 'Domaine', + mailgun_endpoint: 'Mailgun Point Final', + ses_secret: 'SES Secret', + ses_key: 'SES clé', + from_name: 'Nom de messagerie', + from_mail: 'De ladresse mail', username: "Mail Nom d'utilisateur", mail_config: 'Configuration du courrier', encryption: 'Chiffrement du courrier', From 2af94468b8556efb677f2014fecd434afe9fa6a0 Mon Sep 17 00:00:00 2001 From: raishvaria Date: Tue, 19 Nov 2019 14:41:53 +0530 Subject: [PATCH 2/2] fix deselect issue --- resources/assets/js/views/settings/mailDriver/Basic.vue | 1 + resources/assets/js/views/settings/mailDriver/Mailgun.vue | 1 + resources/assets/js/views/settings/mailDriver/Ses.vue | 1 + resources/assets/js/views/settings/mailDriver/Smtp.vue | 1 + resources/assets/js/views/wizard/mailDriver/Basic.vue | 1 + resources/assets/js/views/wizard/mailDriver/Mailgun.vue | 1 + resources/assets/js/views/wizard/mailDriver/Ses.vue | 1 + resources/assets/js/views/wizard/mailDriver/Smtp.vue | 1 + 8 files changed, 8 insertions(+) diff --git a/resources/assets/js/views/settings/mailDriver/Basic.vue b/resources/assets/js/views/settings/mailDriver/Basic.vue index e6d35b9e..6992704e 100644 --- a/resources/assets/js/views/settings/mailDriver/Basic.vue +++ b/resources/assets/js/views/settings/mailDriver/Basic.vue @@ -9,6 +9,7 @@ :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" :searchable="true" + :allow-empty="false" :show-labels="false" @input="onChangeDriver" /> diff --git a/resources/assets/js/views/settings/mailDriver/Mailgun.vue b/resources/assets/js/views/settings/mailDriver/Mailgun.vue index ab2338a7..a2836db1 100644 --- a/resources/assets/js/views/settings/mailDriver/Mailgun.vue +++ b/resources/assets/js/views/settings/mailDriver/Mailgun.vue @@ -8,6 +8,7 @@ v-model="mailConfigData.mail_driver" :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" + :allow-empty="false" :searchable="true" :show-labels="false" @input="onChangeDriver" diff --git a/resources/assets/js/views/settings/mailDriver/Ses.vue b/resources/assets/js/views/settings/mailDriver/Ses.vue index ce12d151..bb1aadf1 100644 --- a/resources/assets/js/views/settings/mailDriver/Ses.vue +++ b/resources/assets/js/views/settings/mailDriver/Ses.vue @@ -8,6 +8,7 @@ v-model="mailConfigData.mail_driver" :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" + :allow-empty="false" :searchable="true" :show-labels="false" @input="onChangeDriver" diff --git a/resources/assets/js/views/settings/mailDriver/Smtp.vue b/resources/assets/js/views/settings/mailDriver/Smtp.vue index 6bc25e94..8e3e1e23 100644 --- a/resources/assets/js/views/settings/mailDriver/Smtp.vue +++ b/resources/assets/js/views/settings/mailDriver/Smtp.vue @@ -9,6 +9,7 @@ :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" :searchable="true" + :allow-empty="false" :show-labels="false" @input="onChangeDriver" /> diff --git a/resources/assets/js/views/wizard/mailDriver/Basic.vue b/resources/assets/js/views/wizard/mailDriver/Basic.vue index 3f16bccf..cc2a93c3 100644 --- a/resources/assets/js/views/wizard/mailDriver/Basic.vue +++ b/resources/assets/js/views/wizard/mailDriver/Basic.vue @@ -8,6 +8,7 @@ v-model="mailConfigData.mail_driver" :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" + :allow-empty="false" :searchable="true" :show-labels="false" @input="onChangeDriver" diff --git a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue index b3d10d5e..75329d14 100644 --- a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue +++ b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue @@ -9,6 +9,7 @@ :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" :searchable="true" + :allow-empty="false" :show-labels="false" @input="onChangeDriver" /> diff --git a/resources/assets/js/views/wizard/mailDriver/Ses.vue b/resources/assets/js/views/wizard/mailDriver/Ses.vue index 8f41897e..ed104289 100644 --- a/resources/assets/js/views/wizard/mailDriver/Ses.vue +++ b/resources/assets/js/views/wizard/mailDriver/Ses.vue @@ -9,6 +9,7 @@ :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" :searchable="true" + :allow-empty="false" :show-labels="false" @input="onChangeDriver" /> diff --git a/resources/assets/js/views/wizard/mailDriver/Smtp.vue b/resources/assets/js/views/wizard/mailDriver/Smtp.vue index 0031e14b..c8bae841 100644 --- a/resources/assets/js/views/wizard/mailDriver/Smtp.vue +++ b/resources/assets/js/views/wizard/mailDriver/Smtp.vue @@ -9,6 +9,7 @@ :invalid="$v.mailConfigData.mail_driver.$error" :options="mailDrivers" :searchable="true" + :allow-empty="false" :show-labels="false" @input="onChangeDriver" />