Merge pull request #171 from Vrijdagonline/master

Added Localization keys and null checks
kjac · Jan 31, 2018 · d8ab42d · d8ab42d
2 parents 3c54d0b + 15e0c45
commit d8ab42d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Source/Umbraco/Plugin/editor/form.html b/Source/Umbraco/Plugin/editor/form.html
@@ -213,10 +213,10 @@ <h5 form-editor-localize key="validation.rules.header">If these rules are fulfil
                 <h5 form-editor-localize key="action.task.header">...perform this action:</h5>
                 <div class="form-action-task">
                   <select ng-model="action.task">
-                    <option value="core.showfield">Show</option>
-                    <option value="core.hidefield">Hide</option>
+                    <option value="core.showfield" form-editor-localize key="action.task.showField">Show</option>
+                    <option value="core.hidefield" form-editor-localize key="action.task.hideField">Hide</option>
                   </select>
-                  <span>the field</span>
+                  <span form-editor-localize key="action.task.theField">the field</span>
                   <select ng-model="action.field" ng-options="field.name for field in allValueFields()">
                     <option value=""></option>
                   </select>

diff --git a/Source/Umbraco/Plugin/js/langs/da-dk.js b/Source/Umbraco/Plugin/js/langs/da-dk.js
@@ -63,6 +63,9 @@
   "actions.header": "Handlinger",
   "actions.text": "Her kan du oprette handlinger, der viser eller skjuler felter baseret på andre felters værdi - f.eks. \"vis kun felt A hvis felt B ikke er tomt\".",
   "action.task.header": "...skal denne handling udføres:",
+  "action.task.theField": "",
+  "action.task.showField": "",
+  "action.task.hideField": "",
   "action.add": "Tilføj en handling",
   "action.text.noFields": "Du skal tilføje felter til formularen, før du kan oprette handlinger.",
 

diff --git a/Source/Umbraco/Views/Partials/FormEditor/FieldsSync/core.consent.cshtml b/Source/Umbraco/Views/Partials/FormEditor/FieldsSync/core.consent.cshtml
@@ -2,7 +2,7 @@
 <div class="form-group required @(Model.Invalid ? "has-error" : null) consent">
 
   <div class="text">
-    @Html.Raw(Umbraco.ReplaceLineBreaksForHtml(Model.ConsentText))
+    @Html.Raw(Umbraco.ReplaceLineBreaksForHtml(String.IsNullOrWhiteSpace(Model.ConsentText) ? String.Empty : Model.ConsentText))
   </div>
 
   @if (string.IsNullOrWhiteSpace(Model.LinkText) == false && Model.Page != null)

diff --git a/Source/Umbraco/Views/Partials/FormEditor/FieldsSync/core.textparagraph.cshtml b/Source/Umbraco/Views/Partials/FormEditor/FieldsSync/core.textparagraph.cshtml
@@ -1,4 +1,4 @@
 @inherits Umbraco.Web.Mvc.UmbracoViewPage<FormEditor.Fields.TextParagraphField>
 <p>
-  @Html.Raw(Umbraco.ReplaceLineBreaksForHtml(Model.Text))
+  @Html.Raw(Umbraco.ReplaceLineBreaksForHtml(String.IsNullOrWhiteSpace(Model.Text) ? String.Empty : Model.Text))
 </p>