diff --git a/src/Umbraco.Tests/TypeFinderTests.cs b/src/Umbraco.Tests/TypeFinderTests.cs index c77620c11e..df3797b4a4 100644 --- a/src/Umbraco.Tests/TypeFinderTests.cs +++ b/src/Umbraco.Tests/TypeFinderTests.cs @@ -447,7 +447,9 @@ namespace Umbraco.Tests "HtmlAgilityPack.", "TidyNet.", "ICSharpCode.", - "CookComputing." + "CookComputing.", + /* Mono */ + "MonoDevelop.NUnit" }; public static IEnumerable FindClassesOfTypeWithAttribute() diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index e3aa533783..d800f72a6b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -432,13 +432,13 @@ Dette er en automatisk mail for at fortælle at handlingen '%1%' er blevet udført på siden '%2%' af brugeren '%3%' -Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for at redigere. +Gå til http://%4%/default.aspx?section=content&id=%5% for at redigere. Ha' en dejlig dag! Mange hilsner fra umbraco robotten ]]> - Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'


  PUBLISÉr          RET            SLET    

Opdateringssammendrag:

%6%


  PUBLISÉR          RET            SLET    

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> + Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'


  PUBLISÉr          RET            SLET    

Opdateringssammendrag:

%6%


  PUBLISÉR          RET            SLET    

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> [%0%] Notificering om %1% udført på %2% Notificeringer diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 707648950f..c721c7e227 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -463,7 +463,7 @@ Hallo %0%, die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt. -Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/umbraco/actions/editContent.aspx?id=%5% +Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/actions/editContent.aspx?id=%5% Einen schönen Tag wünscht Ihr freundlicher Umbraco-Robot @@ -474,9 +474,9 @@ Ihr freundlicher Umbraco-Robot

die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt.


-   VERÖFFENTLICHEN     -      BEARBEITEN        -     LÖSCHEN     +   VERÖFFENTLICHEN     +      BEARBEITEN        +     LÖSCHEN    

@@ -487,9 +487,9 @@ Ihr freundlicher Umbraco-Robot


-   VERÖFFENTLICHEN     -      BEARBEITEN        -     LÖSCHEN     +   VERÖFFENTLICHEN     +      BEARBEITEN        +     LÖSCHEN    

Einen schönen Tag wünscht
Ihr freundlicher Umbraco-Robot

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 58396680cd..0e646278f8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -534,7 +534,7 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri Ceci est un email automatique pour vous informer que la tâche '%1%' a été activée sur la page '%2%' par l'utilisateur '%3%' - Allez à http://%4%/umbraco/actions/editContent.aspx?id=%5% pour éditer. + Allez à http://%4%/actions/editContent.aspx?id=%5% pour éditer. Bonne journée! @@ -550,9 +550,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri


-   PUBLIER     -      EDITER        -     SUPPRIMER     +   PUBLIER     +      EDITER        +     SUPPRIMER    

@@ -564,9 +564,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri


-   PUBLIER     -      EDITER        -     SUPPRIMER     +   PUBLIER     +      EDITER        +     SUPPRIMER    
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 729883cf4e..7e8fbd8e3a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -452,9 +452,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je


-   PUBLISH     -      EDIT        -     DELETE     +   PUBLISH     +      EDIT        +     DELETE    

@@ -466,9 +466,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je


-   PUBLISH     -      EDIT        -     DELETE     +   PUBLISH     +      EDIT        +     DELETE    
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml index 8dcc4dcdb7..ce5d23a286 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml @@ -433,7 +433,7 @@ Dette er en automatisk mail for å informere om at handlingen '%1%' er utført på siden '%2%' av brukeren '%3%' -Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for å redigere. +Gå til http://%4%/default.aspx?section=content&id=%5% for å redigere. Ha en fin dag! @@ -447,9 +447,9 @@ Vennlig hilsen umbraco roboten


-   PUBLISER     -      REDIGER        -     SLETT     +   PUBLISER     +      REDIGER        +     SLETT    

@@ -461,9 +461,9 @@ Vennlig hilsen umbraco roboten


-   PUBLISER     -      REDIGER        -     SLETT     +   PUBLISER     +      REDIGER        +     SLETT    
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx index ea6de5b968..2b8e9e16b0 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx index fd16f91b03..d2c72fef2a 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml index 2f5ebb543b..8383d9077e 100644 --- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml +++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml @@ -10,7 +10,7 @@ @* Get the property alias we want to filter on from the macro parameter *@ var propertyAlias = Parameter.propertyAlias; - var selection = Model.Children.Where("Visible").OrderBy(propertyAlias) + var selection = Model.Children.Where("Visible").OrderBy(propertyAlias); } diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx index c554ab88b9..1d0166285d 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx @@ -10,25 +10,25 @@
- <%=umbraco.ui.Text("name", UmbracoUser)%>: + <%=umbraco.ui.Text("name", base.getUser())%>:
- <%=umbraco.ui.Text("stylesheet", "nameHelp", UmbracoUser)%> + <%=umbraco.ui.Text("stylesheet", "nameHelp", base.getUser())%>
- <%=umbraco.ui.Text("alias", UmbracoUser)%>: + <%=umbraco.ui.Text("alias", base.getUser())%>:
- <%=umbraco.ui.Text("stylesheet", "aliasHelp", UmbracoUser)%> + <%=umbraco.ui.Text("stylesheet", "aliasHelp", base.getUser())%>
- <%=umbraco.ui.Text("styles", UmbracoUser)%>: + <%=umbraco.ui.Text("styles", base.getUser())%>: @@ -38,7 +38,7 @@
- <%=umbraco.ui.Text("preview", UmbracoUser)%>: + <%=umbraco.ui.Text("preview", base.getUser())%>:
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs index 955b885692..4106275165 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs @@ -226,7 +226,7 @@ namespace umbraco.controls.GenericProperties checkMandatory.Checked = true; // validation - if (_pt != null && _pt.ValidationRegExp != "") + if (_pt != null && string.IsNullOrEmpty(_pt.ValidationRegExp) == false) tbValidation.Text = _pt.ValidationRegExp; // description diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs index 46ee8f3f80..5e3f16ca0c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs @@ -42,7 +42,7 @@ namespace umbraco public bool Save() { - string[] scriptFileAr = _alias.Split('¤'); + string[] scriptFileAr = _alias.Split('\u00A4'); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx index ea6de5b968..2b8e9e16b0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx index fd16f91b03..d2c72fef2a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>