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
120db4de
authored
Mar 27, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue on translation fixed
parent
4cc39521
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
sails/src/CHANGES.md
sails/src/assets/scripts/modules/translate/controllers/translate.js
sails/src/CHANGES.md
View file @
120db4de
...
...
@@ -4,7 +4,7 @@ Changes to be performed manually in servers to upgrade
## AngularJS
(already done in dev)
(already done in dev
& pre
)
-
angular-re-captcha has been replaced by angular-recaptcha, so bower has to be run
-
reinstall ui-bootstrap
...
...
@@ -13,14 +13,14 @@ Changes to be performed manually in servers to upgrade
## Database
(ToDo in dev)
(already done in dev)
-
add arasaac to source table
`INSERT INTO `
source
` (`
id
`, `
name
`, `
description
`) VALUES (3, 'Arasaac', 'Arasaac pictograms collection');`
-
alter table supervisor add arasaac license:
`ALTER TABLE supervisor ADD COLUMN arasaac_license BOOLEAN DEFAULT FALSE;`
(already done in dev)
(already done in dev
& pre
)
-
load pictocat_tree_populate.sql
`source /vagrant/roles/database/files/pictocat_tree_populate.sql;`
...
...
sails/src/assets/scripts/modules/translate/controllers/translate.js
View file @
120db4de
...
...
@@ -13,6 +13,14 @@ dashboardControllers.controller('TranslateController', function(
vcRecaptchaService
)
{
// onload, set lang accordingly to stored user settings
if
(
$window
.
sessionStorage
.
user
)
{
//Session variables update
var
obj
=
JSON
.
parse
(
$window
.
sessionStorage
.
user
);
$translate
.
use
(
obj
.
lang
);
}
// Changes the language when user click on footer lang
$scope
.
changeLanguage
=
function
(
langKey
)
{
//Translate update
...
...
@@ -42,7 +50,9 @@ dashboardControllers.controller('TranslateController', function(
}
// Reload captcha according to language (only once instance per page, so id is always 0)
vcRecaptchaService
.
useLang
(
0
,
langKey
.
substr
(
0
,
2
));
//TODO: REVISAR reCaptcha Widget ID not exists
try
{
vcRecaptchaService
.
useLang
(
0
,
langKey
.
substr
(
0
,
2
));
}
catch
(
err
)
{}
// Reload page
$window
.
location
.
reload
();
...
...
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