diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js index 7fabd5c7df..d898ec48f8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js @@ -1,14 +1,21 @@ angular.module("umbraco") - .controller("Umbraco.Dialogs.HelpController", function ($scope, $location, $routeParams, helpService, userService) { + .controller("Umbraco.Dialogs.HelpController", function ($scope, $location, $routeParams, helpService, userService, localizationService) { $scope.section = $routeParams.section; $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion; if(!$scope.section){ - $scope.section ="content"; + $scope.section = "content"; } + $scope.sectionName = $scope.section; + var rq = {}; rq.section = $scope.section; + + //translate section name + localizationService.localize("sections_" + rq.section).then(function (value) { + $scope.sectionName = value; + }); userService.getCurrentUser().then(function(user){ diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html index 73d3271a89..f066da8e7c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html @@ -7,7 +7,7 @@
-
Help topics for: {{section}}
+
Help topics for: {{sectionName}}
  • @@ -31,7 +31,7 @@
-
Video chapters for: {{section}}
+
Video chapters for: {{sectionName}}
  • diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js index a944b1d38c..6ade0f1e9f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js @@ -6,7 +6,7 @@ * @description * The controller for the member list view */ -function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState) { +function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState, localizationService) { //setup scope vars $scope.currentSection = appState.getSectionState("currentSection"); @@ -18,6 +18,13 @@ function MemberListController($scope, $routeParams, $location, $q, $window, appS $scope.loaded = true; $scope.content = data; + //translate "All Members" + if ($scope.content != null && $scope.content.name != null && $scope.content.name.replace(" ", "").toLowerCase() == "allmembers") { + localizationService.localize("member_allMembers").then(function (value) { + $scope.content.name = value; + }); + } + editorState.set($scope.content); navigationService.syncTree({ tree: "member", path: data.path.split(",") }).then(function (syncArgs) { diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 80a15a80ec..cfcfca042a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -918,9 +918,9 @@ Mange hilsner fra Umbraco robotten Søg alle 'børn' Start node Navn - Bruger tilladelser + Brugertilladelser Brugertype - Bruger typer + Brugertyper Forfatter Oversætter Din profil