Skip to content

Commit e269ea4

Browse files
dominikag2dominikag2
committed
GH-158 :: replace IStringLocalizer with ILocalizationService in custom UI pages
1 parent 0dfbae8 commit e269ea4

File tree

11 files changed

+144
-28
lines changed

11 files changed

+144
-28
lines changed

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,34 @@
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>
191+
</data>
192+
<data name="TrainingGuides.Page.GlobalSettingsListing.Value" xml:space="preserve">
193+
<value>Value</value>
194+
</data>
195+
<data name="TrainingGuides.Page.GlobalSettingsListing.Note" xml:space="preserve">
196+
<value>Note</value>
197+
</data>
198+
<data name="TrainingGuides.Page.GlobalSettingsListing.Codename" xml:space="preserve">
199+
<value>Codename</value>
200+
</data>
201+
<data name="TrainingGuides.Page.GlobalSettingsListing.NewSetting" xml:space="preserve">
202+
<value>New setting</value>
203+
</data>
204+
<data name="TrainingGuides.Page.WebChannelSnippetListing.Snippet" xml:space="preserve">
205+
<value>Snippet</value>
206+
</data>
207+
<data name="TrainingGuides.Page.WebChannelSnippetListing.Type" xml:space="preserve">
208+
<value>Type</value>
209+
</data>
210+
<data name="TrainingGuides.Page.WebChannelSnippetListing.NewSnippet" xml:space="preserve">
211+
<value>New snippet</value>
212+
</data>
213+
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
214+
<value>Web channel settings</value>
215+
</data>
216+
<data name="TrainingGuides.Page.WebChannelSettingsListing.Channel" xml:space="preserve">
217+
<value>Channel</value>
218+
</data>
189219
</root>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,34 @@
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.WebChannelSnippetListing.Snippet" xml:space="preserve">
319+
<value>Fragmento</value>
320+
</data>
321+
<data name="TrainingGuides.Page.WebChannelSnippetListing.Type" xml:space="preserve">
322+
<value>Tipo</value>
323+
</data>
324+
<data name="TrainingGuides.Page.WebChannelSnippetListing.NewSnippet" xml:space="preserve">
325+
<value>Nuevo fragmento</value>
326+
</data>
327+
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
328+
<value>Configuración del canal web</value>
329+
</data>
330+
<data name="TrainingGuides.Page.WebChannelSettingsListing.Channel" xml:space="preserve">
331+
<value>Canal</value>
332+
</data>
303333
</root>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,34 @@
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.WebChannelSnippetListing.Snippet" xml:space="preserve">
319+
<value>Extrait</value>
320+
</data>
321+
<data name="TrainingGuides.Page.WebChannelSnippetListing.Type" xml:space="preserve">
322+
<value>Type</value>
323+
</data>
324+
<data name="TrainingGuides.Page.WebChannelSnippetListing.NewSnippet" xml:space="preserve">
325+
<value>Nouvel extrait</value>
326+
</data>
327+
<data name="TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings" xml:space="preserve">
328+
<value>Paramètres du canal web</value>
329+
</data>
330+
<data name="TrainingGuides.Page.WebChannelSettingsListing.Channel" xml:space="preserve">
331+
<value>Canal</value>
332+
</data>
303333
</root>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
using CMS.Core;
12
using CMS.Membership;
23
using Kentico.Xperience.Admin.Base;
3-
using Microsoft.Extensions.Localization;
44
using TrainingGuides.Admin.ProjectSettings;
55
using TrainingGuides.Admin.ProjectSettings.GlobalSettings;
66
using TrainingGuides.ProjectSettings;
@@ -18,23 +18,23 @@ namespace TrainingGuides.Admin.ProjectSettings.GlobalSettings;
1818

1919
public class GlobalSettingsListingPage : ListingPage
2020
{
21-
private readonly IStringLocalizer<SharedResources> stringLocalizer;
21+
private readonly ILocalizationService localizationService;
2222
protected override string ObjectType => GlobalSettingsKeyInfo.OBJECT_TYPE;
2323

24-
public GlobalSettingsListingPage(IStringLocalizer<SharedResources> stringLocalizer) : base()
24+
public GlobalSettingsListingPage(ILocalizationService localizationService) : base()
2525
{
26-
this.stringLocalizer = stringLocalizer;
26+
this.localizationService = localizationService;
2727
}
2828

2929
public override async Task ConfigurePage()
3030
{
3131
PageConfiguration.ColumnConfigurations
32-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyDisplayName), stringLocalizer["Name"])
33-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyValue), stringLocalizer["Value"])
34-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyNote), stringLocalizer["Note"])
35-
.AddColumn(nameof(GlobalSettingsKeyInfo.GlobalSettingsKeyName), stringLocalizer["Codename"]);
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"));
3636

37-
PageConfiguration.HeaderActions.AddLink<GlobalSettingsCreatePage>(stringLocalizer["New setting"]);
37+
PageConfiguration.HeaderActions.AddLink<GlobalSettingsCreatePage>(localizationService.GetString("TrainingGuides.Page.GlobalSettingsListing.NewSetting"));
3838

3939
PageConfiguration.AddEditRowAction<GlobalSettingsEditSection>();
4040

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
using CMS.Core;
12
using CMS.DataEngine;
23
using Kentico.Xperience.Admin.Base;
34
using Kentico.Xperience.Admin.Base.Forms;
4-
using Microsoft.Extensions.Localization;
55
using TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
66
using TrainingGuides.ProjectSettings;
77

@@ -19,14 +19,14 @@ public class SeoSettingsEditPage : InfoEditPage<SeoSettingsInfo>
1919
{
2020
private readonly IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider;
2121
private readonly IInfoProvider<WebChannelSettingsInfo> webChannelSettingsInfoProvider;
22-
private readonly IStringLocalizer<SharedResources> stringLocalizer;
22+
private readonly ILocalizationService localizationService;
2323

2424
private string WebChannelSettingsDisplayName =>
2525
webChannelSettingsInfoProvider
2626
.Get()
2727
.WhereEquals(nameof(WebChannelSettingsInfo.WebChannelSettingsID), WebChannelSettingsId)
2828
.FirstOrDefault()?
29-
.WebChannelSettingsChannelDisplayName ?? stringLocalizer["Web channel settings"];
29+
.WebChannelSettingsChannelDisplayName ?? localizationService.GetString("TrainingGuides.Page.SeoSettingsEdit.WebChannelSettings");
3030

3131
[PageParameter(typeof(IntPageModelBinder))]
3232
public int WebChannelSettingsId { get; set; }
@@ -47,12 +47,12 @@ public SeoSettingsEditPage(IFormComponentMapper formComponentMapper,
4747
IFormDataBinder formDataBinder,
4848
IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider,
4949
IInfoProvider<WebChannelSettingsInfo> webChannelSettingsInfoProvider,
50-
IStringLocalizer<SharedResources> stringLocalizer)
50+
ILocalizationService localizationService)
5151
: base(formComponentMapper, formDataBinder)
5252
{
5353
this.seoSettingsInfoProvider = seoSettingsInfoProvider;
5454
this.webChannelSettingsInfoProvider = webChannelSettingsInfoProvider;
55-
this.stringLocalizer = stringLocalizer;
55+
this.localizationService = localizationService;
5656
}
5757

5858
public override Task ConfigurePage()

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using CMS.ContentEngine;
2+
using CMS.Core;
23
using CMS.DataEngine;
34
using Kentico.Xperience.Admin.Base;
4-
using Microsoft.Extensions.Localization;
55
using TrainingGuides.Admin.ProjectSettings;
66
using TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
77
using TrainingGuides.ProjectSettings;
@@ -15,25 +15,26 @@
1515
order: 0)]
1616

1717
namespace TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
18+
1819
public class WebChannelSettingsListingPage : ListingPage
1920
{
2021
private readonly IInfoProvider<ChannelInfo> channelInfoProvider;
2122
private readonly IInfoProvider<WebChannelSettingsInfo> webChannelSettingsInfoProvider;
2223
private readonly IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider;
23-
private readonly IStringLocalizer<SharedResources> stringLocalizer;
24+
private readonly ILocalizationService localizationService;
2425

2526
protected override string ObjectType => WebChannelSettingsInfo.OBJECT_TYPE;
2627

2728
public WebChannelSettingsListingPage(
2829
IInfoProvider<ChannelInfo> channelInfoProvider,
2930
IInfoProvider<WebChannelSettingsInfo> webChannelSettingsInfoProvider,
3031
IInfoProvider<SeoSettingsInfo> seoSettingsInfoProvider,
31-
IStringLocalizer<SharedResources> stringLocalizer) : base()
32+
ILocalizationService localizationService) : base()
3233
{
3334
this.channelInfoProvider = channelInfoProvider;
3435
this.webChannelSettingsInfoProvider = webChannelSettingsInfoProvider;
3536
this.seoSettingsInfoProvider = seoSettingsInfoProvider;
36-
this.stringLocalizer = stringLocalizer;
37+
this.localizationService = localizationService;
3738

3839
EnsureSettingsListData();
3940
}
@@ -42,7 +43,7 @@ public override async Task ConfigurePage()
4243
{
4344
PageConfiguration.ColumnConfigurations
4445
.AddColumn(nameof(
45-
WebChannelSettingsInfo.WebChannelSettingsChannelDisplayName), stringLocalizer["Channel"]);
46+
WebChannelSettingsInfo.WebChannelSettingsChannelDisplayName), localizationService.GetString("TrainingGuides.Page.WebChannelSettingsListing.Channel"));
4647

4748
PageConfiguration.AddEditRowAction<WebChannelSettingsEditSection>();
4849

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
using CMS.Core;
12
using CMS.DataEngine;
23
using CMS.Membership;
34
using Kentico.Xperience.Admin.Base;
4-
using Microsoft.Extensions.Localization;
55
using TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
66
using TrainingGuides.ProjectSettings;
77

@@ -14,27 +14,28 @@
1414
order: 10)]
1515

1616
namespace TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
17+
1718
public class WebChannelSnippetListingPage : ListingPage
1819
{
19-
private readonly IStringLocalizer<SharedResources> stringLocalizer;
20+
private readonly ILocalizationService localizationService;
2021
protected override string ObjectType => WebChannelSnippetInfo.OBJECT_TYPE;
2122

2223
[PageParameter(typeof(IntPageModelBinder))]
2324
public int WebChannelSettingsId { get; set; }
2425

25-
public WebChannelSnippetListingPage(IStringLocalizer<SharedResources> stringLocalizer) : base()
26+
public WebChannelSnippetListingPage(ILocalizationService localizationService) : base()
2627
{
27-
this.stringLocalizer = stringLocalizer;
28+
this.localizationService = localizationService;
2829
}
2930

3031
public override Task ConfigurePage()
3132
{
3233
PageConfiguration.ColumnConfigurations
33-
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetDisplayName), stringLocalizer["Snippet"])
34-
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetType), stringLocalizer["Type"]);
34+
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetDisplayName), localizationService.GetString("TrainingGuides.Page.WebChannelSnippetListing.Snippet"))
35+
.AddColumn(nameof(WebChannelSnippetInfo.WebChannelSnippetType), localizationService.GetString("TrainingGuides.Page.WebChannelSnippetListing.Type"));
3536

3637
PageConfiguration.HeaderActions.AddLink<WebChannelSnippetCreatePage>(
37-
stringLocalizer["New snippet"],
38+
localizationService.GetString("TrainingGuides.Page.WebChannelSnippetListing.NewSnippet"),
3839
parameters: new PageParameterValues
3940
{
4041
{ typeof(WebChannelSettingsEditSection), WebChannelSettingsId }

‎src/TrainingGuides.Web/App_Data/CIRepository/TrainingGuidesEmails/trainingguides.seosettings/trainingguidesemai..-a49c-a4b8bbcfded0@3eef97aacb/3834c3c1-c124-42aa-a1d5-aa5d80e199ae.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<trainingguides.seosettings>
3+
<SeoSettingsGUID>3834c3c1-c124-42aa-a1d5-aa5d80e199ae</SeoSettingsGUID>
4+
<SeoSettingsRobots />
5+
<SeoSettingsWebChannelSettingID>
6+
<GUID>fb9c14e1-0c02-4257-a49c-a4b8bbcfded0</GUID>
7+
<ObjectType>trainingguides.webchannelsettings</ObjectType>
8+
<Parent>
9+
<CodeName>TrainingGuidesEmails</CodeName>
10+
<GUID>49e862ef-2963-49ef-a1f4-f209a01d8fc6</GUID>
11+
<ObjectType>cms.channel</ObjectType>
12+
</Parent>
13+
</SeoSettingsWebChannelSettingID>
14+
</trainingguides.seosettings>

‎src/TrainingGuides.Web/App_Data/CIRepository/TrainingGuidesEmails/trainingguides.webchannelsettings/trainingguidesemails@1dfad374f2/fb9c14e1-0c02-4257-a49c-a4b8bbcfded0.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<trainingguides.webchannelsettings>
3+
<WebChannelSettingsChannelDisplayName>{$TrainingGuides.EmailChannel.Name$}</WebChannelSettingsChannelDisplayName>
4+
<WebChannelSettingsChannelID>
5+
<CodeName>TrainingGuidesEmails</CodeName>
6+
<GUID>49e862ef-2963-49ef-a1f4-f209a01d8fc6</GUID>
7+
<ObjectType>cms.channel</ObjectType>
8+
</WebChannelSettingsChannelID>
9+
<WebChannelSettingsGUID>fb9c14e1-0c02-4257-a49c-a4b8bbcfded0</WebChannelSettingsGUID>
10+
</trainingguides.webchannelsettings>

‎src/TrainingGuides.Web/App_Data/CIRepository/TrainingGuidesPages/trainingguides.webchannelsettings/trainingguidespages@a8001705cf/9a1b8d71-d961-4553-8f89-1ac59729a9d3.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<trainingguides.webchannelsettings>
3-
<WebChannelSettingsChannelDisplayName>Training guides pages</WebChannelSettingsChannelDisplayName>
3+
<WebChannelSettingsChannelDisplayName>{$TrainingGuides.WebsiteChannelMain.Name$}</WebChannelSettingsChannelDisplayName>
44
<WebChannelSettingsChannelID>
55
<CodeName>TrainingGuidesPages</CodeName>
66
<GUID>5ba9c1e8-b61e-4570-b666-87a9b92bbe3b</GUID>

0 commit comments

Comments
 (0)