From db19035b71c0d4fb60d1bf81340e2c484bb0e332 Mon Sep 17 00:00:00 2001 From: Alejandro Moreno Date: Sun, 18 Jul 2021 18:03:12 -0500 Subject: [PATCH 1/2] Notifications translation Signed-off-by: Alejandro Moreno --- packages/nc-gui/components/notification.vue | 5 +++-- packages/nc-gui/static/lang/en.json | 2 ++ packages/nc-gui/static/lang/es.json | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/notification.vue b/packages/nc-gui/components/notification.vue index f660da27b5..3f87283187 100644 --- a/packages/nc-gui/components/notification.vue +++ b/packages/nc-gui/components/notification.vue @@ -60,11 +60,11 @@ Clear + @click.prevent="clearNotification">{{ $t('projects.notifications.clear') }} - No new notifications + {{ $t('projects.notifications.no_new') }} @@ -156,6 +156,7 @@ export default { * * @author Naveen MR * @author Pranav C Balan + * @author Alejandro Moreno * * @license GNU AGPL version 3 or any later version * diff --git a/packages/nc-gui/static/lang/en.json b/packages/nc-gui/static/lang/en.json index 739d627e1f..7dfb86503a 100644 --- a/packages/nc-gui/static/lang/en.json +++ b/packages/nc-gui/static/lang/en.json @@ -66,6 +66,8 @@ "projects.ext_db.head.title": "Create Project | Noco", "projects.ext_db.dialog.success": "Connection was successful", "projects.ext_db.dialog.failure": "Connection Failure:", + "projects.notifications.no_new": "No new notifications", + "projects.notifications.clear": "Clear", "signin.title": "SIGN IN", "signin.input_1": "Enter your work email", "signin.input_2": "Enter your password", diff --git a/packages/nc-gui/static/lang/es.json b/packages/nc-gui/static/lang/es.json index deb1f54b39..19d6cbdea6 100644 --- a/packages/nc-gui/static/lang/es.json +++ b/packages/nc-gui/static/lang/es.json @@ -66,6 +66,8 @@ "projects.ext_db.head.title": "Crear proyecto | Noco", "projects.ext_db.dialog.success": "Conexión correcta", "projects.ext_db.dialog.failure": "Conexión incorrecta:", + "projects.notifications.no_new": "Sin notificaciones", + "projects.notifications.clear": "Limpiar", "signin.title": "INICIAR SESIÓN", "signin.input_1": "Ingrese su correo de trabajo", "signin.input_2": "Ingrese su contraseña", From 0625d5127fc39cd8aa15b8c46179f0a87722c2e2 Mon Sep 17 00:00:00 2001 From: Alejandro Moreno Date: Sun, 18 Jul 2021 19:24:24 -0500 Subject: [PATCH 2/2] More Translations (Login - Register - Password Recovery) Signed-off-by: Alejandro Moreno --- .../nc-gui/pages/user/authentication/signin.vue | 3 ++- .../pages/user/authentication/signup/_token.vue | 15 ++++++++------- .../pages/user/authentication/signup/index.vue | 11 ++++++----- packages/nc-gui/pages/user/password/forgot.vue | 15 ++++++++------- packages/nc-gui/static/lang/en.json | 8 ++++++++ packages/nc-gui/static/lang/es.json | 8 ++++++++ 6 files changed, 40 insertions(+), 20 deletions(-) diff --git a/packages/nc-gui/pages/user/authentication/signin.vue b/packages/nc-gui/pages/user/authentication/signin.vue index 4da53273a8..2b94ef4395 100644 --- a/packages/nc-gui/pages/user/authentication/signin.vue +++ b/packages/nc-gui/pages/user/authentication/signin.vue @@ -85,7 +85,7 @@ :disabled="false" v-ge="['Sign In', '']" > - Sign In + {{ $t('signin.title') }}
@@ -403,6 +403,7 @@ export default { * @author Naveen MR * @author Pranav C Balan * @author Wing-Kam Wong + * @author Alejandro Moreno * * @license GNU AGPL version 3 or any later version * diff --git a/packages/nc-gui/pages/user/authentication/signup/_token.vue b/packages/nc-gui/pages/user/authentication/signup/_token.vue index 1c8fdb341b..8ae11e3ca9 100644 --- a/packages/nc-gui/pages/user/authentication/signup/_token.vue +++ b/packages/nc-gui/pages/user/authentication/signup/_token.vue @@ -27,7 +27,7 @@ -

SIGN UP +

{{ $t('signup.title') }} {{ $route.query.redirect_to === '/referral' ? '& REFER' : '' }} {{ $route.query.redirect_to === '/pricing' ? '& BUY' : '' }}

@@ -40,12 +40,12 @@

- You will be the 'Super Admin' + {{ $t('signup.message_1') }}

@@ -53,7 +53,7 @@ -   Sign Up   +   {{ $t('signup.title') }}  

-

Already have an account ? - Sign In +

{{ $t('signup.message_2') }} + {{ $t('signin.title') }}

@@ -502,6 +502,7 @@ export default { * @author Naveen MR * @author Pranav C Balan * @author Wing-Kam Wong + * @author Alejandro Moreno * * @license GNU AGPL version 3 or any later version * diff --git a/packages/nc-gui/pages/user/authentication/signup/index.vue b/packages/nc-gui/pages/user/authentication/signup/index.vue index 5a480f330b..4b0b6a4f4e 100644 --- a/packages/nc-gui/pages/user/authentication/signup/index.vue +++ b/packages/nc-gui/pages/user/authentication/signup/index.vue @@ -45,7 +45,7 @@ @@ -53,7 +53,7 @@ -   Sign Up   +   {{ $t('signup.title') }}  


-

Already have an account ? - Sign In +

{{ $t('signup.message_2') }} + {{ $t('signin.title') }}

@@ -483,6 +483,7 @@ export default { * @author Naveen MR * @author Pranav C Balan * @author Wing-Kam Wong + * @author Alejandro Moreno * * @license GNU AGPL version 3 or any later version * diff --git a/packages/nc-gui/pages/user/password/forgot.vue b/packages/nc-gui/pages/user/password/forgot.vue index 494a2e0d66..9881176012 100644 --- a/packages/nc-gui/pages/user/password/forgot.vue +++ b/packages/nc-gui/pages/user/password/forgot.vue @@ -7,19 +7,19 @@

- Please check your email to reset the password + {{ $t('signin.password.recovery.success') }}

-

Reset your password

+

{{ $t('signin.password.recovery.title') }}


-

Please provide the email address you used when you signed up.

-

We will send you an email with a link to reset your password.

+

{{ $t('signin.password.recovery.message_1') }}

+

{{ $t('signin.password.recovery.message_2') }}

@@ -50,7 +50,7 @@ large :disabled="!valid" > - SEND EMAIL + {{ $t('signin.password.recovery.button') }} @@ -78,8 +78,8 @@ formRules: { email: [ - v => !!v || 'E-mail is required', - v => isEmail(v) || 'E-mail must be valid' + v => !!v || this.$t('signin.form.rules.email_1'), + v => isEmail(v) || this.$t('signin.form.rules.email_2') ], }, formUtil: { @@ -149,6 +149,7 @@ * * @author Naveen MR * @author Pranav C Balan + * @author Alejandro Moreno * * @license GNU AGPL version 3 or any later version * diff --git a/packages/nc-gui/static/lang/en.json b/packages/nc-gui/static/lang/en.json index 7dfb86503a..558b1fe291 100644 --- a/packages/nc-gui/static/lang/en.json +++ b/packages/nc-gui/static/lang/en.json @@ -82,6 +82,14 @@ "signin.head.meta.hid": "Log In To Noco", "signin.head.meta.name": "Log In To Noco", "signin.head.meta.content": "Log In To Noco", + "signin.password.recovery.title": "Reset your password", + "signin.password.recovery.message_1": "Please provide the email address you used when you signed up.", + "signin.password.recovery.message_2": "We will send you an email with a link to reset your password.", + "signin.password.recovery.success": "Please check your email to reset the password", + "signin.password.recovery.button": "SEND EMAIL", + "signup.title": "SIGN UP", + "signup.message_1": "You will be the 'Super Admin'", + "signup.message_2": "Already have an account ?", "treeview.settings": "Settings", "treeview.settings.tooltip": "Only visible to Creator", "treeview.app_store": "App Store", diff --git a/packages/nc-gui/static/lang/es.json b/packages/nc-gui/static/lang/es.json index 19d6cbdea6..45ae0e328b 100644 --- a/packages/nc-gui/static/lang/es.json +++ b/packages/nc-gui/static/lang/es.json @@ -82,6 +82,14 @@ "signin.head.meta.hid": "Acceder a Noco", "signin.head.meta.name": "Acceder a Noco", "signin.head.meta.content": "Acceder a Noco", + "signin.password.recovery.title": "Cambiar contraseña", + "signin.password.recovery.message_1": "Por favor ingresa el correo electrónico que usas para conectarte.", + "signin.password.recovery.message_2": "Enviaremos un link al correo electrónico para cambiar la contraseña.", + "signin.password.recovery.success": "Por favor revise el correo electrónico para cambiar la contraseña", + "signin.password.recovery.button": "ENVIAR CORREO", + "signup.title": "REGISTRARSE", + "signup.message_1": "Serás 'Super Admin'", + "signup.message_2": "Ya tiene una cuenta?", "treeview.settings": "Configuraciones", "treeview.settings.tooltip": "Sólo visible por el creador", "treeview.app_store": "App Store",