Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b2df4cc6
authored
Jan 05, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue #745 closed
parent
22ac201a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletions
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/login/controllers/login_setting_password.js
sails/src/assets/app/i18n/en-gb.json
View file @
b2df4cc6
...
...
@@ -99,6 +99,7 @@
"error_fetching_students"
:
"Error when loading students"
,
"error_only_support_images"
:
"Only images are supported (JPG, PNG or GIF files)"
,
"error_on_request"
:
"The request has not been processed. Please, check your fields"
,
"error_on_request_sup_not_found"
:
"Account not found or it has not been activated"
,
"error_loading_pictos"
:
"Error loading pictos information"
,
"error_general"
:
"An error has been produced"
,
"expand_navigation"
:
"Expand navigation"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
b2df4cc6
...
...
@@ -102,6 +102,7 @@
"error_fetching_students"
:
"Error al cargar estudiantes"
,
"error_only_support_images"
:
"Sólo se soportan imágenes (ficheros JPG, PNG o GIF)"
,
"error_on_request"
:
"Se ha producido un error. Por favor, compruebe los valores introducidos."
,
"error_on_request_sup_not_found"
:
"La cuenta no existe o no ha sido activada"
,
"error_loading_pictos"
:
"Error cargando información de los pictos"
,
"error_general"
:
"Se ha producido un error"
,
"February"
:
"Febrero"
,
...
...
sails/src/assets/scripts/modules/login/controllers/login_setting_password.js
View file @
b2df4cc6
...
...
@@ -49,7 +49,12 @@ dashboardControllers.controller('LoginSettingPasswordCtrl', function LoginSettin
})
.
error
(
function
(
data
,
status
,
headers
,
config
)
{
$scope
.
reset
();
ngToast
.
danger
({
content
:
$translate
.
instant
(
'error_on_request'
)
});
console
.
log
(
data
);
console
.
log
(
data
.
search
(
"not found"
));
if
(
data
.
search
(
"not found"
)
>
0
)
ngToast
.
danger
({
content
:
$translate
.
instant
(
'error_on_request_sup_not_found'
)
});
else
ngToast
.
danger
({
content
:
$translate
.
instant
(
'error_on_request'
)
});
});
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment