From 32abebd0a010fecff4faea397f7cfde7cd2604c1 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Thu, 12 Jan 2017 11:33:21 +0100
Subject: [PATCH] Main template editor translated

---
 .../views/common/overlays/insert/insert.html  | 21 +++++-----
 .../querybuilder/querybuilder.controller.js   |  1 -
 .../overlays/querybuilder/querybuilder.html   | 16 +++++---
 .../src/views/templates/edit.html             | 14 +++----
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 39 +++++++++++++++++--
 5 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
index e5ea8a3ddf..4b92ea86ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
@@ -3,29 +3,28 @@
     <div class="umb-insert-code-boxes">
 
         <div class="umb-insert-code-box" ng-click="vm.openPageFieldOverlay()">
-            <div class="umb-insert-code-box__title">Value</div>
-            <div class="umb-insert-code-box__description">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</div>
+            <div class="umb-insert-code-box__title"><localize key="template_insertPageField" /></div>
+            <div class="umb-insert-code-box__description"><localize key="template_insertPageFieldDesc" /></div>
         </div>
 
         <div class="umb-insert-code-box" ng-click="vm.openPartialOverlay()">
-            <div class="umb-insert-code-box__title">Partial view</div>
+            <div class="umb-insert-code-box__title"><localize key="template_insertPartialView" /></div>
             <div class="umb-insert-code-box__description">
-            A partial view is a separate template file which can be rendered inside another 
-            template, it's great for reusing markup or for separating complex templates into separate files.</div>
+            <localize key="template_insertPartialViewDesc" />
+            </div>
         </div>
 
         <div class="umb-insert-code-box" ng-click="vm.openMacroPicker()">
-            <div class="umb-insert-code-box__title">Macro</div>
+            <div class="umb-insert-code-box__title"><localize key="template_insertMacro" /></div>
             <div class="umb-insert-code-box__description">
-                A Macro is a configurable component which is great for 
-                reusable parts of your design, where you need the option to provide parameters,
-                such as galleries, forms and lists.
+                <localize key="template_insertMacroDesc" />
+               
             </div>
         </div>
 
         <div class="umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
-            <div class="umb-insert-code-box__title">Dictionary</div>
-            <div class="umb-insert-code-box__description">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</div>
+            <div class="umb-insert-code-box__title"><localize key="template_insertDictionaryItem" /></div>
+            <div class="umb-insert-code-box__description"><localize key="template_insertDictionaryItem" /></div>
         </div>
 
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js
index d04b7f35a3..3939882969 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js
@@ -173,7 +173,6 @@
         }, 200);
 
         onInit();
-
     }
 
     angular.module("umbraco").controller("Umbraco.Overlays.QueryBuilderController", QueryBuilderOverlayController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html
index 36f729adb0..e9be97b7df 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html
@@ -5,7 +5,7 @@
         <div class="row">
 			<div class="query-items">
 				
-				<span>I want</span>
+				<span><localize key="template_iWant">I Want</localize></span>
 
 				<div class="btn-group">
 
@@ -22,7 +22,7 @@
 
 				</div>
 
-				<span>from</span>
+				<span><localize key="template_fromt">from</localize></span>
 
 				<a href class="btn btn-link" ng-click="vm.chooseSource(vm.query)">
 					{{vm.query.source.name}}
@@ -33,8 +33,12 @@
 
 			<div class="query-items" ng-repeat="filter in vm.query.filters">
 
-				<span ng-if="$first">Where</span>
-				<span ng-if="!$first">And</span>
+				<span ng-if="$first">
+                    <localize key="template_where">where</localize>
+                </span>
+				<span ng-if="!$first">
+                    <localize key="template_and">and</localize>
+                </span>
 
 				<div class="btn-group">
 
@@ -96,7 +100,7 @@
 
 			<div class="query-items">
 
-				<span>Order by</span>
+				<span<localize key="template_orderBy">order by</localize></span>
 
 				<div class="btn-group">
 					<a class="btn btn-link dropdown-toggle" data-toggle="dropdown" href="#">
@@ -121,7 +125,7 @@
 			</div>
 		</div>
 
-		<h5>Returns {{model.result.resultCount}} items in {{model.result.executionTime}} miliseconds</h5>
+		<h5>{{model.result.resultCount}} <localize key="template_itemsReturned">items, returned in</localize> {{model.result.executionTime}} ms</h5>
 
 		<ul class="nav unstyled">
 			<li ng-repeat="item in model.result.sampleResults">
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index e03f593c90..b0e15e8ad7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -51,7 +51,7 @@
                                 type="button"
                                 class="umb-era-button umb-button--s"
                                 ng-click="vm.openInsertOverlay()">
-                                <i class="icon icon-add"></i> Insert
+                                <i class="icon icon-add"></i> <localize key="general_insert">Insert</localize>
                             </button>
 
                             <a class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle" data-toggle="dropdown">
@@ -59,10 +59,10 @@
                             </a>
 
                             <ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
-                                <li><a href="" ng-click="vm.openPageFieldOverlay()">Value</a></li>
-                                <li><a href="" ng-click="vm.openPartialOverlay()">Partial view</a></li>
-                                <li><a href="" ng-click="vm.openDictionaryItemOverlay()">Dictionary</a></li>
-                                <li><a href="" ng-click="vm.openMacroOverlay()">Macro</a></li>
+                                <li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
+                                <li><a href="" ng-click="vm.openPartialOverlay()"><localize key="template_insertPartialView">Partial view</localize></a></li>
+                                <li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary</localize></a></li>
+                                <li><a href="" ng-click="vm.openMacroOverlay()"><localize key="general_insertMacro">Macro</localize></a></li>
                             </ul>
 
                         </div>
@@ -72,14 +72,14 @@
                             style="margin-right: 10px;"
                             class="umb-era-button umb-button--s"
                             ng-click="vm.openQueryBuilderOverlay()">
-                            <i class="icon icon-wand"></i> Query builder
+                            <i class="icon icon-wand"></i> <localize key="template_queryBuilder">Query builder</localize>
                         </button>
 
                         <button
                             type="button"
                             class="umb-era-button umb-button--s"
                             ng-click="vm.openSectionsOverlay()">
-                            <i class="icon icon-indent"></i> Sections
+                            <i class="icon icon-indent"></i> <localize key="template_insertSections">Sections</localize>
                         </button>
 
                     </div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index f7ac08d837..2021be1d9d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1025,17 +1025,48 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="preview">Preview</key>
     <key alias="styles">Styles</key>
   </area>
+  
   <area alias="template">
     <key alias="edittemplate">Edit template</key>
+
+    <key alias="insertSections">Sections</key>
     <key alias="insertContentArea">Insert content area</key>
     <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
-    <key alias="insertDictionaryItem">Insert dictionary item</key>
-    <key alias="insertMacro">Insert Macro</key>
-    <key alias="insertPageField">Insert Umbraco page field</key>
+    
+    <key alias="insertDictionaryItem">Dictionary item</key>
+    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
+    
+    <key alias="insertMacro">Macro</key>
+    <key alias="insertMacroDesc">
+      A Macro is a configurable component which is great for
+      reusable parts of your design, where you need the option to provide parameters,
+      such as galleries, forms and lists.
+    </key>
+
+    <key alias="insertPageField">Value</key>
+    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
+    
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+      A partial view is a separate template file which can be rendered inside another
+      template, it's great for reusing markup or for separating complex templates into separate files.
+    </key>
+    
     <key alias="mastertemplate">Master template</key>
-    <key alias="quickGuide">Quick Guide to Umbraco template tags</key>
+    
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">items returned, in</key>
+
+    <key alias="iWant">I want</key>
+    <key alias="from">from</key>
+    <key alias="where">where</key>
+    <key alias="and">and</key>
+    <key alias="everything">everything</key>
+    
+    
     <key alias="template">Template</key>
   </area>
+  
   <area alias="grid">
     <key alias="insertControl">Choose type of content</key>
     <key alias="chooseLayout">Choose a layout</key>