From 70accfa95a5549d4902fb400a196b1ba1aa13391 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Sun, 29 Jan 2017 19:37:33 +0000
Subject: [PATCH] Uses new localizationService.format function for the
 shortcuts dialog

---
 .../src/views/templates/edit.controller.js         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 85fdc067a4..4043aa4a73 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
@@ -23,7 +23,7 @@
         //Keyboard shortcuts for help dialog
         vm.page.keyboardShortcutsOverview = [
 			{
-			    "name": "General - FooBar", 
+			    "name": localizationService.localize("shortcuts_generalHeader"), 
 			    "shortcuts": [
                     {
 				        "description": localizationService.localize("buttons_undo"),
@@ -40,7 +40,7 @@
 			    ]
 			},
 			{
-			    "name": "Editor",
+			    "name": localizationService.localize("shortcuts_editorHeader"),
 			    "shortcuts": [
                     {
 				        "description": localizationService.localize("shortcuts_commentLine"),
@@ -72,19 +72,19 @@
 			    "name": "Umbraco", //No need to localise Umbraco is the same in all languages :)
 			    "shortcuts": [
                     {
-                        "description": localizationService.localize("template_insert") + localizationService.localize("template_insertPageField"),
+                        "description": localizationService.format(["template_insert", "template_insertPageField"], "%0% %1%"),
                         "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "v" }]
                     },
                     {
-                        "description": localizationService.localize("template_insert") + localizationService.localize("template_insertPartialView"),
+                        "description": localizationService.format(["template_insert", "template_insertPartialView"], "%0% %1%"),
                         "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
                     },
                     {
-                        "description": localizationService.localize("template_insert") + localizationService.localize("template_insertDictionaryItem"),
+                        "description": localizationService.format(["template_insert", "template_insertDictionaryItem"], "%0% %1%"),
                         "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
                     },
                     {
-                        "description": localizationService.localize("template_insert") + localizationService.localize("template_insertMacro"),
+                        "description": localizationService.format(["template_insert", "template_insertMacro"], "%0% %1%"),
                         "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "m" }]
                     },
                     {
@@ -92,7 +92,7 @@
                         "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "q" }]
                     },
                     {
-                        "description": localizationService.localize("template_insert") + localizationService.localize("template_insertSections"),
+                        "description": localizationService.format(["template_insert", "template_insertSections"], "%0% %1%"),
                         "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "s" }]
                     },
                     {