yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424

Browse Source
This commit is contained in:
Sebastiaan Janssen
2015-12-15 12:13:35 +01:00
parent 4958c5a59a 07c714fd11
commit 0629b49112
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -301,6 +301,7 @@
<key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
<key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
<key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
<key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
<key alias="missingTitle">Please enter a title</key>
<key alias="missingType">Please choose a type</key>
<key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -302,6 +302,7 @@
<key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
<key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
<key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
<key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
<key alias="missingTitle">Please enter a title</key>
<key alias="missingType">Please choose a type</key>
<key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>

9
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -24,6 +24,7 @@ using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Macros;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Core.Xml.XPath;
using Umbraco.Core.Profiling;
using umbraco.interfaces;
@@ -322,7 +323,13 @@ namespace umbraco
Exception = e,
Behaviour = UmbracoConfig.For.UmbracoSettings().Content.MacroErrorBehaviour
};
return GetControlForErrorBehavior("Error loading Partial View script (file: " + ScriptFile + ")", macroErrorEventArgs);
var errorMessage = ApplicationContext.Current.Services.TextService.Localize("errors/macroErrorLoadingPartialView",new[]{ScriptFile});
if (errorMessage.Equals("[macroErrorLoadingPartialView]")) // This check can be removed when key is added to every language file
{
errorMessage = "Error loading Partial View script (file: " + ScriptFile + ")";
}
return GetControlForErrorBehavior(errorMessage, macroErrorEventArgs);
};
using (DisposableTimer.DebugDuration<macro>("Executing Partial View: " + Model.TypeName))