Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Localization keys and null checks #171

Merged
merged 3 commits into from
Jan 31, 2018
Merged

Added Localization keys and null checks #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7084aed
Missing localize key
arjanwoldring Jan 29, 2018
c3c8e54
Actions Dropdown Localisation
arjanwoldring Jan 29, 2018
15e0c45
Add simple check to prevent Nullreference Ex
arjanwoldring Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/Umbraco/Plugin/editor/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions Source/Umbraco/Plugin/js/langs/da-dk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",

Expand Down
2 changes: 1 addition & 1 deletion Source/Umbraco/Views/Partials/FormEditor/FieldsSync/core.consent.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/Umbraco/Views/Partials/FormEditor/FieldsSync/core.textparagraph.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>