Skip to content

Commit 9e5608e

Browse files
robearlamrobearlam
committed
Moved log messages into Resources RESX
1 parent 4d1c1dd commit 9e5608e

7 files changed

Lines changed: 319 additions & 12 deletions

File tree

‎src/Sitecore.AspNetCore.SDK.Pages/Controllers/PagesSetupController.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Sitecore.AspNetCore.SDK.Pages.Configuration;
77
using Sitecore.AspNetCore.SDK.Pages.Middleware;
88
using Sitecore.AspNetCore.SDK.Pages.Models;
9+
using Sitecore.AspNetCore.SDK.Pages.Properties;
910
using Sitecore.AspNetCore.SDK.RenderingEngine.Configuration;
1011

1112
namespace Sitecore.AspNetCore.SDK.Pages.Controllers
@@ -31,7 +32,7 @@ public ActionResult<PagesConfigResponse> Config()
3132
{
3233
if (IsValidPagesConfigRequest(Request))
3334
{
34-
logger.LogDebug("Processing valid Pages Config request");
35+
logger.LogDebug(Resources.Debug_ProcessingValidPagesConfigRequest);
3536
SetConfigResponseHeaders(Response);
3637
return Ok(BuildConfigResponseBody());
3738
}
@@ -48,7 +49,7 @@ public IActionResult Render()
4849
{
4950
if (IsValidPagesRenderRequest(Request))
5051
{
51-
logger.LogDebug("Processing valid Pages Render request");
52+
logger.LogDebug(Resources.Debug_ProcessingValidPagesRenderRequest);
5253
PagesRenderArgs args = ParseQueryStringArgs(Request);
5354
return Redirect($"{args.Route}?mode={args.Mode}&sc_itemid={args.ItemId}&sc_version={args.Version}&sc_lang={args.Language}&sc_site={args.Site}&sc_layoutKind={args.LayoutKind}&secret={args.EditingSecret}&tenant_id={args.TenantId}&route={args.Route}");
5455
}
@@ -78,7 +79,7 @@ private bool IsValidPagesRenderRequest(HttpRequest httpRequest)
7879

7980
if (!IsValidEditingSecret(httpRequest))
8081
{
81-
logger.LogError("Invalid Pages Editing Secret Value");
82+
logger.LogError(Resources.Error_InvalidPagesEditingSecretValue);
8283
return false;
8384
}
8485

@@ -109,13 +110,13 @@ private bool IsValidPagesConfigRequest(HttpRequest httpRequest)
109110

110111
if (!IsValidEditingSecret(httpRequest))
111112
{
112-
logger.LogError("Invalid Pages Editing Secret Value");
113+
logger.LogError(Resources.Error_InvalidPagesEditingSecretValue);
113114
return false;
114115
}
115116

116117
if (!RequestHasValidEditingOrigin(httpRequest))
117118
{
118-
logger.LogError("Invalid Pages Editing Origin");
119+
logger.LogError(Resources.Error_InvalidPagesEditingOrigin);
119120
return false;
120121
}
121122

‎src/Sitecore.AspNetCore.SDK.Pages/Middleware/PagesRenderMiddleware.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Sitecore.AspNetCore.SDK.LayoutService.Client.Request;
88
using Sitecore.AspNetCore.SDK.LayoutService.Client.Response;
99
using Sitecore.AspNetCore.SDK.Pages.Configuration;
10+
using Sitecore.AspNetCore.SDK.Pages.Properties;
1011
using Sitecore.AspNetCore.SDK.RenderingEngine.Extensions;
1112
using Sitecore.AspNetCore.SDK.RenderingEngine.Interfaces;
1213
using Sitecore.AspNetCore.SDK.RenderingEngine.Rendering;
@@ -51,7 +52,7 @@ public async Task Invoke(HttpContext httpContext, IViewComponentHelper viewCompo
5152
// this protects from multiple time executions when Global and Attribute based configurations are used at the same time.
5253
if (httpContext.Items.ContainsKey(nameof(PagesRenderMiddleware)))
5354
{
54-
throw new ApplicationException("PagesRenderMiddleware already registered. Have you ");
55+
throw new ApplicationException(Resources.Exception_PagesRenderMiddlewareAlreadyRegistered);
5556
}
5657

5758
if (httpContext.GetSitecoreRenderingContext() == null)

‎src/Sitecore.AspNetCore.SDK.Pages/Properties/Resources.Designer.cs‎

Lines changed: 153 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Sitecore.AspNetCore.SDK.Pages/Properties/Resources.resx‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="Debug_LayoutServiceGraphQLResponse" xml:space="preserve">
121+
<value>Layout Service GraphQL Response : {responseDataLayout}</value>
122+
</data>
123+
<data name="Debug_LayoutServiceResponseJSON" xml:space="preserve">
124+
<value>Layout Service Response JSON</value>
125+
</data>
126+
<data name="Debug_ProcessingValidPagesConfigRequest" xml:space="preserve">
127+
<value>Processing valid Pages Config request</value>
128+
</data>
129+
<data name="Debug_ProcessingValidPagesRenderRequest" xml:space="preserve">
130+
<value>Processing valid Pages Render request.</value>
131+
</data>
132+
<data name="Error_InvalidPagesEditingOrigin" xml:space="preserve">
133+
<value>Invalid Pages Editing Origin</value>
134+
</data>
135+
<data name="Error_InvalidPagesEditingSecretValue" xml:space="preserve">
136+
<value>Invalid Pages Editing Secret Value</value>
137+
</data>
138+
<data name="Exception_EditingScriptsTagHelperUnableToProcessContextRawData" xml:space="preserve">
139+
<value>EditingScriptsTagHelper: Unable to process ContextRawData</value>
140+
</data>
141+
<data name="Exception_ErrorAttemptingToProcessNonEditingRequest" xml:space="preserve">
142+
<value>GraphQLEditingServiceHandler: Error attempting to process non-editing request</value>
143+
</data>
144+
<data name="Exception_PagesRenderMiddlewareAlreadyRegistered" xml:space="preserve">
145+
<value>PagesRenderMiddleware already registered</value>
146+
</data>
147+
<data name="Exception_EditingScriptsTagHelperSitecoreRenderingContextNull" xml:space="preserve">
148+
<value>EditingScriptsTagHelper: Sitecore RenderingContext is Null</value>
149+
</data>
150+
</root>

0 commit comments

Comments
 (0)