From eb6da7a41aef390c2c9312d37e85294784a7895e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 6 Jun 2018 11:26:34 +0200
Subject: [PATCH] fixing item picker title and master template title

---
 .../itempicker/itempicker.controller.js       | 14 +++--
 .../src/views/templates/edit.controller.js    | 56 ++++++++++---------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
index a848c0ae90..9e758a5b21 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
@@ -1,16 +1,22 @@
 function ItemPickerOverlay($scope, localizationService) {
 
-    if (!$scope.model.title) {
-        $scope.model.title = localizationService.localize("defaultdialogs_selectItem");
-    }
+    function onInit() {
+        $scope.model.hideSubmitButton = true;
 
-    $scope.model.hideSubmitButton = true;
+        if (!$scope.model.title) {
+            localizationService.localize("defaultdialogs_selectItem").then(function(value){
+                $scope.model.title = value;
+            });
+        }
+    }
 
     $scope.selectItem = function(item) {
         $scope.model.selectedItem = item;
         $scope.submitForm($scope.model);
     };
 
+    onInit();
+
 }
 
 angular.module("umbraco").controller("Umbraco.Overlays.ItemPickerOverlay", ItemPickerOverlay);
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 72e39c3b48..571dc05286 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -569,34 +569,38 @@
                 }
             });
 
-            vm.masterTemplateOverlay = {
-                view: "itempicker",
-                title: localizationService.localize("template_mastertemplate"),
-                availableItems: availableMasterTemplates,
-                show: true,
-                submit: function(model) {
+            localizationService.localize("template_mastertemplate").then(function(value){
+                var title = value;
 
-                    var template = model.selectedItem;
-
-                    if (template && template.alias) {
-                        vm.template.masterTemplateAlias = template.alias;
-                        setLayout(template.alias + ".cshtml");
-                    } else {
-                        vm.template.masterTemplateAlias = null;
-                        setLayout(null);
+                vm.masterTemplateOverlay = {
+                    view: "itempicker",
+                    title: title,
+                    availableItems: availableMasterTemplates,
+                    show: true,
+                    submit: function(model) {
+    
+                        var template = model.selectedItem;
+    
+                        if (template && template.alias) {
+                            vm.template.masterTemplateAlias = template.alias;
+                            setLayout(template.alias + ".cshtml");
+                        } else {
+                            vm.template.masterTemplateAlias = null;
+                            setLayout(null);
+                        }
+    
+                        vm.masterTemplateOverlay.show = false;
+                        vm.masterTemplateOverlay = null;
+                    },
+                    close: function(oldModel) {
+                        // close dialog
+                        vm.masterTemplateOverlay.show = false;
+                        vm.masterTemplateOverlay = null;
+                        // focus editor
+                        vm.editor.focus();
                     }
-
-                    vm.masterTemplateOverlay.show = false;
-                    vm.masterTemplateOverlay = null;
-                },
-                close: function(oldModel) {
-                    // close dialog
-                    vm.masterTemplateOverlay.show = false;
-                    vm.masterTemplateOverlay = null;
-                    // focus editor
-                    vm.editor.focus();
-                }
-            };
+                };
+            });
 
         }