From 0a7bcbcc696c8244a76fdf8523f6d7603998fc9a Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Wed, 23 Aug 2017 18:18:27 +0200
Subject: [PATCH] Getting localization fixed - trying to tokenize

---
 .../views/documenttypes/rename.controller.js  | 29 +++++++++++++------
 .../src/views/documenttypes/rename.html       |  2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  5 ++++
 .../Trees/ContentTypeTreeController.cs        |  8 ++---
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js
index 6aee713aa4..81107c9870 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js
@@ -7,9 +7,9 @@
         "notificationsService",
         "localizationService",
         function (scope, contentTypeResource, navigationService, notificationsService, localizationService) {
-            scope.strings = {
-                
-            }
+            var notificationHeader;
+            localizationService.localize("general_renamed")
+                .then(function(s) { notificationHeader = s; });
 
             scope.model = {
                 folderName: scope.currentNode.name 
@@ -19,12 +19,23 @@
 
                 contentTypeResource.renameContainer(scope.currentNode.id, scope.model.folderName)
                     .then(function() {
-                        
-                        notificationsService.showNotification({
-                            type: 0,
-                            header: "Renamed",
-                            message: scope.currentNode.name + " was renamed to " + scope.model.folderName
-                        });
+
+                        localizationService.localize("renamecontainer_folderWasRenamed",
+                                scope.currentNode.name,
+                                scope.model.folderName)
+                            .then(function(msg) {
+                                notificationsService.showNotification({
+                                    type: 0,
+                                    header: notificationHeader,
+                                    message: msg
+                                });
+                            });
+
+                        //notificationsService.showNotification({
+                        //    type: 0,
+                        //    header: notificationHeader,
+                        //    message: scope.currentNode.name + " was renamed to " + scope.model.folderName
+                        //});
 
                         navigationService.hideMenu();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
index 7aaa2cf572..fb3dcb5b07 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
@@ -10,7 +10,7 @@
                 <p class="text-error">{{error.data.message}}</p>
             </div>
 
-            <umb-control-group label="Enter a new folder name" hide-label="false">
+            <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
                 <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
             </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 5d0779f8b6..218a5962cd 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -27,6 +27,7 @@
     <key alias="unpublish">Unpublish</key>
     <key alias="refreshNode">Reload</key>
     <key alias="republish">Republish entire site</key>
+    <key alias="rename" version="7.3.0">Rename</key>
     <key alias="restore" version="7.3.0">Restore</key>
     <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
     <key alias="chooseWhereToMove">Choose where to move</key>
@@ -424,6 +425,10 @@
     <key alias="createListView" version="7.2">Create custom list view</key>
     <key alias="removeListView" version="7.2">Remove custom list view</key>
   </area>
+  <area alias="renamecontainer">
+    <key alias="enterNewFolderName">Enter a new folder name here</key>
+    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
+  </area>
   <area alias="editdatatype">
     <key alias="addPrevalue">Add prevalue</key>
     <key alias="dataBaseDatatype">Database datatype</key>
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 1b1d9d9b76..986f40f9c9 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -102,10 +102,10 @@ namespace Umbraco.Web.Trees
                 }
                 menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
 
-                var menuItem = new MenuItem(
-                    "rename",
-                    Services.TextService.Localize(String.Format("actions/{0}", "rename"))
-                );
+                var menuItem = new MenuItem("rename", Services.TextService.Localize(String.Format("actions/{0}", "rename")))
+                { 
+                    Icon = "icon icon-edit"
+                };
                 menu.Items.Add(menuItem);
             }
             else