From a07c43a7901cabd2fac75c59bf67890b4f964d70 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 31 May 2018 12:44:23 +0200 Subject: [PATCH] fix localisation in data type picker --- .../datatypepicker.controller.js | 57 +++++++++++++------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js index ae4eeaa02f..bd2a60f50e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js @@ -14,29 +14,14 @@ var vm = this; - if (!$scope.model.title) { - $scope.model.title = localizationService.localize("defaultdialogs_selectEditor"); - } - vm.searchTerm = ""; vm.showTabs = false; vm.tabsLoaded = 0; vm.typesAndEditors = []; vm.userConfigured = []; vm.loading = false; - vm.tabs = [{ - active: true, - id: 1, - label: localizationService.localize("contentTypeEditor_availableEditors"), - alias: "Default", - typesAndEditors: [] - }, { - active: false, - id: 2, - label: localizationService.localize("contentTypeEditor_reuse"), - alias: "Reuse", - userConfigured: [] - }]; + vm.tabs = []; + vm.labels = {}; vm.filterItems = filterItems; vm.showDetailsOverlay = showDetailsOverlay; @@ -46,12 +31,48 @@ vm.close = close; function activate() { - + setTitle(); + loadTabs(); getGroupedDataTypes(); getGroupedPropertyEditors(); } + function setTitle() { + if (!$scope.model.title) { + localizationService.localize("defaultdialogs_selectEditor") + .then(function(data){ + $scope.model.title = data; + }); + } + } + + function loadTabs() { + + var labels = ["contentTypeEditor_availableEditors", "contentTypeEditor_reuse"]; + + localizationService.localizeMany(labels) + .then(function(data){ + vm.labels.availableDataTypes = data[0]; + vm.labels.reuse = data[1]; + + vm.tabs = [{ + active: true, + id: 1, + label: vm.labels.availableDataTypes, + alias: "Default", + typesAndEditors: [] + }, { + active: false, + id: 2, + label: vm.labels.reuse, + alias: "Reuse", + userConfigured: [] + }]; + + }); + } + function getGroupedPropertyEditors() { vm.loading = true;