From cc1764dc88945492ae80bd0145e722e45bc7560b Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Tue, 12 Jan 2016 15:37:01 +0100
Subject: [PATCH] Added localization for controllers (member, media and
 document types)

---
 .../common/services/localization.service.js   |  4 +-
 .../views/documenttypes/create.controller.js  |  5 +--
 .../views/documenttypes/edit.controller.js    | 39 ++++++++++---------
 .../src/views/mediatypes/create.controller.js |  5 +--
 .../src/views/mediatypes/edit.controller.js   | 33 ++++++++--------
 .../views/membertypes/create.controller.js    |  6 +--
 .../src/views/membertypes/edit.controller.js  | 14 ++++---
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 22 ++++++++++-
 8 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
index 027a055bba..55b61e06fa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
@@ -105,7 +105,7 @@ angular.module('umbraco.services')
 
             return deferred.promise;
         },
-        
+
     };
 
     // force the load of the resource file
@@ -119,4 +119,4 @@ angular.module('umbraco.services')
 
     // return the local instance when called
     return service;
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
index d9abee4e43..84e490dd6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
@@ -13,15 +13,14 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
         creatingFolder: false,
     };
 
-    var node = $scope.dialogOptions.currentNode;
+    var node = $scope.dialogOptions.currentNode,
+        localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;});
 
     $scope.showCreateFolder = function() {
         $scope.model.creatingFolder = true;
     }
 
     $scope.createContainer = function () {
-        var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;})
-
         if (formHelper.submitForm({
             scope: $scope,
             formCtrl: this.createFolderForm,
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 72eef7bd58..72da692bbf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -12,6 +12,7 @@
         function DocumentTypesEditController($scope, $routeParams, modelsResource, contentTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper) {
 
         var vm = this;
+        var localizeSaving = localizationService.localize("general_saving").then(function (value) {return value;});
 
         vm.save = save;
 
@@ -22,23 +23,23 @@
         vm.page.saveButtonState = "init";
         vm.page.navigation = [
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design").then(function (value) {return value;}),
 			    "icon": "icon-document-dashed-line",
 			    "view": "views/documenttypes/views/design/design.html",
 			    "active": true
 			},
 			{
-			    "name": "List view",
+			    "name": localizationService.localize("general_listView").then(function (value) {return value;}),
 			    "icon": "icon-list",
 			    "view": "views/documenttypes/views/listview/listview.html"
 			},
 			{
-			    "name": "Permissions",
+			    "name": localizationService.localize("general_rights").then(function (value) {return value;}),
 			    "icon": "icon-keychain",
 			    "view": "views/documenttypes/views/permissions/permissions.html"
 			},
 			{
-			    "name": "Templates",
+			    "name": localizationService.localize("treeHeaders_templates").then(function (value) {return value;}),
 			    "icon": "icon-layout",
 			    "view": "views/documenttypes/views/templates/templates.html"
 			}
@@ -46,63 +47,63 @@
 
         vm.page.keyboardShortcutsOverview = [
 			{
-			    "name": "Sections",
+			    "name": localizationService.localize("main_sections").then(function (value) {return value;}),
 			    "shortcuts": [
 					{
-					    "description": "Navigate sections",
+					    "description": localizationService.localize("shortcuts_navigateSections").then(function (value) {return value;}),
 					    "keys": [{ "key": "1" }, { "key": "4" }],
 					    "keyRange": true
 					}
 			    ]
 			},
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design").then(function (value) {return value;}),
 			    "shortcuts": [
 				{
-				    "description": "Add tab",
+				    "description": localizationService.localize("shortcuts_addTab").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 				},
 				{
-				    "description": "Add property",
+				    "description": localizationService.localize("shortcuts_addProperty").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
 				},
 				{
-				    "description": "Add editor",
+				    "description": localizationService.localize("shortcuts_addEditor").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
 				},
 				{
-				    "description": "Edit data type",
+				    "description": localizationService.localize("shortcuts_editDataType").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
 				}
 			    ]
 			},
 		{
-		    "name": "List view",
+		    "name": localizationService.localize("general_listView").then(function (value) {return value;}),
 		    "shortcuts": [
 				{
-				    "description": "Toggle list view",
+				    "description": localizationService.localize("shortcuts_toggleListView").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
 				}
 		    ]
 		},
 		{
-		    "name": "Permissions",
+		    "name": localizationService.localize("general_rights").then(function (value) {return value;}),
 		    "shortcuts": [
 				{
-				    "description": "Toggle allow as root",
+				    "description": localizationService.localize("shortcuts_toggleAllowAsRoot").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
 				},
 				{
-				    "description": "Add child node",
+				    "description": localizationService.localize("shortcuts_addChildNode").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
 				}
 		    ]
 		},
 		{
-		    "name": "Templates",
+		    "name": localizationService.localize("treeHeaders_templates").then(function (value) {return value;}),
 		    "shortcuts": [
 				{
-				    "description": "Add template",
+				    "description": localizationService.localize("shortcuts_addTemplate").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 				}
 		    ]
@@ -151,7 +152,7 @@
                 vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
 
                 contentEditingHelper.contentEditorPerformSave({
-                    statusMessage: "Saving...",
+                    statusMessage: localizeSaving,
                     saveMethod: contentTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
index aa1e32a5b1..873339d653 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
@@ -13,15 +13,14 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT
         creatingFolder: false
     };
 
-    var node = $scope.dialogOptions.currentNode;
+    var node = $scope.dialogOptions.currentNode,
+        localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;});
 
     $scope.showCreateFolder = function() {
         $scope.model.creatingFolder = true;
     }
 
     $scope.createContainer = function () {
-        var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;})
-
         if (formHelper.submitForm({
             scope: $scope,
             formCtrl: this.createFolderForm,
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index 5dd074b504..723d5309d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -11,6 +11,7 @@
 
     function MediaTypesEditController($scope, $routeParams, mediaTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper) {
         var vm = this;
+        var localizeSaving = localizationService.localize("general_saving").then(function (value) {return value;});
 
         vm.save = save;
 
@@ -21,18 +22,18 @@
         vm.page.saveButtonState = "init";
         vm.page.navigation = [
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design").then(function (value) {return value;}),
 			    "icon": "icon-document-dashed-line",
 			    "view": "views/mediatypes/views/design/design.html",
 			    "active": true
 			},
 			{
-			    "name": "List view",
+			    "name": localizationService.localize("general_listView").then(function (value) {return value;}),
 			    "icon": "icon-list",
 			    "view": "views/mediatypes/views/listview/listview.html"
 			},
 			{
-			    "name": "Permissions",
+			    "name": localizationService.localize("general_rights").then(function (value) {return value;}),
 			    "icon": "icon-keychain",
 			    "view": "views/mediatypes/views/permissions/permissions.html"
 			}
@@ -40,54 +41,54 @@
 
         vm.page.keyboardShortcutsOverview = [
 			{
-			    "name": "Sections",
+			    "name": localizationService.localize("main_sections").then(function (value) {return value;}),
 			    "shortcuts": [
 					{
-					    "description": "Navigate sections",
+					    "description": localizationService.localize("shortcuts_navigateSections").then(function (value) {return value;}),
 					    "keys": [{ "key": "1" }, { "key": "3" }],
 					    "keyRange": true
 					}
 			    ]
 			},
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design").then(function (value) {return value;}),
 			    "shortcuts": [
 				{
-				    "description": "Add tab",
+				    "description": localizationService.localize("shortcuts_addTab").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 				},
 				{
-				    "description": "Add property",
+				    "description": localizationService.localize("shortcuts_addProperty").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
 				},
 				{
-				    "description": "Add editor",
+				    "description": localizationService.localize("shortcuts_addEditor").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
 				},
 				{
-				    "description": "Edit data type",
+				    "description": localizationService.localize("shortcuts_editDataType").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
 				}
 			    ]
 			},
 		{
-		    "name": "List view",
+		    "name": localizationService.localize("general_listView").then(function (value) {return value;}),
 		    "shortcuts": [
 				{
-				    "description": "Toggle list view",
+				    "description": localizationService.localize("shortcuts_toggleListView").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
 				}
 		    ]
 		},
 		{
-		    "name": "Permissions",
+		    "name": localizationService.localize("general_rights").then(function (value) {return value;}),
 		    "shortcuts": [
 				{
-				    "description": "Toggle allow as root",
+				    "description": localizationService.localize("shortcuts_toggleAllowAsRoot").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
 				},
 				{
-				    "description": "Add child node",
+				    "description": localizationService.localize("shortcuts_addChildNode").then(function (value) {return value;}),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
 				}
 		    ]
@@ -132,7 +133,7 @@
                 vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
 
                 contentEditingHelper.contentEditorPerformSave({
-                    statusMessage: "Saving...",
+                    statusMessage: localizeSaving,
                     saveMethod: mediaTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
index 1678f08836..2fb9b6b69f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
@@ -13,15 +13,15 @@ function MemberTypesCreateController($scope, $location, navigationService, membe
         creatingFolder: false
     };
 
-    var node = $scope.dialogOptions.currentNode;
+    var node = $scope.dialogOptions.currentNode,
+        localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;});
+
 
     $scope.showCreateFolder = function() {
         $scope.model.creatingFolder = true;
     }
 
     $scope.createContainer = function () {
-        var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;})
-
         if (formHelper.submitForm({
             scope: $scope,
             formCtrl: this.createFolderForm,
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
index 3a1d91d2f0..ab69bfdfda 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
@@ -12,6 +12,7 @@
     function MemberTypesEditController($scope, $rootScope, $routeParams, $log, $filter, memberTypeResource, dataTypeResource, editorState, iconHelper, formHelper, navigationService, contentEditingHelper, notificationsService, $q, localizationService, overlayHelper) {
 
         var vm = this;
+        var localizeSaving = localizationService.localize("general_saving").then(function (value) {return value;});
 
         vm.save = save;
 
@@ -22,7 +23,7 @@
         vm.page.saveButtonState = "init";
         vm.page.navigation = [
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design").then(function (value) {return value;}),
 			    "icon": "icon-document-dashed-line",
 			    "view": "views/membertypes/views/design/design.html",
 			    "active": true
@@ -31,21 +32,22 @@
 
         vm.page.keyboardShortcutsOverview = [
 			{
+                "name": localizationService.localize("shortcuts_shortcut").then(function (value) {return value;}),
 			    "shortcuts": [
 					{
-					    "description": "Add tab",
+					    "description": localizationService.localize("shortcuts_addTab").then(function (value) {return value;}),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 					},
 					{
-					    "description": "Add property",
+					    "description": localizationService.localize("shortcuts_addProperty").then(function (value) {return value;}),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
 					},
 					{
-					    "description": "Add editor",
+					    "description": localizationService.localize("shortcuts_addEditor").then(function (value) {return value;}),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
 					},
 					{
-					    "description": "Edit data type",
+					    "description": localizationService.localize("shortcuts_editDataType").then(function (value) {return value;}),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
 					}
 			    ]
@@ -86,7 +88,7 @@
                 vm.page.saveButtonState = "busy";
 
                 contentEditingHelper.contentEditorPerformSave({
-                    statusMessage: "Saving...",
+                    statusMessage: localizeSaving,
                     saveMethod: memberTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index a2e6cd3e6c..bdcbb2e935 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -181,6 +181,7 @@
     <key alias="updateData">Choose a type and a title</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
+    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>
@@ -454,7 +455,8 @@
     <key alias="preview">Preview</key>
     <key alias="changePassword">Change password</key>
     <key alias="to">to</key>
-
+    <key alias="listView">List view</key>
+    <key alias="saving">Saving...</key>
   </area>
 
   <area alias="colors">
@@ -466,6 +468,23 @@
     <key alias="red">Red</key>
   </area>
 
+  <area alias="shortcuts">
+      <key alias="addTab">Add tab</key>
+      <key alias="addProperty">Add property</key>
+      <key alias="addEditor">Add editor</key>
+      <key alias="addTemplate">Add template</key>
+      <key alias="addChildNode">Add child node</key>
+
+      <key alias="editDataType">Edit data type</key>
+
+      <key alias="navigateSections">Navigate sections</key>
+
+      <key alias="shortcut">Shortcuts</key>
+
+      <key alias="toggleListView">Toggle list view</key>
+      <key alias="toggleAllowAsRoot">Toggle allow as root</key>
+  </area>
+
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Background colour</key>
     <key alias="bold">Bold</key>
@@ -473,6 +492,7 @@
     <key alias="font">Font</key>
     <key alias="text">Text</key>
   </area>
+
   <area alias="headers">
     <key alias="page">Page</key>
   </area>