Skip to content

Commit 16cd277

Browse files
dominikag2dominikag2
committed
GH-158 :: remove the localizations in custom admin pages and replacing them with hardcoded strings. Keep localization only for SeoSettingsEditPage as an example
1 parent 1acea51 commit 16cd277

File tree

9 files changed

+50
-175
lines changed

9 files changed

+50
-175
lines changed

‎src/TrainingGuides.Admin/Localization/Resources/en-US/custom/LocalizationCustom.en-US.resx‎

Lines changed: 10 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -186,52 +186,19 @@
186186
<data name="TrainingGuides.WebsiteChannelSecondary.Name" xml:space="preserve">
187187
<value>Training guides secondary web channel</value>
188188
</data>
189-
<data name="TrainingGuides.Page.GlobalSettingsListing.Name" xml:space="preserve">
190-
<value>Name</value>
189+
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
190+
<value>Web channel settings</value>
191191
</data>
192-
<data name="TrainingGuides.Page.GlobalSettingsListing.Value" xml:space="preserve">
193-
<value>Value</value>
192+
<data name="TrainingGuides.Page.SeoSettingsEdit.Name" xml:space="preserve">
193+
<value>SEO settings</value>
194194
</data>
195-
<data name="TrainingGuides.Page.GlobalSettingsListing.Note" xml:space="preserve">
196-
<value>Note</value>
195+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.Name" xml:space="preserve">
196+
<value>SEO settings edit</value>
197197
</data>
198-
<data name="TrainingGuides.Page.GlobalSettingsListing.Codename" xml:space="preserve">
199-
<value>Codename</value>
198+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Name" xml:space="preserve">
199+
<value>Robots.txt</value>
200200
</data>
201-
<data name="TrainingGuides.Page.GlobalSettingsListing.NewSetting" xml:space="preserve">
202-
<value>New setting</value>
201+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Explanation" xml:space="preserve">
202+
<value>Enter the content of the Robots.txt file</value>
203203
</data>
204-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Name" xml:space="preserve">
205-
<value>Global settings key edit</value>
206-
</data>
207-
<data name="TrainingGuides.Page.GlobalSettingsCreate.DisplayName" xml:space="preserve">
208-
<value>Display name</value>
209-
</data>
210-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Codename" xml:space="preserve">
211-
<value>Settings key code name</value>
212-
</data>
213-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Value" xml:space="preserve">
214-
<value>Value</value>
215-
</data>
216-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Notes" xml:space="preserve">
217-
<value>Notes</value>
218-
</data>
219-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Notes.ExplanationText" xml:space="preserve">
220-
<value>Explain the purpose of this settings key.</value>
221-
</data>
222-
<data name="TrainingGuides.Page.WebChannelSnippetListing.Snippet" xml:space="preserve">
223-
<value>Snippet</value>
224-
</data>
225-
<data name="TrainingGuides.Page.WebChannelSnippetListing.Type" xml:space="preserve">
226-
<value>Type</value>
227-
</data>
228-
<data name="TrainingGuides.Page.WebChannelSnippetListing.NewSnippet" xml:space="preserve">
229-
<value>New snippet</value>
230-
</data>
231-
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
232-
<value>Web channel settings</value>
233-
</data>
234-
<data name="TrainingGuides.Page.WebChannelSettingsListing.Channel" xml:space="preserve">
235-
<value>Channel</value>
236-
</data>
237204
</root>

‎src/TrainingGuides.Admin/Localization/Resources/es-MX/custom/LocalizationCustom.es-MX.resx‎

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -300,52 +300,16 @@
300300
<data name="TrainingGuides.WebsiteChannelSecondary.Name" xml:space="preserve">
301301
<value>Canal web secundario de guías de formación</value>
302302
</data>
303-
<data name="TrainingGuides.Page.GlobalSettingsListing.Name" xml:space="preserve">
304-
<value>Nombre</value>
305-
</data>
306-
<data name="TrainingGuides.Page.GlobalSettingsListing.Value" xml:space="preserve">
307-
<value>Valor</value>
308-
</data>
309-
<data name="TrainingGuides.Page.GlobalSettingsListing.Note" xml:space="preserve">
310-
<value>Nota</value>
311-
</data>
312-
<data name="TrainingGuides.Page.GlobalSettingsListing.Codename" xml:space="preserve">
313-
<value>Nombre clave</value>
314-
</data>
315-
<data name="TrainingGuides.Page.GlobalSettingsListing.NewSetting" xml:space="preserve">
316-
<value>Nueva configuración</value>
317-
</data>
318-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Name" xml:space="preserve">
319-
<value>Edición de clave de configuración global</value>
320-
</data>
321-
<data name="TrainingGuides.Page.GlobalSettingsCreate.DisplayName" xml:space="preserve">
322-
<value>Nombre para mostrar</value>
323-
</data>
324-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Codename" xml:space="preserve">
325-
<value>Nombre clave de configuración</value>
326-
</data>
327-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Value" xml:space="preserve">
328-
<value>Valor</value>
329-
</data>
330-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Notes" xml:space="preserve">
331-
<value>Notas</value>
332-
</data>
333-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Notes.ExplanationText" xml:space="preserve">
334-
<value>Explique el propósito de esta clave de configuración.</value>
335-
</data>
336-
<data name="TrainingGuides.Page.WebChannelSnippetListing.Snippet" xml:space="preserve">
337-
<value>Fragmento</value>
338-
</data>
339-
<data name="TrainingGuides.Page.WebChannelSnippetListing.Type" xml:space="preserve">
340-
<value>Tipo</value>
341-
</data>
342-
<data name="TrainingGuides.Page.WebChannelSnippetListing.NewSnippet" xml:space="preserve">
343-
<value>Nuevo fragmento</value>
344-
</data>
345303
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
346304
<value>Configuración del canal web</value>
347305
</data>
348-
<data name="TrainingGuides.Page.WebChannelSettingsListing.Channel" xml:space="preserve">
349-
<value>Canal</value>
306+
<data name="TrainingGuides.Page.SeoSettingsEdit.Name" xml:space="preserve">
307+
<value>Configuración de SEO</value>
308+
</data>
309+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Name" xml:space="preserve">
310+
<value>Robots.txt</value>
311+
</data>
312+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Explanation" xml:space="preserve">
313+
<value>Ingrese el contenido del archivo Robots.txt</value>
350314
</data>
351315
</root>

‎src/TrainingGuides.Admin/Localization/Resources/fr-FR/custom/LocalizationCustom.fr-FR.resx‎

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -300,52 +300,16 @@
300300
<data name="TrainingGuides.WebsiteChannelSecondary.Name" xml:space="preserve">
301301
<value>Canal web secondaire des guides de formation</value>
302302
</data>
303-
<data name="TrainingGuides.Page.GlobalSettingsListing.Name" xml:space="preserve">
304-
<value>Nom</value>
305-
</data>
306-
<data name="TrainingGuides.Page.GlobalSettingsListing.Value" xml:space="preserve">
307-
<value>Valeur</value>
308-
</data>
309-
<data name="TrainingGuides.Page.GlobalSettingsListing.Note" xml:space="preserve">
310-
<value>Note</value>
311-
</data>
312-
<data name="TrainingGuides.Page.GlobalSettingsListing.Codename" xml:space="preserve">
313-
<value>Nom de code</value>
314-
</data>
315-
<data name="TrainingGuides.Page.GlobalSettingsListing.NewSetting" xml:space="preserve">
316-
<value>Nouveau paramètre</value>
317-
</data>
318-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Name" xml:space="preserve">
319-
<value>Modification de clé de paramètres globaux</value>
320-
</data>
321-
<data name="TrainingGuides.Page.GlobalSettingsCreate.DisplayName" xml:space="preserve">
322-
<value>Nom d&apos;affichage</value>
323-
</data>
324-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Codename" xml:space="preserve">
325-
<value>Nom de code de la clé de paramètres</value>
326-
</data>
327-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Value" xml:space="preserve">
328-
<value>Valeur</value>
329-
</data>
330-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Notes" xml:space="preserve">
331-
<value>Notes</value>
332-
</data>
333-
<data name="TrainingGuides.Page.GlobalSettingsCreate.Notes.ExplanationText" xml:space="preserve">
334-
<value>Expliquez l&apos;objectif de cette clé de paramètres.</value>
335-
</data>
336-
<data name="TrainingGuides.Page.WebChannelSnippetListing.Snippet" xml:space="preserve">
337-
<value>Extrait</value>
338-
</data>
339-
<data name="TrainingGuides.Page.WebChannelSnippetListing.Type" xml:space="preserve">
340-
<value>Type</value>
341-
</data>
342-
<data name="TrainingGuides.Page.WebChannelSnippetListing.NewSnippet" xml:space="preserve">
343-
<value>Nouvel extrait</value>
344-
</data>
345303
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
346304
<value>Paramètres du canal web</value>
347305
</data>
348-
<data name="TrainingGuides.Page.WebChannelSettingsListing.Channel" xml:space="preserve">
349-
<value>Canal</value>
306+
<data name="TrainingGuides.Page.SeoSettingsEdit.Name" xml:space="preserve">
307+
<value>Paramètres SEO</value>
308+
</data>
309+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Name" xml:space="preserve">
310+
<value>Robots.txt</value>
311+
</data>
312+
<data name="TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Explanation" xml:space="preserve">
313+
<value>Saisissez le contenu du fichier Robots.txt</value>
350314
</data>
351315
</root>

‎src/TrainingGuides.Admin/Pages/ProjectSettings/GlobalSettings/GlobalSettingsListingPage.cs‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using CMS.Core;
21
using CMS.Membership;
32
using Kentico.Xperience.Admin.Base;
43
using TrainingGuides.Admin.ProjectSettings;
@@ -18,23 +17,17 @@ namespace TrainingGuides.Admin.ProjectSettings.GlobalSettings;
1817

1918
public class GlobalSettingsListingPage : ListingPage
2019
{
21-
private readonly ILocalizationService localizationService;
2220
protected override string ObjectType => GlobalSettingsKeyInfo.OBJECT_TYPE;
2321

24-
public GlobalSettingsListingPage(ILocalizationService localizationService) : base()
25-
{
26-
this.localizationService = localizationService;
27-
}
28-
2922
public override async Task ConfigurePage()
3023
{
3124
PageConfiguration.ColumnConfigurations
32-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyDisplayName), localizationService.GetString("TrainingGuides.Page.GlobalSettingsListing.Name"))
33-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyValue), localizationService.GetString("TrainingGuides.Page.GlobalSettingsListing.Value"))
34-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyNote), localizationService.GetString("TrainingGuides.Page.GlobalSettingsListing.Note"))
35-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyName), localizationService.GetString("TrainingGuides.Page.GlobalSettingsListing.Codename"));
25+
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyDisplayName), "Name")
26+
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyValue), "Value")
27+
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyNote), "Note")
28+
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyName), "Codename");
3629

37-
PageConfiguration.HeaderActions.AddLink<GlobalSettingsCreatePage>(localizationService.GetString("TrainingGuides.Page.GlobalSettingsListing.NewSetting"));
30+
PageConfiguration.HeaderActions.AddLink<GlobalSettingsCreatePage>("New setting");
3831

3932
PageConfiguration.AddEditRowAction<GlobalSettingsEditSection>();
4033

‎src/TrainingGuides.Admin/Pages/ProjectSettings/WebChannelSettings/SeoSettingsEditPage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
parentType: typeof(WebChannelSettingsEditSection),
1010
slug: "edit",
1111
uiPageType: typeof(SeoSettingsEditPage),
12-
name: "SEO settings",
12+
name: "{$TrainingGuides.Page.SeoSettingsEdit.Name$}",
1313
templateName: TemplateNames.EDIT,
1414
order: 0)]
1515

‎src/TrainingGuides.Admin/Pages/ProjectSettings/WebChannelSettings/WebChannelSettingsListingPage.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using CMS.ContentEngine;
2-
using CMS.Core;
32
using CMS.DataEngine;
43
using Kentico.Xperience.Admin.Base;
54
using TrainingGuides.Admin.ProjectSettings;
@@ -21,20 +20,17 @@ public class WebChannelSettingsListingPage : ListingPage
2120
private readonly IInfoProvider<ChannelInfo> channelInfoProvider;
2221
private readonly IInfoProvider<WebChannelSettingsInfo> webChannelSettingsInfoProvider;
2322
private readonly IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider;
24-
private readonly ILocalizationService localizationService;
2523

2624
protected override string ObjectType => WebChannelSettingsInfo.OBJECT_TYPE;
2725

2826
public WebChannelSettingsListingPage(
2927
IInfoProvider<ChannelInfo> channelInfoProvider,
3028
IInfoProvider<WebChannelSettingsInfo> webChannelSettingsInfoProvider,
31-
IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider,
32-
ILocalizationService localizationService) : base()
29+
IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider) : base()
3330
{
3431
this.channelInfoProvider = channelInfoProvider;
3532
this.webChannelSettingsInfoProvider = webChannelSettingsInfoProvider;
3633
this.seoSettingsInfoProvider = seoSettingsInfoProvider;
37-
this.localizationService = localizationService;
3834

3935
EnsureSettingsListData();
4036
}
@@ -43,7 +39,7 @@ public override async Task ConfigurePage()
4339
{
4440
PageConfiguration.ColumnConfigurations
4541
.AddColumn(nameof(
46-
WebChannelSettingsInfo.WebChannelSettingsChannelDisplayName), localizationService.GetString("TrainingGuides.Page.WebChannelSettingsListing.Channel"));
42+
WebChannelSettingsInfo.WebChannelSettingsChannelDisplayName), "Channel");
4743

4844
PageConfiguration.AddEditRowAction<WebChannelSettingsEditSection>();
4945

‎src/TrainingGuides.Admin/Pages/ProjectSettings/WebChannelSettings/WebChannelSnippetListingPage.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using CMS.Core;
21
using CMS.DataEngine;
32
using CMS.Membership;
43
using Kentico.Xperience.Admin.Base;
@@ -17,25 +16,19 @@ namespace TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
1716

1817
public class WebChannelSnippetListingPage : ListingPage
1918
{
20-
private readonly ILocalizationService localizationService;
2119
protected override string ObjectType => WebChannelSnippetInfo.OBJECT_TYPE;
2220

2321
[PageParameter(typeof(IntPageModelBinder))]
2422
public int WebChannelSettingsId { get; set; }
2523

26-
public WebChannelSnippetListingPage(ILocalizationService localizationService) : base()
27-
{
28-
this.localizationService = localizationService;
29-
}
30-
3124
public override Task ConfigurePage()
3225
{
3326
PageConfiguration.ColumnConfigurations
34-
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetDisplayName), localizationService.GetString("TrainingGuides.Page.WebChannelSnippetListing.Snippet"))
35-
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetType), localizationService.GetString("TrainingGuides.Page.WebChannelSnippetListing.Type"));
27+
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetDisplayName), "Snippet")
28+
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetType), "Type");
3629

3730
PageConfiguration.HeaderActions.AddLink<WebChannelSnippetCreatePage>(
38-
localizationService.GetString("TrainingGuides.Page.WebChannelSnippetListing.NewSnippet"),
31+
"New snippet",
3932
parameters: new PageParameterValues
4033
{
4134
{ typeof(WebChannelSettingsEditSection), WebChannelSettingsId }

‎src/TrainingGuides.Web/App_Data/CIRepository/@global/cms.alternativeform/cms.class_trainingguides.globalsettingskey/globalsettingskeyedit.xml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
</settings>
1515
<properties>
1616
<explanationtextashtml>False</explanationtextashtml>
17-
<fieldcaption>
18-
<![CDATA[{$TrainingGuides.Page.GlobalSettingsCreate.DisplayName$}]]>
19-
</fieldcaption>
17+
<fieldcaption>Display name</fieldcaption>
2018
<fielddescriptionashtml>False</fielddescriptionashtml>
2119
</properties>
2220
</field>
@@ -26,9 +24,7 @@
2624
</settings>
2725
<properties>
2826
<explanationtextashtml>False</explanationtextashtml>
29-
<fieldcaption>
30-
<![CDATA[{$TrainingGuides.Page.GlobalSettingsCreate.Codename$}]]>
31-
</fieldcaption>
27+
<fieldcaption> Settings key code name</fieldcaption>
3228
<fielddescriptionashtml>False</fielddescriptionashtml>
3329
</properties>
3430
</field>
@@ -41,7 +37,7 @@
4137
</settings>
4238
<properties>
4339
<explanationtextashtml>False</explanationtextashtml>
44-
<fieldcaption>{$TrainingGuides.Page.GlobalSettingsCreate.Value$}</fieldcaption>
40+
<fieldcaption>Value</fieldcaption>
4541
<fielddescriptionashtml>False</fielddescriptionashtml>
4642
</properties>
4743
</field>
@@ -54,16 +50,14 @@
5450
</settings>
5551
<properties>
5652
<explanationtextashtml>False</explanationtextashtml>
57-
<fieldcaption>{$TrainingGuides.Page.GlobalSettingsCreate.Notes$}</fieldcaption>
58-
<fielddescription>
59-
<![CDATA[{$TrainingGuides.Page.GlobalSettingsCreate.Notes.ExplanationText$}]]>
60-
</fielddescription>
53+
<fieldcaption>Notes</fieldcaption>
54+
<fielddescription> Explain the purpose of this settings key.</fielddescription>
6155
<fielddescriptionashtml>False</fielddescriptionashtml>
6256
</properties>
6357
</field>
6458
</form>
6559
</FormDefinition>
66-
<FormDisplayName>{$TrainingGuides.Page.GlobalSettingsCreate.Name$}</FormDisplayName>
60+
<FormDisplayName>Global settings key edit</FormDisplayName>
6761
<FormGUID>03f82fca-3ec0-47ce-b8f1-451874e054ef</FormGUID>
6862
<FormIsCustom>True</FormIsCustom>
6963
<FormName>GlobalSettingsKeyEdit</FormName>

‎src/TrainingGuides.Web/App_Data/CIRepository/@global/cms.alternativeform/cms.class_trainingguides.seosettings/seosettingsedit.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717
<MinRowsNumber>3</MinRowsNumber>
1818
</settings>
1919
<properties>
20-
<explanationtext>Enter the content of the Robots.txt file</explanationtext>
20+
<explanationtext>
21+
<![CDATA[{$TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Explanation$}]]>
22+
</explanationtext>
2123
<explanationtextashtml>False</explanationtextashtml>
22-
<fieldcaption>Robots.txt</fieldcaption>
24+
<fieldcaption>
25+
<![CDATA[{$TrainingGuides.Page.SeoSettingsEdit.Form.RobotsField.Name$}]]>
26+
</fieldcaption>
2327
<fielddescriptionashtml>False</fielddescriptionashtml>
2428
</properties>
2529
</field>
2630
<field column="SeoSettingsGUID" guid="da670291-0211-4ffb-8db8-348354c45b66" enabled="" />
2731
</form>
2832
</FormDefinition>
29-
<FormDisplayName>SEO settings edit</FormDisplayName>
33+
<FormDisplayName>{$TrainingGuides.Page.SeoSettingsEdit.Form.Name$}</FormDisplayName>
3034
<FormGUID>e32c1af1-bdc7-497e-a0bc-40f8fd05c2f8</FormGUID>
3135
<FormIsCustom>True</FormIsCustom>
3236
<FormName>SeoSettingsEdit</FormName>

0 commit comments

Comments
 (0)