Browse Source

Merge pull request #359 from pixplix/master

Notifications translation
pull/360/head
o1lab 3 years ago committed by GitHub
parent
commit
08dd03f603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      packages/nc-gui/components/notification.vue
  2. 3
      packages/nc-gui/pages/user/authentication/signin.vue
  3. 15
      packages/nc-gui/pages/user/authentication/signup/_token.vue
  4. 11
      packages/nc-gui/pages/user/authentication/signup/index.vue
  5. 15
      packages/nc-gui/pages/user/password/forgot.vue
  6. 10
      packages/nc-gui/static/lang/en.json
  7. 10
      packages/nc-gui/static/lang/es.json

5
packages/nc-gui/components/notification.vue

@ -60,11 +60,11 @@
<v-list>
<v-list-item v-if="notificationList.length" style="min-height:30px"><a class="text-center mb-0"
style="width: 100%;min-width:200px"
@click.prevent="clearNotification">Clear</a>
@click.prevent="clearNotification">{{ $t('projects.notifications.clear') }}</a>
</v-list-item>
<v-list-item v-else>
<v-list-item-content>
<v-list-item-subtitle class="px-3">No new notifications</v-list-item-subtitle>
<v-list-item-subtitle class="px-3">{{ $t('projects.notifications.no_new') }}</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
</v-list>
@ -156,6 +156,7 @@ export default {
*
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
* @author Alejandro Moreno <info@pixplix.com>
*
* @license GNU AGPL version 3 or any later version
*

3
packages/nc-gui/pages/user/authentication/signin.vue

@ -85,7 +85,7 @@
:disabled="false"
v-ge="['Sign In', '']"
>
<b>Sign In</b>
<b>{{ $t('signin.title') }}</b>
</v-btn>
<br/>
@ -403,6 +403,7 @@ export default {
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
* @author Wing-Kam Wong <wingkwong.code@gmail.com>
* @author Alejandro Moreno <info@pixplix.com>
*
* @license GNU AGPL version 3 or any later version
*

15
packages/nc-gui/pages/user/authentication/signup/_token.vue

@ -27,7 +27,7 @@
</div>
<h1 class="mt-4">SIGN UP
<h1 class="mt-4">{{ $t('signup.title') }}
{{ $route.query.redirect_to === '/referral' ? '& REFER' : '' }}
{{ $route.query.redirect_to === '/pricing' ? '& BUY' : '' }}
</h1>
@ -40,12 +40,12 @@
<p v-if="firstUser" class="success--text">
You will be the 'Super Admin'
{{ $t('signup.message_1') }}
</p>
<v-text-field
label="E-mail"
label="$t('signin.input_1')"
v-model="form.email"
:rules="formRules.email"
required>
@ -53,7 +53,7 @@
<v-text-field
name="input-10-2"
label="Enter your password"
label="$t('signin.input_2')"
min="8"
:append-icon="formUtil.e3 ? 'visibility' : 'visibility_off'"
@click:append="() => (formUtil.e3 = !formUtil.e3)"
@ -73,7 +73,7 @@
<v-btn @click="MtdOnSignup" color="primary" class="btn--large"
:disabled="!formUtil.recpatcha || !formUtil.valid" v-ge="['Sign Up ','']">
&nbsp; Sign Up &nbsp;
&nbsp; {{ $t('signup.title') }} &nbsp;
<v-progress-circular
class="pb-3 pt-0 mt-0"
:value="formUtil.passwordProgress"
@ -89,8 +89,8 @@
<br>
<br>
<br>
<p class="font-weight-light caption" v-ge="['Already have an account ?','']">Already have an account ?
<router-link to="/user/authentication/signin">Sign In</router-link>
<p class="font-weight-light caption" v-ge="['Already have an account ?','']">{{ $t('signup.message_2') }}
<router-link to="/user/authentication/signin">{{ $t('signin.title') }}</router-link>
</p>
@ -502,6 +502,7 @@ export default {
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
* @author Wing-Kam Wong <wingkwong.code@gmail.com>
* @author Alejandro Moreno <info@pixplix.com>
*
* @license GNU AGPL version 3 or any later version
*

11
packages/nc-gui/pages/user/authentication/signup/index.vue

@ -45,7 +45,7 @@
<v-text-field
label="Enter your work email"
label="$t('signin.input_1')"
v-model="form.email"
:rules="formRules.email"
required>
@ -53,7 +53,7 @@
<v-text-field
name="input-10-2"
label="Enter your password"
label="$t('signin.input_2')"
min="8"
:append-icon="formUtil.e3 ? 'visibility' : 'visibility_off'"
@click:append="() => (formUtil.e3 = !formUtil.e3)"
@ -73,15 +73,15 @@
<v-btn @click="MtdOnSignup" color="primary" class="btn--large" :loading="signUpButtonLoading"
:disabled="!formUtil.recpatcha || !formUtil.valid" v-ge="['Sign Up ','']">
&nbsp; Sign Up &nbsp;
&nbsp; {{ $t('signup.title') }} &nbsp;
</v-btn>
<br>
<br>
<br>
<p class="font-weight-light caption grey--text" v-ge="['Already have an account ?','']">Already have an account ?
<router-link to="/user/authentication/signin">Sign In</router-link>
<p class="font-weight-light caption grey--text" v-ge="['Already have an account ?','']">{{ $t('signup.message_2') }}
<router-link to="/user/authentication/signin">{{ $t('signin.title') }}</router-link>
</p>
</v-form>
@ -483,6 +483,7 @@ export default {
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
* @author Wing-Kam Wong <wingkwong.code@gmail.com>
* @author Alejandro Moreno <info@pixplix.com>
*
* @license GNU AGPL version 3 or any later version
*

15
packages/nc-gui/pages/user/password/forgot.vue

@ -7,19 +7,19 @@
<v-alert type="success" :value="true" outline>
<p class="display-1">
Please check your email to reset the password
{{ $t('signin.password.recovery.success') }}
</p>
</v-alert>
</v-card>
<v-card class="pa-5 elevation-10" color="" v-else>
<h1>Reset your password</h1>
<h1>{{ $t('signin.password.recovery.title') }}</h1>
<br>
<p>Please provide the email address you used when you signed up.</p>
<p>We will send you an email with a link to reset your password.</p>
<p>{{ $t('signin.password.recovery.message_1') }}</p>
<p>{{ $t('signin.password.recovery.message_2') }}</p>
<div>
@ -50,7 +50,7 @@
large
:disabled="!valid"
>
SEND EMAIL
{{ $t('signin.password.recovery.button') }}
</v-btn>
</v-form>
@ -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 <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
* @author Alejandro Moreno <info@pixplix.com>
*
* @license GNU AGPL version 3 or any later version
*

10
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",
@ -80,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",

10
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",
@ -80,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",

Loading…
Cancel
Save