From 611913326ae38d3717f7f6aba1f8b77d3c64d911 Mon Sep 17 00:00:00 2001 From: Alexander Styre Date: Wed, 11 Nov 2015 13:28:32 +0100 Subject: [PATCH] Supporting translation for contrib plugins. --- app/coffee/app.coffee | 9 +++++---- app/locales/{ => taiga}/locale-ca.json | 0 app/locales/{ => taiga}/locale-de.json | 0 app/locales/{ => taiga}/locale-en.json | 0 app/locales/{ => taiga}/locale-es.json | 0 app/locales/{ => taiga}/locale-fi.json | 0 app/locales/{ => taiga}/locale-fr.json | 0 app/locales/{ => taiga}/locale-it.json | 0 app/locales/{ => taiga}/locale-nl.json | 0 app/locales/{ => taiga}/locale-pl.json | 0 app/locales/{ => taiga}/locale-pt-br.json | 0 app/locales/{ => taiga}/locale-ru.json | 0 app/locales/{ => taiga}/locale-zh-hant.json | 0 bower.json | 1 + gulpfile.js | 1 + 15 files changed, 7 insertions(+), 4 deletions(-) rename app/locales/{ => taiga}/locale-ca.json (100%) rename app/locales/{ => taiga}/locale-de.json (100%) rename app/locales/{ => taiga}/locale-en.json (100%) rename app/locales/{ => taiga}/locale-es.json (100%) rename app/locales/{ => taiga}/locale-fi.json (100%) rename app/locales/{ => taiga}/locale-fr.json (100%) rename app/locales/{ => taiga}/locale-it.json (100%) rename app/locales/{ => taiga}/locale-nl.json (100%) rename app/locales/{ => taiga}/locale-pl.json (100%) rename app/locales/{ => taiga}/locale-pt-br.json (100%) rename app/locales/{ => taiga}/locale-ru.json (100%) rename app/locales/{ => taiga}/locale-zh-hant.json (100%) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index c0118c9a..c879766d 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -39,7 +39,7 @@ taiga.sessionId = taiga.generateUniqueSessionIdentifier() configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEventsProvider, - $compileProvider, $translateProvider, $animateProvider) -> + $compileProvider, $translateProvider, $translatePartialLoaderProvider, $animateProvider) -> $animateProvider.classNameFilter(/^(?:(?!ng-animate-disabled).)*$/) @@ -505,10 +505,10 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven # i18n preferedLangCode = userInfo?.lang || window.taigaConfig.defaultLanguage || "en" + $translatePartialLoaderProvider.addPart('taiga') $translateProvider - .useStaticFilesLoader({ - prefix: "/locales/locale-", - suffix: ".json" + .useLoader('$translatePartialLoader', { + urlTemplate: '/locales/{part}/locale-{lang}.json' }) .useSanitizeValueStrategy('escapeParameters') .addInterpolation('$translateMessageFormatInterpolation') @@ -684,6 +684,7 @@ module.config([ "$tgEventsProvider", "$compileProvider", "$translateProvider", + "$translatePartialLoaderProvider", "$animateProvider", configure ]) diff --git a/app/locales/locale-ca.json b/app/locales/taiga/locale-ca.json similarity index 100% rename from app/locales/locale-ca.json rename to app/locales/taiga/locale-ca.json diff --git a/app/locales/locale-de.json b/app/locales/taiga/locale-de.json similarity index 100% rename from app/locales/locale-de.json rename to app/locales/taiga/locale-de.json diff --git a/app/locales/locale-en.json b/app/locales/taiga/locale-en.json similarity index 100% rename from app/locales/locale-en.json rename to app/locales/taiga/locale-en.json diff --git a/app/locales/locale-es.json b/app/locales/taiga/locale-es.json similarity index 100% rename from app/locales/locale-es.json rename to app/locales/taiga/locale-es.json diff --git a/app/locales/locale-fi.json b/app/locales/taiga/locale-fi.json similarity index 100% rename from app/locales/locale-fi.json rename to app/locales/taiga/locale-fi.json diff --git a/app/locales/locale-fr.json b/app/locales/taiga/locale-fr.json similarity index 100% rename from app/locales/locale-fr.json rename to app/locales/taiga/locale-fr.json diff --git a/app/locales/locale-it.json b/app/locales/taiga/locale-it.json similarity index 100% rename from app/locales/locale-it.json rename to app/locales/taiga/locale-it.json diff --git a/app/locales/locale-nl.json b/app/locales/taiga/locale-nl.json similarity index 100% rename from app/locales/locale-nl.json rename to app/locales/taiga/locale-nl.json diff --git a/app/locales/locale-pl.json b/app/locales/taiga/locale-pl.json similarity index 100% rename from app/locales/locale-pl.json rename to app/locales/taiga/locale-pl.json diff --git a/app/locales/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json similarity index 100% rename from app/locales/locale-pt-br.json rename to app/locales/taiga/locale-pt-br.json diff --git a/app/locales/locale-ru.json b/app/locales/taiga/locale-ru.json similarity index 100% rename from app/locales/locale-ru.json rename to app/locales/taiga/locale-ru.json diff --git a/app/locales/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json similarity index 100% rename from app/locales/locale-zh-hant.json rename to app/locales/taiga/locale-zh-hant.json diff --git a/bower.json b/bower.json index 6f177a36..18943722 100644 --- a/bower.json +++ b/bower.json @@ -76,6 +76,7 @@ "raven-js": "~1.1.16", "l.js": "~0.1.0", "angular-translate": "~2.8.1", + "angular-translate-loader-partial": "~2.8.1", "angular-translate-loader-static-files": "~2.8.1", "angular-translate-interpolation-messageformat": "~2.8.1", "ngInfiniteScroll": "1.2.1", diff --git a/gulpfile.js b/gulpfile.js index 066f2951..fda87eff 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -148,6 +148,7 @@ paths.libs = [ paths.vendor + "angular-animate/angular-animate.js", paths.vendor + "angular-aria/angular-aria.js", paths.vendor + "angular-translate/angular-translate.js", + paths.vendor + "angular-translate-loader-partial/angular-translate-loader-partial.js", paths.vendor + "angular-translate-loader-static-files/angular-translate-loader-static-files.js", paths.vendor + "angular-translate-interpolation-messageformat/angular-translate-interpolation-messageformat.js", paths.vendor + "moment/min/moment-with-locales.js",