diff --git a/@salix/app/src/app.js b/@salix/app/src/app.js index b7a2c92ec9..a4f3636b4d 100644 --- a/@salix/app/src/app.js +++ b/@salix/app/src/app.js @@ -3,6 +3,7 @@ import {bootstrap} from './bootstrap'; import * as spliting from './spliting'; import * as routes from './configroutes'; import * as run from './run'; +import * as configNgTranslate from './translate'; import * as components from './components'; import title from './styles/title.css' diff --git a/@salix/app/src/bootstrap.js b/@salix/app/src/bootstrap.js index b49a0112d4..183515c912 100644 --- a/@salix/app/src/bootstrap.js +++ b/@salix/app/src/bootstrap.js @@ -14,5 +14,4 @@ export const bootstrap = () => { throw new Error("element is not defined"); } ng.bootstrap(_element, [SALIX]); - }; diff --git a/@salix/app/src/configroutes.js b/@salix/app/src/configroutes.js index 67f54c4881..0d351c427c 100644 --- a/@salix/app/src/configroutes.js +++ b/@salix/app/src/configroutes.js @@ -2,7 +2,6 @@ import * as core from 'core'; import * as spliting from './spliting'; import * as deps from './spliting/deps.json'; - function loader(module) { function load($ocLazyLoad, $q){ return $q((resolve) => { diff --git a/@salix/app/src/module.js b/@salix/app/src/module.js index 24d591cac3..99dbd0b5c2 100644 --- a/@salix/app/src/module.js +++ b/@salix/app/src/module.js @@ -3,4 +3,4 @@ import * as core from 'core'; import {NAME as CORE} from 'core'; export const NAME = 'salix'; -export const module = vendors.ng.module(NAME,[CORE]); +export const module = vendors.ng.module(NAME, [CORE]); diff --git a/@salix/app/src/run.js b/@salix/app/src/run.js index 01ff49e662..8a230d8e9a 100644 --- a/@salix/app/src/run.js +++ b/@salix/app/src/run.js @@ -1,10 +1,9 @@ -import {ng} from 'vendor'; import {module} from './module'; -export const run = function($rootScope){ - $rootScope.$on('$viewContentLoaded',()=>{ - componentHandler.upgradeAllRegistered(); - }) +export const run = function($rootScope) { + $rootScope.$on('$viewContentLoaded',()=>{ + componentHandler.upgradeAllRegistered(); + }) } -run.$inject=['$rootScope']; -module.run(run); \ No newline at end of file +run.$inject = ['$rootScope']; +module.run(run); diff --git a/@salix/app/src/translate.js b/@salix/app/src/translate.js new file mode 100644 index 0000000000..acb7354d3f --- /dev/null +++ b/@salix/app/src/translate.js @@ -0,0 +1,9 @@ +import {module} from './module'; + +export const configNgTranslate = function($translateProvider) { + $translateProvider + .translations('es', {/* Traducciones */}) + .preferredLanguage('es'); +} +configNgTranslate.$inject = ['$translateProvider']; +module.config(configNgTranslate); diff --git a/@salix/core/src/button/button.mdl.html b/@salix/core/src/button/button.mdl.html index 913521dcbf..6b031460aa 100644 --- a/@salix/core/src/button/button.mdl.html +++ b/@salix/core/src/button/button.mdl.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/@salix/core/src/check/check.mdl.html b/@salix/core/src/check/check.mdl.html index f28da13315..f28c6eb014 100644 --- a/@salix/core/src/check/check.mdl.html +++ b/@salix/core/src/check/check.mdl.html @@ -1,4 +1,4 @@ diff --git a/@salix/core/src/combo/combo.mdl.html b/@salix/core/src/combo/combo.mdl.html index 9d6f31cf0f..74f8c77eac 100644 --- a/@salix/core/src/combo/combo.mdl.html +++ b/@salix/core/src/combo/combo.mdl.html @@ -1,5 +1,5 @@
- +
diff --git a/@salix/core/src/date-picker/date-picker.mdl.html b/@salix/core/src/date-picker/date-picker.mdl.html index 5f0b7ed63b..dba861b2e4 100644 --- a/@salix/core/src/date-picker/date-picker.mdl.html +++ b/@salix/core/src/date-picker/date-picker.mdl.html @@ -1,4 +1,4 @@
- +
diff --git a/@salix/core/src/module.js b/@salix/core/src/module.js index 5931bf0341..98383f1851 100644 --- a/@salix/core/src/module.js +++ b/@salix/core/src/module.js @@ -4,5 +4,3 @@ import {getModuleName,getVendorDependencies} from './util'; const DEPENDENCIES = getVendorDependencies(vendors) export const NAME = getModuleName('core'); export const module = vendors.ng.module(NAME,DEPENDENCIES); - - diff --git a/@salix/core/src/password/password.mdl.html b/@salix/core/src/password/password.mdl.html index 471f99c77b..23a3c981a5 100644 --- a/@salix/core/src/password/password.mdl.html +++ b/@salix/core/src/password/password.mdl.html @@ -1,4 +1,4 @@
- +
diff --git a/@salix/core/src/radio/radio.mdl.html b/@salix/core/src/radio/radio.mdl.html index 5aacf8195f..36d9baac8e 100644 --- a/@salix/core/src/radio/radio.mdl.html +++ b/@salix/core/src/radio/radio.mdl.html @@ -1,2 +1,2 @@ -*[text]* +*[text]* diff --git a/@salix/core/src/routesLoader.js b/@salix/core/src/routesLoader.js index 4ea96e99df..eef26ff855 100644 --- a/@salix/core/src/routesLoader.js +++ b/@salix/core/src/routesLoader.js @@ -6,16 +6,16 @@ export const NAME = util.getProviderName ('RoutesLoader') function $get($http){ let script = document.currentScript || (() => { - let scripts = document.getElementsByTagName ('script'); - return scripts[scripts.length - 1]; - }) (); - - let routesCdn = script.getAttribute ('routes-cdn'); - return $http - ({ - method: 'GET', - url: routesCdn - }) + let scripts = document.getElementsByTagName ('script'); + return scripts[scripts.length - 1]; + }) (); + + let routesCdn = script.getAttribute ('routes-cdn'); + + return $http({ + method: 'GET', + url: routesCdn + }); } $get.$inject = ["$http"]; @@ -25,4 +25,3 @@ export class RoutesLoader{ constructor () {} } RoutesLoader.prototype.$get = $get; var routes = new RoutesLoader (); _module.provider (NAME, () => routes) - diff --git a/@salix/core/src/rule.js b/@salix/core/src/rule.js index 3d7eb6d41a..b7d768f1db 100644 --- a/@salix/core/src/rule.js +++ b/@salix/core/src/rule.js @@ -4,7 +4,7 @@ export const NAME = 'vnRule'; export function directive() { return { restrict: 'A', - link: function (attrs, element){ + link: function (attrs, element) { } }; } diff --git a/@salix/core/src/submit/submit.mdl.html b/@salix/core/src/submit/submit.mdl.html index 7a574413bf..d6fc98b527 100644 --- a/@salix/core/src/submit/submit.mdl.html +++ b/@salix/core/src/submit/submit.mdl.html @@ -1,2 +1,2 @@ - + diff --git a/@salix/core/src/textfield/textfield.mdl.html b/@salix/core/src/textfield/textfield.mdl.html index 3af2dd79a3..90012bc2b0 100644 --- a/@salix/core/src/textfield/textfield.mdl.html +++ b/@salix/core/src/textfield/textfield.mdl.html @@ -1,4 +1,4 @@
- +
diff --git a/@salix/login/src/login/login.html b/@salix/login/src/login/login.html index 6c27e7af05..f01f5fd87b 100755 --- a/@salix/login/src/login/login.html +++ b/@salix/login/src/login/login.html @@ -13,5 +13,5 @@ - + diff --git a/@salix/package.json b/@salix/package.json index bc9c22f591..b4e6068db0 100644 --- a/@salix/package.json +++ b/@salix/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "angular": "^1.5.8", + "angular-translate": "^2.13.1", "angular-ui-router": "^1.0.0-beta.3", "express": "^4.14.0", "material-design-lite": "^1.2.1", diff --git a/@salix/vendor/src/angular-translate-vendor.js b/@salix/vendor/src/angular-translate-vendor.js new file mode 100644 index 0000000000..144b4fb083 --- /dev/null +++ b/@salix/vendor/src/angular-translate-vendor.js @@ -0,0 +1,5 @@ +import * as _ngTranslate from 'angular-translate'; + +export const ngTranslate = { + name: 'pascalprecht.translate' +}; diff --git a/@salix/vendor/src/vendor.js b/@salix/vendor/src/vendor.js index 5d9cded94f..7405877257 100644 --- a/@salix/vendor/src/vendor.js +++ b/@salix/vendor/src/vendor.js @@ -1,4 +1,5 @@ export * from './angular-vendor'; export * from './oclazyload-vendor'; export * from './uirouter-vendor'; +export * from './angular-translate-vendor'; export * from './materialdesignlite-vendor'; \ No newline at end of file