Merge pull request #2124 from umbraco/mikecp-U4-8967

U4-8967 Linkpicker localization issue
This commit is contained in:
Claus
2017-08-14 14:58:31 +02:00
committed by GitHub
10 changed files with 181 additions and 97 deletions

View File

@@ -132,6 +132,7 @@ angular.module('umbraco.mocks').
"content_membertype": "Member Type",
"content_noDate": "No date chosen",
"content_nodeName": "Page Title",
"defaultdialogs_nodeNameLinkPicker": "Link title",
"content_otherElements": "Properties",
"content_parentNotPublished": "This document is published but is not visible because the parent '%0%' is unpublished",
"content_parentNotPublishedAnomaly": "This document is published but is not in the cache",
@@ -148,7 +149,8 @@ angular.module('umbraco.mocks').
"content_updateDate": "Last edited",
"content_updateDateDesc": "Date/time this document was created",
"content_uploadClear": "Remove file",
"content_urls": "Link to document",
"content_urls": "Link to document",
"defaultdialogs_urlLinkPicker":"Link",
"content_memberof": "Member of group(s)",
"content_notmemberof": "Not a member of group(s)",
"content_childItems": "Child items",

View File

@@ -1,8 +1,8 @@
<div class="umb-panel" ng-controller="Umbraco.Dialogs.LinkPickerController">
<div class="umb-panel-body no-header with-footer compact">
<umb-pane>
<umb-control-group label="@content_urls">
<input type="text"
<umb-control-group label="@defaultdialogs_urlLinkPicker">
<input type="text"
localize="placeholder"
placeholder="@general_url"
class="umb-editor umb-textstring"
@@ -11,7 +11,7 @@
/>
</umb-control-group>
<umb-control-group label="@content_nodeName">
<umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
<input type="text"
localize="placeholder"
placeholder="@placeholders_entername"
@@ -23,8 +23,6 @@
<select class="umb-editor umb-dropdown" ng-model="target.target">
<option value=""></option>
<option value="_blank"><localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize></option>
<option value="_top">Opens the linked document in the full body of the window</option>
<option value="_parent">Opens the linked document in the parent frame</option>
</select>
</umb-control-group>
</umb-pane>
@@ -62,9 +60,9 @@
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<a href ng-click="switchToMediaPicker()" class="btn"><localize key="defaultdialogs_linkToFile">Link to file</localize></a>
<a href ng-click="switchToMediaPicker()" class="btn">
<localize key="defaultdialogs_selectMedia">Select media</localize>
</a>
<button
class="btn btn-primary"
ng-click="submit(target)">

View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Overlays.LinkPickerController">
<umb-control-group label="@content_urls">
<umb-control-group label="@defaultdialogs_urlLinkPicker">
<input type="text"
localize="placeholder"
placeholder="@general_url"
@@ -10,7 +10,7 @@
focus-when="{{true}} "/>
</umb-control-group>
<umb-control-group label="@content_nodeName">
<umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
<input type="text"
localize="placeholder"
placeholder="@placeholders_entername"