From 038162a0de683f614016978a70a2e5da894cfcd9 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 24 Aug 2021 20:31:03 +0200 Subject: [PATCH 1/3] Don't use self-closing element for custom HTML elements --- .../src/views/content/createblueprint.html | 4 ++-- .../src/views/contentblueprints/create.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 8bcf0e944bf6..7a1c8c381ebe 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html @@ -18,8 +18,8 @@
- - + + Required {{blueprintForm.name.errorMsg}} 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 332b27c81b0a..f58c330ce928 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 @@
Create an item under {{current
    -
  • +
  • + From c96416d97226a748446af66e32853bece413d08a Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 24 Aug 2021 21:00:39 +0200 Subject: [PATCH 3/3] Update localization of "createBlueprintFrom" --- .../content.createblueprint.controller.js | 17 ++++++++--------- 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 +- .../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 +- 14 files changed, 22 insertions(+), 23 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 afd844aa0169..9dc1b6cefd92 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", ["" + $scope.message.name + ""]).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/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 606fd820c100..e3bcaf9f30a2 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 @@ This item is in the Recycle Bin - Vytvořit novou šablonu obsahu z '%0%' + %0%]]> Prázdná Vybrat obsahovou šablonu Šablona obsahu byla vytvořena diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml index c479f27ec3ca..ecd4c4a362eb 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 @@ Mae'r eitem yma yn y Bin Ailgylchu - Creu Templed Cynnwys newydd o '%0%' + %0%]]> Gwag Dewis Templed Cynnwys Templed Cynnwys wedi'i greu diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index a0557e6d611a..90379485c276 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -316,7 +316,7 @@ Dette element er i papirkurven - Opret en ny indholdsskabelon fra '%0%' + %0%]]> Blank Vælg en indholdsskabelon Indholdsskabelon oprettet diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml index dab751f4a625..bb9e3fcf0888 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 @@ Neues Element anlegen Aus der Zwischenablage einfügen - - Erzeuge eine neue Inhaltsvorlage von '%0%' + + %0%]]> Leer Wählen Sie eine Inhaltsvorlage Inhaltsvorlage erzeugt diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 2b71412ceed5..ff1bf0bc006c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -309,7 +309,7 @@ This item is in the Recycle Bin - Create a new Content Template from '%0%' + %0%]]> Blank Select a Content Template Content Template created 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 7576997be27c..6cc2262586a8 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -314,7 +314,7 @@ This item is in the Recycle Bin - Create a new Content Template from '%0%' + %0%]]> Blank Select a Content Template Content Template created diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml index 264885235656..16ce8a1082b2 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 @@ Raíz de contenido - Crear nueva Plantilla de Contenido desde '%0%' + %0%]]> Vacía Seleccionar Plantilla de Contenido Plantilla de Contenido creada diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml index 538f3340fbd9..0d0feeccf637 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 @@ Copier du clipboard - Créer un nouveau Modèle de Contenu à partir de '%0%' + %0%]]> Vide Sélectionner un Modèle de Contenu Modèle de Contenu créé diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml index b50f49ad8ebc..bb987dc3cdef 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 @@ Dit item is in de prullenbak - Nieuw Inhoudssjabloon aanmaken voor '%0%' + %0%]]> Leeg Selecteer een Inhoudssjabloon Inhoudssjabloon aangemaakt diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml index 806f3bae16e2..e6c53ac43494 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 @@ Korzeń zawartości - Stwórz nowy Szablon Zawartości z '%0%' + %0%]]> Pusty Wybierz Szablon Zawartości Szablon Zawartości został stworzony diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml index e078ef152a16..82c644c41b86 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 @@ Наблюдать за - Создать новый шаблон содержимого из '%0%' + %0%]]> Пустой Выбрать шаблон содержимого Шаблон содержимого создан diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml index 1c4134f555a4..cb4d815b235b 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 @@ Historik (alla varianter) - Skapa en ny innehållsmall för '%0%' + %0%]]> Tom Välj en innehållsmall Innehållsmall skapad diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml index 464b69734c82..518095586879 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 @@ Bu öğe Geri Dönüşüm Kutusu'nda - '%0%' den yeni bir İçerik Şablonu oluşturun + %0% den yeni bir İçerik Şablonu oluşturun]]> Boş Bir İçerik Şablonu Seçin İçerik Şablonu oluşturuldu