From 3913712bbd69108cff52b5fe09d686a88ac48b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 21 Apr 2015 20:08:02 +0200 Subject: [PATCH] [i18n] Use default language configured in global settings instead en --- app/coffee/app.coffee | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 47b24394..f10b1de6 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -159,12 +159,12 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven $routeProvider.when("/permission-denied", {templateUrl: "error/permission-denied.html"}) - $routeProvider.otherwise({redirectTo: '/not-found'}) + $routeProvider.otherwise({redirectTo: "/not-found"}) $locationProvider.html5Mode({enabled: true, requireBase: false}) defaultHeaders = { "Content-Type": "application/json" - "Accept-Language": "en" + "Accept-Language": window.taigaConfig.defaultLanguage || "en" "X-Session-Id": taiga.sessionId } @@ -197,7 +197,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven $provide.factory("authHttpIntercept", ["$q", "$location", "$tgNavUrls", "lightboxService", authHttpIntercept]) - $httpProvider.interceptors.push('authHttpIntercept') + $httpProvider.interceptors.push("authHttpIntercept") # If there is an error in the version throw a notify error. # IMPROVEiMENT: Move this version error handler to USs, issues and tasks repository @@ -217,7 +217,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven $provide.factory("versionCheckHttpIntercept", ["$q", versionCheckHttpIntercept]) - $httpProvider.interceptors.push('versionCheckHttpIntercept') + $httpProvider.interceptors.push("versionCheckHttpIntercept") window.checksley.updateValidators({ linewidth: (val, width) -> @@ -233,13 +233,13 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven $translateProvider .useStaticFilesLoader({ - prefix: '/locales/locale-', - suffix: '.json' + prefix: "/locales/locale-", + suffix: ".json" }) - .preferredLanguage(window.taigaConfig.defaultLanguage || 'en') + .preferredLanguage(window.taigaConfig.defaultLanguage || "en") if not window.taigaConfig.debugInfo - $translateProvider.fallbackLanguage([window.taigaConfig.defaultLanguage || 'en']) + $translateProvider.fallbackLanguage([window.taigaConfig.defaultLanguage || "en"]) init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->