From 93f199b5e39de5de241fb6ae8b63493ca88300c9 Mon Sep 17 00:00:00 2001
From: Rune Hem Strand <runehs@gmail.com>
Date: Fri, 4 Dec 2015 13:23:24 +0100
Subject: [PATCH] Add localization to Grid (en)

---
 .../src/views/propertyeditors/grid/grid.html     | 16 ++++++++--------
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml    | 16 ++++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 01f10e160c..5b8ddf8a15 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -7,7 +7,7 @@
         <div class="templates-preview"
              ng-show="!model.value || model.value == ''">
 
-             <p><!--<span class="help-text"><localize key="grid_addRows"/></span>--><strong>Choose layout for this section</strong></p>
+             <p><strong><localize key="grid_addLayout" /></strong></p>
 
             <div class="preview-rows layout"
                  ng-repeat="template in model.config.items.templates"
@@ -67,7 +67,7 @@
                                     <div class="umb-row-title">{{row.name}}</div>
 
                                     <div class="umb-grid-has-config" ng-if="row.hasConfig">
-                                        Styles is applied
+                                        <localize key="grid_stylesApplied" />
                                     </div>
                                 </div>
 
@@ -121,17 +121,17 @@
                                                       <!-- disable drop overlay -->
                                                       <div class="drop-overlay -disable" ng-if="area.dropNotAllowed">
                                                           <i class="icon-delete drop-icon"></i>
-                                                          This content is not allowed here
+                                                          <localize key="grid_contentNotAllowed" />
                                                       </div>
 
                                                       <!-- allow drop overlay -->
                                                       <div class="drop-overlay -allow" ng-if="area.dropOnEmpty">
                                                           <i class="icon-download drop-icon"></i>
-                                                          This content is allowed here
+                                                          <localize key="grid_contentAllowed" />
                                                       </div>
 
                                                       <div class="umb-grid-has-config" ng-if="area.hasConfig">
-                                                         Styles is applied
+                                                         <localize key="grid_stylesApplied" />
                                                       </div>
 
                                                       <div class="cell-tools" ng-if="area.active">
@@ -144,7 +144,7 @@
 
                                                           <!-- Control placeholder -->
                                                           <div class="umb-cell-placeholder" ng-if="area.controls.length === 0" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);">
-                                                               <div href="" class="cell-tools-add -center">Add content</div>
+                                                               <div href="" class="cell-tools-add -center"><localize key="grid_addElement" /></div>
                                                           </div>
 
                                                           <!-- for each control in areas -->
@@ -195,7 +195,7 @@
 
                                                       <!-- if area is empty tools -->
                                                       <div class="umb-grid-add-more-content" ng-if="area.controls.length > 0">
-                                                          <div class="cell-tools-add -bar newbtn" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);">+ Add content</div>
+                                                          <div class="cell-tools-add -bar newbtn" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);">+ <localize key="grid_addElement" /></div>
                                                       </div>
 
                                                  </div>
@@ -231,7 +231,7 @@
 
                     <div class="templates-preview" ng-if="showRowConfigurations">
 
-                        <p ng-hide="section.rows.length > 0"><strong>Choose row</strong><!-- <span class="help-text"><localize key="grid_addRows" /></span> --></p>
+                        <p ng-hide="section.rows.length > 0"><strong><localize key="grid_addRows" /></strong></p>
 
                         <div class="preview-rows columns"
                              ng-repeat="layout in  section.$allowedLayouts"
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 48a42c9c99..1b2d0707f5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -872,17 +872,22 @@ To manage your website, simply open the Umbraco back office and start adding con
 
   <area alias="grid">
     <key alias="insertControl">Insert control</key>
-    <key alias="addRows">Choose a layout for this section</key>
-    <key alias="addElement"><![CDATA[To start, click the <i class="icon icon-add blue"></i> below and add your first element]]></key>
-
+    <key alias="addLayout">Choose a layout</key>
+    <key alias="addRows">Choose a row</key>
+    <key alias="addElement">Add content</key>
+    <key alias="stylesApplied">Styles applied</key>
+    
+    <key alias="contentNotAllowed">This content is not allowed here</key>
+    <key alias="contentAllowed"></key>
+    
     <key alias="clickToEmbed">Click to embed</key>
     <key alias="clickToInsertImage">Click to insert image</key>
     <key alias="placeholderImageCaption">Image caption...</key>
     <key alias="placeholderWriteHere">Write here...</key>
     
-    <key alias="gridLayouts">Grid layouts</key>
+    <key alias="gridLayouts">Grid Layouts</key>
     <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
-    <key alias="addGridLayout">Add grid layout</key>
+    <key alias="addGridLayout">Add Grid Layout</key>
     <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
     
     <key alias="rowConfigurations">Row configurations</key>
@@ -896,7 +901,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="settings">Settings</key>
     <key alias="settingsDetails">Configure what settings editors can change</key>
 
-
     <key alias="styles">Styles</key>
     <key alias="stylesDetails">Configure what styling editors can change</key>