diff --git a/src/js/logs.js b/src/js/logs.js index a40c47304..fd78e7c81 100644 --- a/src/js/logs.js +++ b/src/js/logs.js @@ -5,7 +5,44 @@ /* global $ */ // create main application module -var app = angular.module('Application', ['angular-md5', 'ui-notification']); +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; }, {}); diff --git a/src/logs.html b/src/logs.html index ec68a3cd6..eb82ead17 100644 --- a/src/logs.html +++ b/src/logs.html @@ -4,7 +4,7 @@ - Logs + {{ 'logs.title' | tr }} @@ -29,6 +29,7 @@ + @@ -38,6 +39,12 @@ + + + + + + @@ -54,7 +61,7 @@ - Cloudron is offline. Reconnecting... + {{ 'main.offline' | tr }}
@@ -62,10 +69,10 @@
- Terminal - File Manager - Clear View - Download Full Logs + {{ 'terminal.title' | tr }} + {{ 'filemanager.title' | tr }} + {{ 'logs.clear' | tr }} + {{ 'logs.download' | tr }}
diff --git a/src/translation/en.json b/src/translation/en.json index e24dee3fd..4496b476a 100644 --- a/src/translation/en.json +++ b/src/translation/en.json @@ -326,6 +326,14 @@ "clearAll": "Clear All" }, "logs": { - "title": "Logs" + "title": "Logs", + "clear": "Clear View", + "download": "Download Full Logs" + }, + "terminal": { + "title": "Terminal" + }, + "filemanager": { + "title": "File Manager" } }