Skip to content

Commit

Permalink
Merge branch 'v8/contrib' into v8/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@nul800sebastiaan
nul800sebastiaan committed Nov 3, 2021
2 parents b876771 + 91a67cd commit 2ec77a2
Show file tree
Hide file tree
Showing 30 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
</div>

<umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
<localize key="general_searchNoResult"></localize>
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h1 style="margin-bottom: 10px; text-align: left;">Hi, {{vm.invitedUser.name}}</

<h1 style="margin-bottom: 10px;">Upload a photo</h1>
<p style="text-align: center; margin-bottom: 25px; line-height: 1.6em;">
<localize key="user_userinviteAvatarMessage"></localize>
<localize key="user_userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</localize>
</p>
<div class="flex justify-center items-center">
<umb-button type="button"
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<umb-empty-state
position="center"
size="small">
<localize key="content_noChanges"></localize>
<localize key="content_noChanges">No changes have been made</localize>
</umb-empty-state>
</div>

Expand Down Expand Up @@ -168,7 +168,7 @@
<option value="">{{chooseLabel}}...</option>
</select>
<button type="button" ng-show="allowChangeTemplate && node.template !== null" class="umb-node-preview__action" style="margin-left:15px;" ng-click="openTemplate()">
<localize key="general_open">Open</localize><span class="sr-only">&nbsp;{{node.template}} <localize key="template_template"></localize></span>
<localize key="general_open">Open</localize><span class="sr-only">&nbsp;{{node.template}} <localize key="template_template">Template</localize></span>
</button>
</div>
</umb-control-group>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<umb-empty-state
ng-if="content.tabs.length === 0"
position="center">
<localize key="content_noProperties"></localize>
<localize key="content_noProperties">No content can be added for this item</localize>
</umb-empty-state>

</ng-form>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<umb-empty-state
ng-if="vm.content.apps.length === 0"
position="center">
<localize key="content_noProperties"></localize>
<localize key="content_noProperties">No content can be added for this item</localize>
</umb-empty-state>

</div>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<span class="umb-variant-switcher__name" ng-bind="entry.variant.displayName"></span>
<span class="umb-variant-switcher__state">
<umb-variant-state variant="entry.variant"></umb-variant-state>
<span ng-if="entry.variant.language.isMandatory"> - <localize key="general_mandatory"></localize></span>
<span ng-if="entry.variant.language.isDefault"> - <localize key="general_default"></localize></span>
<span ng-if="entry.variant.language.isMandatory"> - <localize key="general_mandatory">Mandatory</localize></span>
<span ng-if="entry.variant.language.isDefault"> - <localize key="general_default">Default</localize></span>
</span>
</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion ...eb.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<umb-empty-state
ng-if="vm.model.tabs.length === 0"
position="center">
<localize key="content_noProperties"></localize>
<localize key="content_noProperties">No content can be added for this item</localize>
</umb-empty-state>

</ng-form>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<umb-empty-state ng-if="!nodeUrl"
size="small">
<localize key="content_noMediaLink"></localize>
<localize key="content_noMediaLink">This media item has no link</localize>
</umb-empty-state>

<ul ng-if="nodeUrl" class="nav nav-stacked mb0">
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

<p ng-if="vm.media.trashed" class="__status --error">
<umb-icon icon="icon-trash"></umb-icon>
<localize key="mediaPicker_trashed"></localize>
<localize key="mediaPicker_trashed">Trashed</localize>
</p>

<p ng-if="vm.notAllowed" class="__status --error">
<umb-icon icon="icon-block"></umb-icon>
<localize key="mediaPicker_notAllowed"></localize>
<localize key="mediaPicker_notAllowed">Not allowed</localize>
</p>

<!-- IMAGE and SVG-->
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="control-header" ng-hide="vm.property.hideLabel === true">
<small ng-if="vm.showInherit" class="db" style="padding-top: 0; margin-bottom: 5px;">
<localize key="contentTypeEditor_inheritedFrom"></localize> {{vm.inheritsFrom}}
<localize key="contentTypeEditor_inheritedFrom">Inherited from</localize> {{vm.inheritsFrom}}
</small>

<label class="control-label" for="{{vm.property.alias}}" ng-attr-title="{{vm.controlLabelTitle}}">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<strong>{{parentName}}</strong>
</span>
<small>
(<localize key="general_current"></localize>)
(<localize key="general_current">current</localize>)
</small>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</div>

<em ng-show="column.isSensitive" class="muted">
<localize key="content_isSensitiveValue_short"></localize>
<localize key="content_isSensitiveValue_short">This value is hidden.</localize>
</em>

</span>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<strong>{{file.name}}</strong>

<span class="file-error" ng-if="file.$error">
<span ng-if="file.$error === 'pattern'" class="errorMessage color-red"><localize key="media_disallowedFileType"></localize></span>
<span ng-if="file.$error === 'maxSize'" class="errorMessage color-red"><localize key="media_maxFileSize"></localize> "{{maxFileSize}}"</span>
<span ng-if="file.$error === 'pattern'" class="errorMessage color-red"><localize key="media_disallowedFileType">Cannot upload this file, it does not have an approved file type</localize></span>
<span ng-if="file.$error === 'maxSize'" class="errorMessage color-red"><localize key="media_maxFileSize">Max file size is</localize> "{{maxFileSize}}"</span>
</span>

<span class="file-error" ng-if="file.serverErrorMessage">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/content/notify.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<div ng-show="vm.saveSuccces" ng-cloak>
<div class="alert alert-success">
<localize key="notifications_notificationsSavedFor"></localize> <strong>{{currentNode.name}}</strong>
<localize key="notifications_notificationsSavedFor">Notification settings saved for</localize> <strong>{{currentNode.name}}</strong>
</div>
<button class="btn btn-primary" ng-click="vm.cancel()"><localize key="general_ok">Ok</localize></button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/content/rights.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

<div ng-show="vm.saveSuccces">
<div class="alert alert-success">
<localize key="speechBubbles_permissionsSavedFor"></localize><strong> {{currentNode.name}}</strong>
<localize key="speechBubbles_permissionsSavedFor">Permissions saved for</localize><strong> {{currentNode.name}}</strong>
</div>
</div>

<h5 id="content_rights_title"><localize key="defaultdialogs_permissionsSet">Set permissions for</localize> {{ currentNode.name }}</h5>
<p id="content_rights_description" class="abstract" style="margin-bottom: 20px;"><localize key="defaultdialogs_permissionsHelp"></localize></p>
<p id="content_rights_description" class="abstract" style="margin-bottom: 20px;"><localize key="defaultdialogs_permissionsHelp">Select the users groups you want to set permissions for</localize></p>

<div style="position: relative; display: inline-block; margin-bottom: 20px;">
<umb-button
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<umb-empty-state
ng-if="vm.redirectUrls.length === 0 && vm.dashboard.searchTerm.length > 0 && !vm.dashboard.loading"
position="center">
<localize key="general_searchNoResult"></localize>
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>

<div class="flex justify-center items-center">
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<div class="sub-view-columns">

<div class="sub-view-column-left">
<h5><localize key="contentTypeEditor_allowedTemplatesHeading"></localize></h5>
<small><localize key="contentTypeEditor_allowedTemplatesDescription"></localize></small>
<h5><localize key="contentTypeEditor_allowedTemplatesHeading">Allowed Templates</localize></h5>
<small><localize key="contentTypeEditor_allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</localize></small>
</div>

<div class="sub-view-column-right">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/languages/edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</div>

<div class="umb-alert umb-alert--info" style="margin-top: 20px;" ng-if="vm.showDefaultLanguageInfo">
<localize key="languages_changingDefaultLanguageWarning"></localize>
<localize key="languages_changingDefaultLanguageWarning">Switching default language may result in default content missing.</localize>
</div>

</umb-control-group>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/languages/overlays/delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<localize key="defaultdialogs_languagedeletewarning">This will delete the language</localize> <strong>{{model.language.name}} [{{model.language.culture}}]</strong>.
</div>

<localize key="defaultdialogs_confirmdelete"></localize>?
<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?

</div>
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>

<button type="button" class="btn-reset editor-placeholder" data-element="editor-add" ng-if="!model.parameter.editor" hotkey="alt+shift+e" ng-click="vm.openMacroParameterPicker(model.parameter)">
<localize key="shortcuts_addEditor"></localize>
<localize key="shortcuts_addEditor">Add editor</localize>
</button>

<div class="editor clearfix" ng-if="model.parameter.editor">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
<span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
</button>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<umb-box-content>
<div class="sub-view-columns">
<div class="sub-view-column-left">
<h5><localize key="contentTypeEditor_enableListViewHeading"></localize></h5>
<small><localize key="contentTypeEditor_enableListViewDescription"></localize></small>
<h5><localize key="contentTypeEditor_enableListViewHeading">Enable list view</localize></h5>
<small><localize key="contentTypeEditor_enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</localize></small>
</div>
<div class="sub-view-column-right">
<umb-list-view-settings
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h5>
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="general_folder"></localize>
<localize key="general_folder">Folder</localize>
</span>
</button>
</li>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
<span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
</button>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
<span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
</button>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
<umb-empty-state
ng-if="!items && options.filter.length > 0"
position="center">
<localize key="general_searchNoResult"></localize>
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>

<umb-empty-state
ng-if="!items && options.filter.length == 0 && vm.isRecycleBin"
position="center">
<localize key="general_recycleBinEmpty"></localize>
<localize key="general_recycleBinEmpty">Your recycle bin is empty</localize>
</umb-empty-state>

</div>
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div>

<p class="abstract">
<localize key="defaultdialogs_confirmdeleteNumberOfItems" tokens="[model.numberOfItems, model.totalItems]"></localize>?
<localize key="defaultdialogs_confirmdeleteNumberOfItems" tokens="[model.numberOfItems, model.totalItems]">Are you sure you want to delete</localize>?
</p>

<div class="umb-alert umb-alert--warning" ng-show="model.deletesVariants && !model.isTrashed">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- Direction -->
<umb-control-group label="@relationType_direction">
<p tabindex="0" class="sr-only"><localize key="relationType_direction"></localize></p>
<p tabindex="0" class="sr-only"><localize key="relationType_direction">Direction</localize></p>
<ul class="unstyled">
<li>
<label class="radio" for="parentToChild">
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
<span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
</button>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

<!-- Empty states -->
<umb-empty-state ng-if="!vm.loading && !vm.filteredUserGroups.length" position="center">
<localize key="general_searchNoResult"></localize>
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>

</div>

0 comments on commit 2ec77a2

Please sign in to comment.