diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html index 5c34040a8d..89e8075d33 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html @@ -62,7 +62,6 @@
-
{{vm.createFolderError.errorMsg}}
{{vm.createFolderError.data.message}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html index 3cca62b2b9..d11e240c3c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html @@ -52,7 +52,6 @@
-
{{vm.createFolderError.errorMsg}}
{{vm.createFolderError.data.message}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html index 89a6ce1f7d..2dc1f39ff8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html @@ -29,7 +29,6 @@
-
{{vm.createFolderError.errorMsg}}
{{vm.createFolderError.data.message}}
@@ -50,4 +49,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html index 0554c430d1..630d23fe78 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html @@ -35,7 +35,6 @@
-
{{vm.createFolderError.errorMsg}}
{{vm.createFolderError.data.message}}
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index 9dceead927..3c57fa35d8 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -187,7 +187,8 @@ Oprettelse af mappen under parent med ID %0% fejlede Oprettelse af mappen under parent med navnet %0% fejlede - Sletning af filen/mappen fejlede: %0% + Mappens navn må ikke indeholde ugyldige tegn. + Sletning af filen/mappen fejlede: %0% Udgivet diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 3dcbfcded2..8135591c0c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -195,6 +195,7 @@ Failed to create a folder under parent with ID %0% Failed to create a folder under parent with name %0% + The folder name cannot contain illegal characters. Failed to delete item: %0% 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 8c8a405e29..48ea15e3dc 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -199,6 +199,7 @@ Failed to create a folder under parent with ID %0% Failed to create a folder under parent with name %0% + The folder name cannot contain illegal characters. Failed to delete item: %0% diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index 1812ccd0ea..719f7521cb 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -81,7 +81,7 @@ namespace Umbraco.Web.Editors if (string.IsNullOrWhiteSpace(parentId)) throw new ArgumentException("Value cannot be null or whitespace.", "parentId"); if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name"); if (name.ContainsAny(Path.GetInvalidPathChars())) { - return Request.CreateNotificationValidationErrorResponse("The folder name cannot contain illegal characters."); + return Request.CreateNotificationValidationErrorResponse(Services.TextService.Localize("codefile/createFolderIllegalChars")); } // if the parentId is root (-1) then we just need an empty string as we are