huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed error message related to escaping curly braces.

This commit is contained in:
Kiran Challa 2017-01-03 14:33:36 -08:00
parent 071b616178
commit 755d436840
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs generated
View File

@ -363,7 +363,7 @@ namespace Microsoft.AspNetCore.Routing
} }
/// <summary> /// <summary>
/// In a route parameter, '{' and '}' must be escaped with '{{' and '}}' /// In a route parameter, '{' and '}' must be escaped with '{{' and '}}'.
/// </summary> /// </summary>
internal static string TemplateRoute_UnescapedBrace internal static string TemplateRoute_UnescapedBrace
{ {
@ -371,7 +371,7 @@ namespace Microsoft.AspNetCore.Routing
} }
/// <summary> /// <summary>
/// In a route parameter, '{' and '}' must be escaped with '{{' and '}}' /// In a route parameter, '{' and '}' must be escaped with '{{' and '}}'.
/// </summary> /// </summary>
internal static string FormatTemplateRoute_UnescapedBrace() internal static string FormatTemplateRoute_UnescapedBrace()
{ {

2
src/Microsoft.AspNetCore.Routing/Resources.resx
View File

@ -184,7 +184,7 @@
<value>The constraint entry '{0}' - '{1}' on the route '{2}' could not be resolved by the constraint resolver of type '{3}'.</value> <value>The constraint entry '{0}' - '{1}' on the route '{2}' could not be resolved by the constraint resolver of type '{3}'.</value>
</data> </data>
<data name="TemplateRoute_UnescapedBrace" xml:space="preserve"> <data name="TemplateRoute_UnescapedBrace" xml:space="preserve">
<value>In a route parameter, '{' and '}' must be escaped with '{{' and '}}'</value> <value>In a route parameter, '{' and '}' must be escaped with '{{' and '}}'.</value>
</data> </data>
<data name="TemplateRoute_OptionalParameterCanbBePrecededByPeriod" xml:space="preserve"> <data name="TemplateRoute_OptionalParameterCanbBePrecededByPeriod" xml:space="preserve">
<value>In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.</value> <value>In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.</value>

4
test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs
View File

@ -521,7 +521,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests
// Act and Assert // Act and Assert
ExceptionAssert.Throws<ArgumentException>( ExceptionAssert.Throws<ArgumentException>(
() => TemplateParser.Parse(template), () => TemplateParser.Parse(template),
"In a route parameter, '{' and '}' must be escaped with '{{' and '}}'" + Environment.NewLine + "In a route parameter, '{' and '}' must be escaped with '{{' and '}}'." + Environment.NewLine +
"Parameter name: routeTemplate"); "Parameter name: routeTemplate");
} }
@ -708,7 +708,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests
{ {
ExceptionAssert.Throws<ArgumentException>( ExceptionAssert.Throws<ArgumentException>(
() => TemplateParser.Parse("{a}/{a{aa}/{z}"), () => TemplateParser.Parse("{a}/{a{aa}/{z}"),
"In a route parameter, '{' and '}' must be escaped with '{{' and '}}'" + Environment.NewLine + "In a route parameter, '{' and '}' must be escaped with '{{' and '}}'." + Environment.NewLine +
"Parameter name: routeTemplate"); "Parameter name: routeTemplate");
} }