From 48a3a0524d1836e25c8bbdad99b8320e70d0d2cf Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 22 Sep 2021 02:27:16 +0200
Subject: [PATCH] Create content template localization (#10945)

* Don't use self-closing element for custom HTML elements

* Use button element for close/cancel in copy dialog

* Update localization of "createBlueprintFrom"

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../content/content.createblueprint.controller.js | 15 +++++++--------
 .../src/views/content/copy.html                   |  6 +++---
 .../src/views/content/createblueprint.html        |  2 +-
 .../src/views/contentblueprints/create.html       |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/de.xml     |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml  |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml     |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml     |  2 +-
 17 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
index afd844aa01..9dc1b6cefd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
@@ -12,7 +12,7 @@
             name: $scope.currentNode.name
         };
 
-        localizationService.localize("blueprints_createBlueprintFrom", ["<em>" + $scope.message.name + "</em>"]).then(function (localizedVal) {
+        localizationService.localize("blueprints_createBlueprintFrom", [$scope.message.name]).then(localizedVal => {
             $scope.title = localizedVal;
         });
 
@@ -33,14 +33,13 @@
 
                         navigationService.hideMenu();
                     },
-                        function (err) {
-                            formHelper.resetForm({ scope: $scope, hasErrors: true });
-                            contentEditingHelper.handleSaveError({
-                                err: err
-                            });
+                    function (err) {
+                        formHelper.resetForm({ scope: $scope, hasErrors: true });
+                        contentEditingHelper.handleSaveError({
+                            err: err
+                        });
 
-                        }
-                    );
+                    });
             }
         };
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 399e0b8bf0..167e67431b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -85,10 +85,10 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="closeDialog()" ng-show="!busy">
+        <button type="button" class="btn btn-link" ng-click="closeDialog()" ng-show="!busy">
             <localize key="general_cancel">Cancel</localize>
-        </a>
-        <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
+        </button>
+        <button type="button" class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
             <localize key="actions_copy">Copy</localize>
         </button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html b/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
index 034a123e9b..7a1c8c381e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
@@ -18,7 +18,7 @@
                     <input type="text" name="name" ng-model="message.name" class="umb-textstring textstring input-block-level"
                            val-server-field="name"
                            required />
-                    <span ng-messages="blueprintForm.name.$error" show-validation-on-submit >
+                    <span ng-messages="blueprintForm.name.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required"><localize key="required">Required</localize></span>
                         <span class="help-inline" ng-message="valServerField">{{blueprintForm.name.errorMsg}}</span>
                     </span>           
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
index 332b27c81b..f58c330ce9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
@@ -12,7 +12,7 @@
             <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
             <ul class="umb-actions umb-actions-child">
-                <li class="umb-action" ng-repeat="documentType in vm.documentTypes |orderBy:'name':false">
+                <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
                     <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)">
                         <umb-icon icon="{{documentType.icon}}" class="icon large"></umb-icon>
                         <span class="menu-label">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 606fd820c1..e3bcaf9f30 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -296,7 +296,7 @@
     <key alias="nodeIsInTrash">This item is in the Recycle Bin</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Vytvořit novou šablonu obsahu z '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Vytvořit novou šablonu obsahu z <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Prázdná</key>
     <key alias="selectBlueprint">Vybrat obsahovou šablonu</key>
     <key alias="createdBlueprintHeading">Šablona obsahu byla vytvořena</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
index c479f27ec3..ecd4c4a362 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
@@ -316,7 +316,7 @@
         <key alias="nodeIsInTrash">Mae'r eitem yma yn y Bin Ailgylchu</key>
     </area>
     <area alias="blueprints">
-        <key alias="createBlueprintFrom">Creu Templed Cynnwys newydd o '%0%'</key>
+        <key alias="createBlueprintFrom"><![CDATA[Creu Templed Cynnwys newydd o <em>%0%</em>]]></key>
         <key alias="blankBlueprint">Gwag</key>
         <key alias="selectBlueprint">Dewis Templed Cynnwys</key>
         <key alias="createdBlueprintHeading">Templed Cynnwys wedi'i greu</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 72afd109a6..ae436d950e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -317,7 +317,7 @@
     <key alias="nodeIsInTrash">Dette element er i papirkurven</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Opret en ny indholdsskabelon fra '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Opret en ny indholdsskabelon fra <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Blank</key>
     <key alias="selectBlueprint">Vælg en indholdsskabelon</key>
     <key alias="createdBlueprintHeading">Indholdsskabelon oprettet</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index dab751f4a6..bb9e3fcf08 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -294,8 +294,8 @@
     <key alias="createEmpty">Neues Element anlegen</key>
     <key alias="createFromClipboard">Aus der Zwischenablage einfügen</key>
   </area>
-  <area alias="blueprints">
-    <key alias="createBlueprintFrom">Erzeuge eine neue Inhaltsvorlage von '%0%'</key>
+    <area alias="blueprints">
+    <key alias="createBlueprintFrom"><![CDATA[Erzeuge eine neue Inhaltsvorlage von <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Leer</key>
     <key alias="selectBlueprint">Wählen Sie eine Inhaltsvorlage</key>
     <key alias="createdBlueprintHeading">Inhaltsvorlage erzeugt</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 4f00ad8f7b..9f8d8acf6e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -310,7 +310,7 @@
     <key alias="nodeIsInTrash">This item is in the Recycle Bin</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Create a new Content Template from <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Blank</key>
     <key alias="selectBlueprint">Select a Content Template</key>
     <key alias="createdBlueprintHeading">Content Template created</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 67982b0e94..7d5c530752 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -315,7 +315,7 @@
     <key alias="nodeIsInTrash">This item is in the Recycle Bin</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Create a new Content Template from <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Blank</key>
     <key alias="selectBlueprint">Select a Content Template</key>
     <key alias="createdBlueprintHeading">Content Template created</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index 2648852356..16ce8a1082 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -196,7 +196,7 @@
         <key alias="contentRoot">Raíz de contenido</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Crear nueva Plantilla de Contenido desde '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Crear nueva Plantilla de Contenido desde <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Vacía</key>
     <key alias="selectBlueprint">Seleccionar Plantilla de Contenido</key>
     <key alias="createdBlueprintHeading">Plantilla de Contenido creada</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 538f3340fb..0d0feeccf6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -289,7 +289,7 @@
     <key alias="createFromClipboard">Copier du clipboard</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Créer un nouveau Modèle de Contenu à partir de '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Créer un nouveau Modèle de Contenu à partir de <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Vide</key>
     <key alias="selectBlueprint">Sélectionner un Modèle de Contenu</key>
     <key alias="createdBlueprintHeading">Modèle de Contenu créé</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index 04c6fb2ce7..205444d9b4 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -314,7 +314,7 @@
     <key alias="nodeIsInTrash">Dit item is in de prullenbak</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Nieuw Inhoudssjabloon aanmaken voor '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Nieuw Inhoudssjabloon aanmaken voor <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Leeg</key>
     <key alias="selectBlueprint">Selecteer een Inhoudssjabloon</key>
     <key alias="createdBlueprintHeading">Inhoudssjabloon aangemaakt</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index 806f3bae16..e6c53ac434 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -193,7 +193,7 @@
     <key alias="contentRoot">Korzeń zawartości</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Stwórz nowy Szablon Zawartości z '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Stwórz nowy Szablon Zawartości z <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Pusty</key>
     <key alias="selectBlueprint">Wybierz Szablon Zawartości</key>
     <key alias="createdBlueprintHeading">Szablon Zawartości został stworzony</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index e078ef152a..82c644c41b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -96,7 +96,7 @@
     <key alias="atViewingFor">Наблюдать за</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Создать новый шаблон содержимого из '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Создать новый шаблон содержимого из <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Пустой</key>
     <key alias="selectBlueprint">Выбрать шаблон содержимого</key>
     <key alias="createdBlueprintHeading">Шаблон содержимого создан</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index 1c4134f555..cb4d815b23 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -99,7 +99,7 @@
     <key alias="historyIncludingVariants">Historik (alla varianter)</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">Skapa en ny innehållsmall för '%0%'</key>
+    <key alias="createBlueprintFrom"><![CDATA[Skapa en ny innehållsmall för <em>%0%</em>]]></key>
     <key alias="blankBlueprint">Tom</key>
     <key alias="selectBlueprint">Välj en innehållsmall</key>
     <key alias="createdBlueprintHeading">Innehållsmall skapad</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index 464b69734c..5180955868 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -309,7 +309,7 @@
     <key alias="nodeIsInTrash">Bu öğe Geri Dönüşüm Kutusu'nda</key>
   </area>
   <area alias="blueprints">
-    <key alias="createBlueprintFrom">'%0%' den yeni bir İçerik Şablonu oluşturun</key>
+    <key alias="createBlueprintFrom"><![CDATA[<em>%0%</em> den yeni bir İçerik Şablonu oluşturun]]></key>
     <key alias="blankBlueprint">Boş</key>
     <key alias="selectBlueprint">Bir İçerik Şablonu Seçin</key>
     <key alias="createdBlueprintHeading">İçerik Şablonu oluşturuldu</key>