From cdcadab68b8e4b19e17221c8f40363e3377ec4ae Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Wed, 13 Jan 2016 13:28:47 +0100
Subject: [PATCH] localize overlay titles

---
 .../editorpicker/editorpicker.controller.js    |  4 ++++
 .../propertysettings.controller.js             |  1 -
 .../common/overlays/copy/copy.controller.js    |  4 ++++
 .../common/overlays/embed/embed.controller.js  |  7 +++++--
 .../common/overlays/help/help.controller.js    | 10 ++++------
 .../iconpicker/iconpicker.controller.js        | 10 ++++++----
 .../itempicker/itempicker.controller.js        | 18 ++++++++++++------
 .../linkpicker/linkpicker.controller.js        |  6 +++---
 .../macropicker/macropicker.controller.js      |  7 +++++--
 .../mediaPicker/mediapicker.controller.js      |  6 +++++-
 .../membergrouppicker.controller.js            |  6 +++++-
 .../common/overlays/move/move.controller.js    |  4 ++++
 .../treepicker/treepicker.controller.js        |  9 +++++++++
 .../common/overlays/user/user.controller.js    |  4 ++++
 .../common/overlays/ysod/ysod.controller.js    |  4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml  | 16 +++++++++++++++-
 16 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js
index 4c2c281c1e..01ba9b128f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js
@@ -14,6 +14,10 @@
 
 		var vm = this;
 
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("defaultdialogs_selectEditor").then(function (value) {return value;});
+        }
+
 		vm.searchTerm = "";
 		vm.showTabs = false;
 		vm.tabsLoaded = 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js
index 70fc5665fb..c41c6261a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js
@@ -65,7 +65,6 @@
          vm.focusOnMandatoryField = false;
 
          vm.editorPickerOverlay = {};
-         vm.editorPickerOverlay.title = "Choose editor";
          vm.editorPickerOverlay.property = $scope.model.property;
          vm.editorPickerOverlay.contentTypeName = $scope.model.contentTypeName;
          vm.editorPickerOverlay.view = "views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html";
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
index 1476b852f2..6b31fc17d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
@@ -5,6 +5,10 @@
 
       var vm = this;
 
+      if(!$scope.model.title) {
+          $scope.model.title = localizationService.localize("general_copy").then(function (value) {return value;});
+      }
+
       vm.hideSearch = hideSearch;
       vm.selectResult = selectResult;
       vm.onSearchResults = onSearchResults;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
index 20568c8ae5..e912758f0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
@@ -1,13 +1,16 @@
 (function() {
    "use strict";
 
-   function EmbedOverlay($scope, $http, umbRequestHelper) {
+   function EmbedOverlay($scope, $http, umbRequestHelper, localizationService) {
 
       var vm = this;
       var origWidth = 500;
       var origHeight = 300;
 
-      $scope.model.title = "Embed";
+      if(!$scope.model.title) {
+          $scope.model.title = localizationService.localize("general_embed").then(function (value) {return value;});
+      }
+
       $scope.model.embed = {
          url: "",
          width: 360,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js
index 13b2f4edb6..8d88150368 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js
@@ -2,9 +2,12 @@ angular.module("umbraco")
     .controller("Umbraco.Overlays.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;
-        $scope.model.title = "Help";
         $scope.model.subtitle = "Umbraco version" + " " + $scope.version;
 
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("general_help").then(function (value) {return value;});
+        }
+
         if(!$scope.section){
             $scope.section = "content";
         }
@@ -19,11 +22,6 @@ angular.module("umbraco")
             $scope.sectionName = value;
         });
 
-        // translate dialog title
-        localizationService.localize("sections_help").then(function (value) {
-            $scope.model.title = value;
-        });
-
         userService.getCurrentUser().then(function(user){
 
         	rq.usertype = user.userType;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
index 9d01c0d579..8cd58dda5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
@@ -6,14 +6,16 @@
  * @description
  * The controller for the content type editor property dialog
  */
-function IconPickerOverlay($scope, iconHelper) {
+function IconPickerOverlay($scope, iconHelper, localizationService) {
 
    $scope.loading = true;
    $scope.model.hideSubmitButton = true;
 
-   if(!$scope.model.title) {
-       $scope.model.title = "Select an icon";
-   }
+    if (!$scope.model.title) {
+        $scope.model.title = localizationService.localize("defaultdialogs_selectIcon").then(function(value) {
+            return value;
+        });
+    }
 
    iconHelper.getIcons().then(function(icons) {
       $scope.icons = icons;
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 db858db679..fdb687e5f4 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,11 +1,17 @@
-function ItemPickerOverlay($scope) {
+function ItemPickerOverlay($scope, localizationService) {
 
-   $scope.model.hideSubmitButton = true;
+    if (!$scope.model.title) {
+        $scope.model.title = localizationService.localize("defaultdialogs_selectItem").then(function(value) {
+            return value;
+        });
+    }
 
-   $scope.selectItem = function(item) {
-       $scope.model.selectedItem = item;
-       $scope.submitForm($scope.model);
-   };
+    $scope.model.hideSubmitButton = true;
+
+    $scope.selectItem = function(item) {
+        $scope.model.selectedItem = item;
+        $scope.submitForm($scope.model);
+    };
 
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index 7458f04011..59e97566c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -8,9 +8,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	        searchText = value + "...";
 	    });
 
-        if(!$scope.model.title) {
-            $scope.model.title = "Link picker";
-        }
+		if(!$scope.model.title) {
+		    $scope.model.title = localizationService.localize("defaultdialogs_selectLink").then(function (value) {return value;});
+		}
 
 	    $scope.dialogTreeEventHandler = $({});
 	    $scope.model.target = {};
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js
index 8fef90b607..6ab02fecbc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js
@@ -1,7 +1,10 @@
-function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper) {
+function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper, localizationService) {
 
 
-    $scope.model.title = "Macro picker";
+    if(!$scope.model.title) {
+        $scope.model.title = localizationService.localize("defaultdialogs_selectMacro").then(function (value) {return value;});
+    }
+
     $scope.macros = [];
     $scope.model.selectedMacro = null;
     $scope.wizardStep = "macroSelect";
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 4ad796ee11..88b4ed3788 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -1,7 +1,11 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Overlays.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore) {
+        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) {
+
+            if(!$scope.model.title) {
+                $scope.model.title = localizationService.localize("defaultdialogs_selectMedia").then(function (value) {return value;});
+            }
 
             var dialogOptions = $scope.model;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js
index 4457ac8f90..b38e1c1c59 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js
@@ -1,6 +1,10 @@
 //used for the member picker dialog
 angular.module("umbraco").controller("Umbraco.Overlays.MemberGroupPickerController",
-    function($scope, eventsService, entityResource, searchService, $log) {
+    function($scope, eventsService, entityResource, searchService, $log, localizationService) {
+
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("defaultdialogs_selectMemberGroup").then(function (value) {return value;});
+        }
 
         $scope.dialogTreeEventHandler = $({});
         $scope.multiPicker = $scope.model.multiPicker;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
index abe58b9a02..3324b244d8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
@@ -17,6 +17,10 @@
           searchText = value + "...";
       });
 
+      if(!$scope.model.title) {
+          $scope.model.title = localizationService.localize("actions_move").then(function (value) {return value;});
+      }
+
       $scope.model.relateToOriginal = true;
       $scope.dialogTreeEventHandler = $({});
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index 2e530235d3..6f5438de24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -23,10 +23,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 
 			  if(contentType === "content") {
 				  entityType = "Document";
+				  if(!$scope.model.title) {
+					  $scope.model.title = localizationService.localize("defaultdialogs_selectContent").then(function (value) {return value;});
+				  }
 			  } else if(contentType === "member") {
 				  entityType = "Member";
+				  if(!$scope.model.title) {
+					  $scope.model.title = localizationService.localize("defaultdialogs_selectMember").then(function (value) {return value;});
+				  }
 			  } else if(contentType === "media") {
 				  entityType = "Media";
+				  if(!$scope.model.title) {
+					  $scope.model.title = localizationService.localize("defaultdialogs_selectMedia").then(function (value) {return value;});
+				  }
 			  }
 		  }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
index d76dac9bdf..544b50ceef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
@@ -7,6 +7,10 @@ angular.module("umbraco")
         $scope.changePasswordButtonState = "init";
         $scope.model.subtitle = "Umbraco version" + " " + $scope.version;
 
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("general_user").then(function (value) {return value;});
+        }
+
         $scope.externalLoginProviders = externalLoginInfo.providers;
         $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl;
         var evts = [];
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
index 2b07b8830f..a060036765 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
@@ -1,8 +1,8 @@
 angular.module("umbraco")
     .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) {
 
-        if (!$scope.model.title) {
-            $scope.model.title = "Received an error from the server";
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("errors_receivedErrorFromServer").then(function (value) {return value;});
         }
 
         if ($scope.model.error && $scope.model.error.data && $scope.model.error.data.StackTrace) {
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index f1a89c0934..8bc6f15836 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -252,7 +252,15 @@
     <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
 
     <key alias="linkToMedia">Link to media</key>
-    <key alias="selectMedia">SelectMedia</key>
+
+    <key alias="selectMedia">Select media</key>
+    <key alias="selectIcon">Select icon</key>
+    <key alias="selectItem">Select item</key>
+    <key alias="selectLink">Select link</key>
+    <key alias="selectMacro">Select macro</key>
+    <key alias="selectContent">Select content</key>
+    <key alias="selectMember">Select member</key>
+    <key alias="selectMemberGroup">Select member group</key>
 
     <key alias="noMacroParams">There are no parameters for this macro</key>
 
@@ -265,6 +273,7 @@
 
     <key alias="account">account</key>
 
+    <key alias="selectEditor">Select editor</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
@@ -461,6 +470,8 @@
     <key alias="listView">List view</key>
     <key alias="saving">Saving...</key>
     <key alias="current">current</key>
+    <key alias="move">Move</key>
+    <key alias="embed">Embed</key>
   </area>
 
   <area alias="colors">
@@ -1207,4 +1218,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="yourHistory" version="7.0">Your recent history</key>
     <key alias="sessionExpires" version="7.0">Session expires in</key>
   </area>
+  <area alias="errors">
+      <key alias="receivedErrorFromServer">Received an error from the server</key>
+  </area>
 </language>