diff --git a/src/translation/de.json b/src/translation/de.json index 44280012b..a3e48e292 100644 --- a/src/translation/de.json +++ b/src/translation/de.json @@ -12,7 +12,12 @@ "adminPageActionTooltip": "Administratorseite", "infoActionTooltip": "Info", "logsActionTooltip": "Logfiles", - "configActionTooltip": "Konfiguration" + "configActionTooltip": "Konfiguration", + "domainsFilterHeader": "Alle Domänen", + "tagsFilterHeaderAll": "Alle Schlagworte", + "tagsFilterHeader": "Schlagworte: {{ tags }}", + "stateFilterHeader": "Jeder Status", + "searchPlaceholder": "Suche Apps" }, "main": { "offline": "Cloudron ist nicht erreichbar. Verbindungsaufbau…", @@ -736,7 +741,26 @@ "category": { "newApps": "Neue Apps", "popular": "Beliebt", - "all": "Alle" + "all": "Alle", + "vpn": "VPN", + "wiki": "Wiki", + "project": "Projektmanagement", + "sync": "Dateisynchronisation", + "notes": "Notizen", + "learning": "Lernen", + "media": "Medien", + "hosting": "Web-Hosting", + "game": "Spiele", + "email": "E-Mail", + "git": "Code-Hosting", + "finance": "Finanzen", + "gallery": "Galerie", + "forum": "Forum", + "crm": "CRM", + "document": "Dokumente", + "blog": "Blog", + "chat": "Chat", + "analytics": "Analytics" } }, "services": { @@ -1024,7 +1048,10 @@ "new": "Neu", "upload": "Hochladen", "newFile": "Neue Datei", - "uploadFile": "Datei hochladen" + "uploadFile": "Datei hochladen", + "openLogs": "Logfiles öffnen", + "openTerminal": "Terminal öffnen", + "restartApp": "Anwendung neustarten" }, "list": { "size": "Größe", @@ -1053,6 +1080,9 @@ }, "newFile": { "errorAlreadyExists": "Bereits vorhanden" + }, + "status": { + "restartingApp": "Die Anwendung wird neugestartet" } }, "passwordReset": { @@ -1352,7 +1382,12 @@ "securityTabTitle": "Sicherheit", "emailTabTitle": "E-Mail", "updatesTabTitle": "Aktualisierungen", - "backupsTabTitle": "Backup" + "backupsTabTitle": "Backup", + "states": { + "notResponding": "Nicht Ansprechbar", + "stopped": "Angehalten", + "running": "Laufend" + } }, "logs": { "download": "Vollständige Logfiles herunterladen", diff --git a/src/translation/en.json b/src/translation/en.json index 99a925029..13df4e2ff 100644 --- a/src/translation/en.json +++ b/src/translation/en.json @@ -12,7 +12,12 @@ "configActionTooltip": "Config", "logsActionTooltip": "Logs", "infoActionTooltip": "Info", - "adminPageActionTooltip": "Admin Page" + "adminPageActionTooltip": "Admin Page", + "searchPlaceholder": "Search Apps", + "stateFilterHeader": "All States", + "tagsFilterHeader": "Tags: {{ tags }}", + "tagsFilterHeaderAll": "All Tags", + "domainsFilterHeader": "All Domains" }, "main": { "offline": "Cloudron is offline. Reconnecting…", @@ -1308,6 +1313,11 @@ "description": "Using backup from {{ creationTime }} and version v{{ packageVersion }}", "location": "Location", "cloneAction": "Clone" + }, + "states": { + "running": "Running", + "stopped": "Stopped", + "notResponding": "Not Responding" } }, "login": { diff --git a/src/views/apps.html b/src/views/apps.html index d20f3f93b..e11fc6426 100644 --- a/src/views/apps.html +++ b/src/views/apps.html @@ -106,9 +106,9 @@ {{ 'apps.title' | tr }}
- - - + + +
diff --git a/src/views/apps.js b/src/views/apps.js index 12d230af0..a279b029b 100644 --- a/src/views/apps.js +++ b/src/views/apps.js @@ -3,7 +3,7 @@ /* global angular:false */ /* global $:false */ -angular.module('Application').controller('AppsController', ['$scope', '$timeout', '$interval', '$location', 'Client', function ($scope, $timeout, $interval, $location, Client) { +angular.module('Application').controller('AppsController', ['$scope', '$translate', '$timeout', '$interval', '$location', 'Client', function ($scope, $translate, $timeout, $interval, $location, Client) { var ALL_DOMAINS_DOMAIN = { _alldomains: true, domain: 'All Domains' }; // dummy record for the single select filter $scope.installedApps = Client.getInstalledApps(); @@ -23,6 +23,14 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout' $scope.domains = []; $scope.appSearch = ''; + $translate(['apps.stateFilterHeader', 'apps.domainsFilterHeader', 'app.states.running', 'app.states.stopped', 'app.states.notResponding']).then(function (tr) { + if (tr['apps.domainsFilterHeader']) ALL_DOMAINS_DOMAIN.domain = tr['apps.domainsFilterHeader']; + if (tr['apps.stateFilterHeader']) $scope.states[0].label = tr['apps.stateFilterHeader']; + if (tr['app.states.running']) $scope.states[1].label = tr['app.states.running']; + if (tr['app.states.stopped']) $scope.states[2].label = tr['app.states.stopped']; + if (tr['app.states.notResponding']) $scope.states[3].label = tr['app.states.notResponding']; + }); + $scope.$watch('selectedTags', function (newVal, oldVal) { if (newVal === oldVal) return;