taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[i18n] Use default language configured in global settings instead en

stable
David Barragán Merino 2015-04-21 20:08:02 +02:00
parent ed11ff21a2
commit 3913712bbd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/coffee/app.coffee
View File

@ -159,12 +159,12 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
$routeProvider.when("/permission-denied", $routeProvider.when("/permission-denied",
{templateUrl: "error/permission-denied.html"}) {templateUrl: "error/permission-denied.html"})
$routeProvider.otherwise({redirectTo: '/not-found'}) $routeProvider.otherwise({redirectTo: "/not-found"})
$locationProvider.html5Mode({enabled: true, requireBase: false}) $locationProvider.html5Mode({enabled: true, requireBase: false})
defaultHeaders = { defaultHeaders = {
"Content-Type": "application/json" "Content-Type": "application/json"
"Accept-Language": "en" "Accept-Language": window.taigaConfig.defaultLanguage || "en"
"X-Session-Id": taiga.sessionId "X-Session-Id": taiga.sessionId
} }
@ -197,7 +197,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
$provide.factory("authHttpIntercept", ["$q", "$location", "$tgNavUrls", "lightboxService", authHttpIntercept]) $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. # If there is an error in the version throw a notify error.
# IMPROVEiMENT: Move this version error handler to USs, issues and tasks repository # 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]) $provide.factory("versionCheckHttpIntercept", ["$q", versionCheckHttpIntercept])
$httpProvider.interceptors.push('versionCheckHttpIntercept') $httpProvider.interceptors.push("versionCheckHttpIntercept")
window.checksley.updateValidators({ window.checksley.updateValidators({
linewidth: (val, width) -> linewidth: (val, width) ->
@ -233,13 +233,13 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
$translateProvider $translateProvider
.useStaticFilesLoader({ .useStaticFilesLoader({
prefix: '/locales/locale-', prefix: "/locales/locale-",
suffix: '.json' suffix: ".json"
}) })
.preferredLanguage(window.taigaConfig.defaultLanguage || 'en') .preferredLanguage(window.taigaConfig.defaultLanguage || "en")
if not window.taigaConfig.debugInfo 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) -> init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->