diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 6858425d..a0140849 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -36,7 +36,7 @@ taiga.generateUniqueSessionIdentifier = -> taiga.sessionId = taiga.generateUniqueSessionIdentifier() -configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEventsProvider, tgLoaderProvider, $compileProvider) -> +configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEventsProvider, tgLoaderProvider, $compileProvider, $translateProvider) -> $routeProvider.when("/", {templateUrl: "project/projects.html", resolve: {loader: tgLoaderProvider.add()}}) @@ -236,23 +236,33 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven $compileProvider.debugInfoEnabled(window.taigaConfig.debugInfo || false) -init = ($log, $i18n, $config, $rootscope, $auth, $events, $analytics) -> - $i18n.initialize($config.get("defaultLanguage")) + $translateProvider.useStaticFilesLoader({ + prefix: '/locales/locale-', + suffix: '.json' + }) + + $translateProvider.preferredLanguage('en') + +init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) -> $log.debug("Initialize application") $rootscope.contribPlugins = @.taigaContribPlugins if $auth.isAuthenticated() $events.setupConnection() + user = $auth.getUser() + + $translate.use(user.lang) if user.lang + $analytics.initialize() + modules = [ # Main Global Modules "taigaBase", "taigaCommon", "taigaResources", - "taigaLocales", "taigaAuth", "taigaEvents", @@ -281,6 +291,7 @@ modules = [ # Vendor modules "ngRoute", "ngAnimate", + "pascalprecht.translate" ].concat(_.map(@.taigaContribPlugins, (plugin) -> plugin.module)) # Main module definition @@ -294,16 +305,17 @@ module.config([ "$tgEventsProvider", "tgLoaderProvider", "$compileProvider", + "$translateProvider", configure ]) module.run([ "$log", - "$tgI18n", "$tgConfig", "$rootScope", "$tgAuth", "$tgEvents", "$tgAnalytics", + "$translate" init ]) diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee index a900273c..a12e4b52 100644 --- a/app/coffee/modules/admin/lightboxes.coffee +++ b/app/coffee/modules/admin/lightboxes.coffee @@ -30,10 +30,10 @@ MAX_MEMBERSHIP_FIELDSETS = 4 ## Create Members Lightbox Directive ############################################################################# -CreateMembersDirective = ($rs, $rootScope, $confirm, $loading ,lightboxService) -> +CreateMembersDirective = ($rs, $rootScope, $confirm, $loading ,lightboxService, $compile) -> extraTextTemplate = """
-
@@ -42,7 +42,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, $loading ,lightboxService) template = _.template("""
- data-required="true" <% } %> data-type="email" /> + data-required="true" <% } %> data-type="email" />