diff --git a/src/js/client.js b/src/js/client.js index f2735b359..dc6363e01 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -117,6 +117,43 @@ angular.module('Application').filter('markdown2html', function () { }; }); +angular.module('Application').config(['$translateProvider', function ($translateProvider) { + $translateProvider.useStaticFilesLoader({ + prefix: 'translation/', + suffix: '.json' + }); + $translateProvider.useLocalStorage(); + $translateProvider.preferredLanguage('en'); + $translateProvider.fallbackLanguage('en'); +}]); + +// Add shorthand "tr" filter to avoid having ot use "translate" +// This is a copy of the code at https://github.com/angular-translate/angular-translate/blob/master/src/filter/translate.js +// If we find out how to get that function handle somehow dynamically we can use that, otherwise the copy is required +function translateFilterFactory($parse, $translate) { + + 'use strict'; + + var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) { + if (!angular.isObject(interpolateParams)) { + var ctx = this || { + '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f' + }; + interpolateParams = $parse(interpolateParams)(ctx); + } + + return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage); + }; + + if ($translate.statefulFilter()) { + translateFilter.$stateful = true; + } + + return translateFilter; +} +translateFilterFactory.displayName = 'translateFilterFactory'; +angular.module('Application').filter('tr', translateFilterFactory); + // ---------------------------------------------- // Cloudron REST API wrapper diff --git a/src/js/index.js b/src/js/index.js index 64da081c3..177cfc322 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -30,16 +30,6 @@ app.config(['NotificationProvider', function (NotificationProvider) { }); }]); -app.config(['$translateProvider', function ($translateProvider) { - $translateProvider.useStaticFilesLoader({ - prefix: 'translation/', - suffix: '.json' - }); - $translateProvider.useLocalStorage(); - $translateProvider.preferredLanguage('en'); - $translateProvider.fallbackLanguage('en'); -}]); - // configure resourceUrlWhitelist https://code.angularjs.org/1.5.8/docs/api/ng/provider/$sceDelegateProvider#resourceUrlWhitelist app.config(function ($sceDelegateProvider) { $sceDelegateProvider.resourceUrlWhitelist([ @@ -118,34 +108,6 @@ app.config(['$routeProvider', function ($routeProvider) { }).otherwise({ redirectTo: '/'}); }]); - -// Add shorthand "tr" filter to avoid having ot use "translate" -// This is a copy of the code at https://github.com/angular-translate/angular-translate/blob/master/src/filter/translate.js -// If we find out how to get that function handle somehow dynamically we can use that, otherwise the copy is required -function translateFilterFactory($parse, $translate) { - - 'use strict'; - - var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) { - if (!angular.isObject(interpolateParams)) { - var ctx = this || { - '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f' - }; - interpolateParams = $parse(interpolateParams)(ctx); - } - - return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage); - }; - - if ($translate.statefulFilter()) { - translateFilter.$stateful = true; - } - - return translateFilter; -} -translateFilterFactory.displayName = 'translateFilterFactory'; -app.filter('tr', translateFilterFactory); - app.filter('installError', function () { return function (app) { if (!app) return false; diff --git a/src/js/logs.js b/src/js/logs.js index fd78e7c81..aa11db833 100644 --- a/src/js/logs.js +++ b/src/js/logs.js @@ -7,43 +7,6 @@ // create main application module var app = angular.module('Application', ['pascalprecht.translate', 'ngCookies', 'angular-md5', 'ui-notification']); -app.config(['$translateProvider', function ($translateProvider) { - $translateProvider.useStaticFilesLoader({ - prefix: 'translation/', - suffix: '.json' - }); - $translateProvider.useLocalStorage(); - $translateProvider.preferredLanguage('en'); - $translateProvider.fallbackLanguage('en'); -}]); - -// Add shorthand "tr" filter to avoid having ot use "translate" -// This is a copy of the code at https://github.com/angular-translate/angular-translate/blob/master/src/filter/translate.js -// If we find out how to get that function handle somehow dynamically we can use that, otherwise the copy is required -function translateFilterFactory($parse, $translate) { - - 'use strict'; - - var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) { - if (!angular.isObject(interpolateParams)) { - var ctx = this || { - '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f' - }; - interpolateParams = $parse(interpolateParams)(ctx); - } - - return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage); - }; - - if ($translate.statefulFilter()) { - translateFilter.$stateful = true; - } - - return translateFilter; -} -translateFilterFactory.displayName = 'translateFilterFactory'; -app.filter('tr', translateFilterFactory); - app.controller('LogsController', ['$scope', 'Client', function ($scope, Client) { var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});