From 03a5d5b866d8341bb7d618808d0d583476a52173 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Tue, 12 Mar 2019 08:20:43 +0100 Subject: [PATCH 1/9] Allow mixing languages with and without region --- src/Umbraco.Web/Editors/LanguageController.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs index 64132d3d8e94..e1c0c61303db 100644 --- a/src/Umbraco.Web/Editors/LanguageController.cs +++ b/src/Umbraco.Web/Editors/LanguageController.cs @@ -103,6 +103,13 @@ public Language SaveLanguage(Language language) // this is prone to race conditions but the service will not let us proceed anyways var existing = Services.LocalizationService.GetLanguageByIsoCode(language.IsoCode); + // the localization service might return the generic language even when queried for specific ones (e.g. "da" when queried for "da-DK") + // - we need to handle that explicitly + if (existing.IsoCode != language.IsoCode) + { + existing = null; + } + if (existing != null && language.Id != existing.Id) { //someone is trying to create a language that already exist From e550e5cd8159ac7f08d8fb3c7d35b0d82c2c56a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 12 Mar 2019 10:35:04 +0100 Subject: [PATCH 2/9] rename LESS variables with disgrete to discreet --- .../src/less/components/editor.less | 8 ++++---- .../src/less/components/umb-file-dropzone.less | 4 ++-- .../src/less/components/umb-media-grid.less | 2 +- .../src/less/components/umb-node-preview.less | 8 ++++---- .../src/less/components/umb-packages.less | 4 ++-- src/Umbraco.Web.UI.Client/src/less/listview.less | 8 ++++---- src/Umbraco.Web.UI.Client/src/less/panel.less | 4 ++-- .../src/less/property-editors.less | 4 ++-- src/Umbraco.Web.UI.Client/src/less/variables.less | 12 ++++++------ 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less index 0770a895c0a1..b8ff6a6554a1 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less @@ -167,7 +167,7 @@ a.umb-editor-header__close-split-view:hover { text-decoration: none !important; font-size: 13px; //color: @gray-4; - color: @ui-action-disgrete-type; + color: @ui-action-discreet-type; //background-color: @white; } @@ -175,15 +175,15 @@ a.umb-variant-switcher__toggle { transition: color 0.2s ease-in-out; &:hover { //background-color: @gray-10; - color: @ui-action-disgrete-type-hover; + color: @ui-action-discreet-type-hover; .umb-variant-switcher__expand { - color: @ui-action-disgrete-type-hover; + color: @ui-action-discreet-type-hover; } } } .umb-variant-switcher__expand { - color: @ui-action-disgrete-type; + color: @ui-action-discreet-type; margin-top: 3px; margin-left: 5px; margin-right: -5px; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less index b5021d7c38fd..5071091fcca8 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less @@ -41,13 +41,13 @@ // file select link .file-select { font-size: 15px; - color: @ui-action-disgrete-type; + color: @ui-action-discreet-type; cursor: pointer; margin-top: 10px; &:hover { - color: @ui-action-disgrete-type-hover; + color: @ui-action-discreet-type-hover; text-decoration: none; } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less index 7a6cd043a462..41e8a2892c19 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less @@ -211,7 +211,7 @@ transition: opacity 150ms; &:hover { - color: @ui-action-disgrete-type-hover; + color: @ui-action-discreet-type-hover; } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less index b054ddf90779..d52cb918f6bb 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less @@ -89,16 +89,16 @@ display: flex; align-items: center; justify-content: center; - border: 1px dashed @ui-action-disgrete-border; - color: @ui-action-disgrete-type; + border: 1px dashed @ui-action-discreet-border; + color: @ui-action-discreet-type; font-weight: bold; padding: 5px 15px; box-sizing: border-box; } .umb-node-preview-add:hover { - color: @ui-action-disgrete-type-hover; - border-color: @ui-action-disgrete-border-hover; + color: @ui-action-discreet-type-hover; + border-color: @ui-action-discreet-border-hover; text-decoration: none; } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less index daee29351cc1..f704dd48e2d1 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -408,7 +408,7 @@ a.umb-package-details__back-link { .umb-gallery__thumbnail { flex: 0 1 100px; - border: 1px solid @ui-action-disgrete-border; + border: 1px solid @ui-action-discreet-border; border-radius: 3px; margin: 5px; padding: 10px; @@ -418,7 +418,7 @@ a.umb-package-details__back-link { .umb-gallery__thumbnail:hover { cursor: pointer; - border-color: @ui-action-disgrete-border-hover; + border-color: @ui-action-discreet-border-hover; } /* PACKAGE LIST */ diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index 8b5a295752c1..b3de3e575d33 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -239,8 +239,8 @@ .list-view-add-layout { margin-top: 10px; - color: @ui-action-disgrete-type; - border: 1px dashed @ui-action-disgrete-border; + color: @ui-action-discreet-type; + border: 1px dashed @ui-action-discreet-border; display: flex; align-items: center; justify-content: center; @@ -250,6 +250,6 @@ .list-view-add-layout:hover { text-decoration: none; - color: @ui-action-disgrete-type-hover; - border-color: @ui-action-disgrete-border-hover; + color: @ui-action-discreet-type-hover; + border-color: @ui-action-discreet-border-hover; } diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index a8c1efe1d382..bad0ab971559 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -346,7 +346,7 @@ justify-content: center; align-items: center; background: @white; - border: 1px solid @ui-action-disgrete-border; + border: 1px solid @ui-action-discreet-border; animation: fadeIn 0.5s; border-radius: 3px; width: 50px; @@ -354,7 +354,7 @@ .icon { opacity: 0.8; } - border-color: @ui-action-disgrete-border-hover; + border-color: @ui-action-discreet-border-hover; } } diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index e021a577a586..279163d64b9d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -269,8 +269,8 @@ transition: all 150ms ease-in-out; &:hover { - color: @ui-action-disgrete-type-hover; - border-color: @ui-action-disgrete-type-hover; + color: @ui-action-discreet-type-hover; + border-color: @ui-action-discreet-type-hover; } } diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 19098b8a9845..6a8fe00dd790 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -162,12 +162,12 @@ @ui-action-border: @blueExtraDark; @ui-action-border-hover: @blueMid; -@ui-action-disgrete: white; -@ui-action-disgrete-hover: @sand-7; -@ui-action-disgrete-type: @blueExtraDark; -@ui-action-disgrete-type-hover: @blueMid; -@ui-action-disgrete-border: @gray-7; -@ui-action-disgrete-border-hover: @blueMid; +@ui-action-discreet: white; +@ui-action-discreet-hover: @sand-7; +@ui-action-discreet-type: @blueExtraDark; +@ui-action-discreet-type-hover: @blueMid; +@ui-action-discreet-border: @gray-7; +@ui-action-discreet-border-hover: @blueMid; @type-white: @white; @type-black: @blueNight; From 6d88726479b17338dcc2f3860a4b423ade7fff7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 13 Mar 2019 11:46:33 +0100 Subject: [PATCH 3/9] Fixing code in sync functionality of checkbox-list --- .../checkboxlist/checkboxlist.controller.js | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js index 5ba9746c6eb7..43e50dc39265 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js @@ -33,9 +33,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro } function updateViewModel(configItems) { - - //check if it's already in sync - + //get the checked vals from the view model var selectedVals = _.map( _.filter($scope.selectedItems, @@ -47,22 +45,23 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro return m.value; } ); - //get all of the same values between the arrays - var same = _.intersection($scope.model.value, selectedVals); - //if the lengths are the same as the value, then we are in sync, just exit - - if (same.length === $scope.model.value.length === selectedVals.length) { + + //if the length is zero, then we are in sync, just exit. + if (_.difference($scope.model.value, selectedVals).length === 0) { + debugger; return; } $scope.selectedItems = []; - + + var iConfigItem; for (var i = 0; i < configItems.length; i++) { - var isChecked = _.contains($scope.model.value, configItems[i].value); + iConfigItem = configItems[i]; + var isChecked = _.contains($scope.model.value, iConfigItem.value); $scope.selectedItems.push({ checked: isChecked, - key: configItems[i].id, - val: configItems[i].value + key: iConfigItem.id, + val: iConfigItem.value }); } } From 23f36b9d4e19eec960cc8b99540b147670aea3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 22 Mar 2019 09:20:50 +0100 Subject: [PATCH 4/9] top: 70px; in infinity mode --- .../components/umbstickybar.directive.js | 4 ++-- .../editor/subheader/umb-editor-sub-header.less | 16 ++++++++++++---- .../src/views/propertyeditors/grid/grid.html | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js index fb5a558fd051..2f2df7c12bce 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js @@ -56,7 +56,7 @@ Use this directive make an element sticky and follow the page when scrolling. } if (attr.scrollableContainer) { - scrollableContainer = $(attr.scrollableContainer); + scrollableContainer = bar.closest(attr.scrollableContainer); } else { scrollableContainer = $(window); } @@ -121,7 +121,7 @@ Use this directive make an element sticky and follow the page when scrolling. function calculateSize() { var width = bar.innerWidth(); clonedBar.css({ - width: width + width: width + 10 // + 10 (5*2) because we need to add border to avoid seeing the shadow beneath. Look at the CSS. }); } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less index 0c1134984149..2e599252bb74 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less @@ -1,7 +1,11 @@ .umb-editor-sub-header { padding: 10px 0; margin-bottom: 10px; - background: @gray-10; + background: @brownGrayLight; + border-left: 5px solid @brownGrayLight; + border-right: 5px solid @brownGrayLight; + margin-left: -5px; + margin-right: -5px; display: flex; justify-content: space-between; margin-top: -10px; @@ -12,7 +16,7 @@ &.nested { margin-top: 0; margin-bottom: 0; - background: @gray-10; + background: @brownGrayLight; } } @@ -25,10 +29,14 @@ .umb-editor-sub-header.-umb-sticky-bar { box-shadow: 0 6px 3px -3px rgba(0,0,0,.16); - transition: box-shadow 1s; - top: calc(@appHeaderHeight + @editorHeaderHeight); + transition: box-shadow 240ms; margin-top: 0; margin-bottom: 0; + top: calc(@appHeaderHeight + @editorHeaderHeight); + + .umb-editor--infinityMode & { + top: calc(@editorHeaderHeight); + } } .umb-group-builder__property-preview .umb-editor-sub-header { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index 0c6078478ad7..f0171e2d00b4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -1,6 +1,6 @@
- + Date: Fri, 22 Mar 2019 09:21:37 +0100 Subject: [PATCH 5/9] remove debugger; --- .../propertyeditors/checkboxlist/checkboxlist.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js index 43e50dc39265..045a33ac3243 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js @@ -48,7 +48,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro //if the length is zero, then we are in sync, just exit. if (_.difference($scope.model.value, selectedVals).length === 0) { - debugger; return; } From 8ab89f5e1c911feefb73f32f1ea830e7ac51c696 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 22 Mar 2019 12:01:08 +0100 Subject: [PATCH 6/9] https://github.com/umbraco/Umbraco-CMS/issues/4683 - Translation in the culture and hostnames panel. Our recommendation in V8 is opposite to V7, therefore a new key is introduced --- .../src/views/content/assigndomain.html | 28 +++++++++---------- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 2 -- src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 7 +++-- src/Umbraco.Web.UI/Umbraco/config/lang/de.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 11 ++++---- .../Umbraco/config/lang/en_us.xml | 9 +++--- src/Umbraco.Web.UI/Umbraco/config/lang/es.xml | 2 -- src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml | 3 -- src/Umbraco.Web.UI/Umbraco/config/lang/he.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/it.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 3 +- src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml | 3 -- src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml | 3 -- src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml | 3 -- src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml | 1 - src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml | 5 ---- src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml | 3 -- .../Umbraco/config/lang/zh_tw.xml | 3 -- 21 files changed, 28 insertions(+), 64 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html index 89381e1be4bc..10b155111c9d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html @@ -5,7 +5,7 @@
- +
Culture
@@ -18,14 +18,14 @@
CultureDomains
- +
- + * @@ -45,17 +45,17 @@
Domains({{domain.other}})
- - Domains
- - Domains - - Domains - +
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 6c685e36e975..42fe9f920b63 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -47,8 +47,6 @@ Nová doména '%0%' byla vytvořena Doména '%0%' je odstraněna Doména '%0%' už byla přiřazena -
Jednoúrovňové cesty v doménách jsou podporovány, např. "example.com/en". Měli byste se jich nicméně vyvarovat. Raději použijte nastavení kultury výše.]]> Doména '%0%' byla aktualizována Editace aktuálních domén Dědit diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index 3dc447cef478..875948d4d23a 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -95,7 +95,8 @@ Domænet '%0%' er oprettet Domænet '%0%' er nu opdateret eller rediger nuværende domæner - f.eks. ditdomaene.com, www.ditdomaene.com + Nedarv Sprog eller nedarv sprog fra forældre noder. Gælder også
@@ -277,7 +278,7 @@ Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog. Udgivne sprog Ikke-udgivne sprog - Uændrede sprog + Uændrede sprog Disse sprog er ikke blevet oprettet Klar til at udgive? Klar til at gemme? @@ -986,7 +987,7 @@ Mange hilsner fra Umbraco robotten - %0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen + %0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen Medtag ikke-udgivede undersider Publicerer - vent venligst... diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml index ea4d61969022..7e1cb96228c4 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml @@ -52,7 +52,6 @@ Die Domain '%0%' ist bereits zugeordnet Domain '%0%' aktualisiert Domains bearbeiten - Beispiel: example.com, www.example.com Vererben Kultur Definiert die Kultureinstellung für untergeordnete Elemente dieses Elements oder vererbt vom übergeordneten Element. Wird auch auf das aktuelle Element angewendet, sofern auf tieferer Ebene keine Domain zugeordnet ist. diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 1504b092e546..fa6f6898452b 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -96,9 +96,8 @@ Domain '%0%' has already been assigned Domain '%0%' has been updated Edit Current Domains - + Inherit Culture @@ -287,8 +286,8 @@ Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. Published Languages Unpublished Languages - Unmodified Languages - These languages haven't been created + Unmodified Languages + These languages haven't been created Ready to Publish? Ready to Save? Send for approval @@ -1236,7 +1235,7 @@ To manage your website, simply open the Umbraco back office and start adding con ]]> + ]]> Include unpublished subpages Publishing in progress - please wait... 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 7f1edf9e7cf3..6ff4d32f08f7 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -96,9 +96,8 @@ Domain '%0%' has already been assigned Domain '%0%' has been updated Edit Current Domains - + Inherit Culture or inherit culture from parent nodes. Will also apply
@@ -290,7 +289,7 @@ Published Languages Unpublished Languages Unmodified Languages - These languages haven't been created + These languages haven't been created Ready to Publish? Ready to Save? Send for approval @@ -1240,7 +1239,7 @@ To manage your website, simply open the Umbraco back office and start adding con ]]> + ]]> Publishing in progress - please wait... %0% out of %1% pages have been published... diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml index 9143889f840f..aef92af6e103 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml @@ -86,8 +86,6 @@ El dominio'%0%' ya ha sido asignado El dominio %0% ha sido actualizado Editar dominios actuales -
Los dominios de un nivel están soportados, por ej. "example.com/en". De todas formas deberían de evitarse. Mejor usar la configuración cultural especificada arriba.]]> Heredar Idioma diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml index 9f36971fe004..e992767f4ffc 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml @@ -88,9 +88,6 @@ Domaine '%0%' déjà assigné Domaine '%0%' mis à jour Editer les domaines actuels -
Les domaines contenant un chemin d'un niveau sont autorisés, ex : "example.com/en". Pour autant, cela - devrait être évité. Utilisez plutôt la gestion de la culture et des noms d'hôte.]]> Hériter Culture ou hériter de la culture des noeuds parents. S'appliquera aussi
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml index 5a5dd52b6d80..a0a6c2cefcbf 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml @@ -41,7 +41,6 @@ הדומיין החדש %0% נוסף בהצלחה הדומיין %0% נמחק הדומיין %0% כבר מוקצה - לדוגמא: yourdomain.com, www.yourdomain.com הדומיין %0% עודכן בהצלחה ערוך דומיין נוכחי diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml index 285249a3ff48..8d8105c4d1fa 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml @@ -41,7 +41,6 @@ - Hostname non valido Modifica il dominio corrente diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml index 4264e5d4f7ff..f6d957743e7b 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml @@ -52,7 +52,6 @@ ドメイン '%0%' は既に割り当てられています ドメイン '%0%' は更新されました ドメインの編集 - 継承 カルチャの割り当て diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml index 711eb52c40be..2336dccb166e 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml @@ -40,7 +40,6 @@ 새로운 '%0%' 도메인이 생성되었습니다 '%0%' 도메인이 삭제되었습니다 '%0%' 도메인이 이미 존재합니다 - 예제: yourdomain.com, www.yourdomain.com '%0%' 도메인이 업데이트 되었습니다 현재 도메인 수정 diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index 5ea42a3f2ba2..b38c11a6e01c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -50,8 +50,7 @@ Domenet '%0%' er allerede tilknyttet Domenet '%0%' er nå oppdatert eller rediger eksisterende domener -
Stier med ett nivå støttes, f.eks. "eksempel.com/no". Imidlertid bør det unngås. Bruk heller språkinnstillingen over.]]> - Arv + Arv Språk Vil også gjelde denne noden, med mindre et underordnet domene også gjelder.]]> Domener diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml index ecdb83fea008..28d71ed00381 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml @@ -55,9 +55,6 @@ Domein '%0' is al aanwezig Domein '%0%' is bijgewerkt Bewerk huidige domeinen -
Zgn. 'one-level' paden in domeinen worden ondersteund, bijv. "example.com/en". Echter, ze - zouden moeten worden vermeden. Gebruik bij voorkeur de cultuurinstelling hierboven.]]> Overerven Cultuur of erf de cultuur over van de oudernodes. Zal ook van toepassing
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml index 37e1d9829c9c..96e8e980a67d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml @@ -86,9 +86,6 @@ Domena '%0%' jest aktualnie przypisana Domena '%0%' została zaktualizowana Edytuj Aktualne Domeny - Odziedziczona Język lub wybierz dziedziczenie języka z węzła rodzica. Zostanie to zastosowane
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml index eb87077572d9..a275fc8cd9f2 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml @@ -40,7 +40,6 @@ Novo domínio '%0%' foi criado Domínio '%0%' foi removido Domínio '%0%' já foi designado - ou seja: seudominio.com, www.seudominio.com Domínio '%0%' foi atualizado Editar Domínios Atuais diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml index a3ba12fea5c0..a0fc2c3ffc0e 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml @@ -78,9 +78,6 @@ Создан новый домен '%0%' Домен '%0%' удален Домен с именем '%0%' уже существует -
Также здесь допустимы части адресов URL первого уровня, например "example.com/en", - однако их следует по возможности избегать. Рекомендуется использовать настройку культуры (языка), расположенную выше.]]> Домен '%0%' обновлен Такой домен уже назначен. Унаследовать diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml index 158cdeb9cbca..9e2e312c38d6 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml @@ -43,7 +43,6 @@ Har skapat domännamnet %0% Har tagit bort domännamnet %0% Domänen %0% är redan tillagd - t.ex.: dittdomannamn.se, www.dittdomannamn.se Domännamnet %0% har uppdaterats Domänen är redan tilldelad Ärv diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml index 2d3f24c11355..1a298c0a358d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml @@ -52,11 +52,6 @@ Domain '%0%' zaten atanmış Domain '%0%' güncellendi Geçerli domain düzenle - etki /> bir düzey yollar desteklenir
Miras Al Kültür veya üst düğümleri kültürünü devralır. Ayrıca
geçerli olacaktır diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml index dcf84f41ca0a..c8c3f75e174d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml @@ -55,9 +55,6 @@ 域名 '%0%' 已使用 域名 '%0%' 已更新 编辑当前域名 - - https://www.example.com/、example.com/en、……使用 * 代表任意域名，
- 只需要设置语言部分即可。]]> 继承 语言 diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml index 568af00c2409..56639aa30867 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml @@ -52,9 +52,6 @@ 功能變數名稱 '%0%' 已使用 功能變數名稱 '%0%' 已更新 編輯當前功能變數名稱 - 繼承 語言 或從父節點繼承文化設定。
From f99d3f74197235511c94cf4ef2de92878b86ba68 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 22 Mar 2019 13:53:40 +0100 Subject: [PATCH 7/9] https://github.com/umbraco/Umbraco-CMS/issues/4990 - Added skip and take --- .../Repositories/Implement/DocumentRepository.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs index fcc840226529..53d9474fb0d2 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs @@ -230,9 +230,9 @@ public override IEnumerable GetAllVersionsSlim(int nodeId, int skip, i var sql = GetBaseQuery(QueryType.Many, false) .Where(x => x.NodeId == nodeId) .OrderByDescending(x => x.Current) - .AndByDescending(x => x.VersionDate); - - return MapDtosToContent(Database.Fetch(sql), true, true); + .AndByDescending(x => x.VersionDate) + ; + return MapDtosToContent(Database.Fetch(sql), true, true).Skip(skip).Take(take); } public override IContent GetVersion(int versionId) From acf59dc1d001e47e1b2b3bdd4c441097bbc7b087 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 22 Mar 2019 13:55:46 +0100 Subject: [PATCH 8/9] Formatting --- .../Persistence/Repositories/Implement/DocumentRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs index 53d9474fb0d2..6c08e0599586 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs @@ -230,8 +230,8 @@ public override IEnumerable GetAllVersionsSlim(int nodeId, int skip, i var sql = GetBaseQuery(QueryType.Many, false) .Where(x => x.NodeId == nodeId) .OrderByDescending(x => x.Current) - .AndByDescending(x => x.VersionDate) - ; + .AndByDescending(x => x.VersionDate); + return MapDtosToContent(Database.Fetch(sql), true, true).Skip(skip).Take(take); } From d107289a0892d6c23599cfedd2e4e80063fc1745 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 22 Mar 2019 15:06:09 +0100 Subject: [PATCH 9/9] Fixes not being able to add languages --- src/Umbraco.Web/Editors/LanguageController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs index e1c0c61303db..61d4d6939ffd 100644 --- a/src/Umbraco.Web/Editors/LanguageController.cs +++ b/src/Umbraco.Web/Editors/LanguageController.cs @@ -105,7 +105,7 @@ public Language SaveLanguage(Language language) // the localization service might return the generic language even when queried for specific ones (e.g. "da" when queried for "da-DK") // - we need to handle that explicitly - if (existing.IsoCode != language.IsoCode) + if (existing?.IsoCode != language.IsoCode) { existing = null; }