Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>
22 changes: 22 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project>
<PropertyGroup>
<MicrosoftVersion>8.0.0</MicrosoftVersion>
<LanguageVersion>12</LanguageVersion>
<PackageFrameworkVersions>netstandard2.1</PackageFrameworkVersions>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup Label="Microsoft">
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftVersion)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftVersion)" />
</ItemGroup>
<ItemGroup Label="Testing">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="xunit" Version="2.7.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageVersion Include="coverlet.collector" Version="6.0.2"/>
</ItemGroup>
</Project>
12 changes: 10 additions & 2 deletions Insight.Localizer.sln → Lclzr.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Insight.Localizer", "src\Insight.Localizer\Insight.Localizer.csproj", "{192A4E10-2498-409B-A537-F27150C31C1C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lclzr", "src\Lclzr\Lclzr.csproj", "{192A4E10-2498-409B-A537-F27150C31C1C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Insight.Localizer.Tests", "tests\Insight.Localizer.Tests\Insight.Localizer.Tests.csproj", "{C8EDC5BA-AA36-44C6-A4D5-E45695EF5867}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lclzr.Tests", "tests\Lclzr.Tests\Lclzr.Tests.csproj", "{C8EDC5BA-AA36-44C6-A4D5-E45695EF5867}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{7C43D58B-6E27-40AC-B59E-D9FE1AB66DB3}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -11,8 +11,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
.github\workflows\publish.yml = .github\workflows\publish.yml
.gitignore = .gitignore
README.md = README.md
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lclzr.Extensions", "src\Lclzr.Extensions\Lclzr.Extensions.csproj", "{91FBA765-5291-4A11-9A55-7E4B932E3F7A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -27,5 +31,9 @@ Global
{C8EDC5BA-AA36-44C6-A4D5-E45695EF5867}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8EDC5BA-AA36-44C6-A4D5-E45695EF5867}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8EDC5BA-AA36-44C6-A4D5-E45695EF5867}.Release|Any CPU.Build.0 = Release|Any CPU
{91FBA765-5291-4A11-9A55-7E4B932E3F7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91FBA765-5291-4A11-9A55-7E4B932E3F7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91FBA765-5291-4A11-9A55-7E4B932E3F7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91FBA765-5291-4A11-9A55-7E4B932E3F7A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
22 changes: 0 additions & 22 deletions src/Insight.Localizer/Insight.Localizer.csproj

This file was deleted.

2 changes: 0 additions & 2 deletions src/Insight.Localizer/Insight.Localizer.csproj.DotSettings

This file was deleted.

106 changes: 0 additions & 106 deletions src/Insight.Localizer/Localizer.cs

This file was deleted.

14 changes: 0 additions & 14 deletions src/Insight.Localizer/LocalizerConfiguration.cs

This file was deleted.

3 changes: 3 additions & 0 deletions src/Lclzr.Extensions/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using System.Runtime.CompilerServices;

[assembly:InternalsVisibleTo("Lclzr.Tests")]
17 changes: 17 additions & 0 deletions src/Lclzr.Extensions/Lclzr.Extensions.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Lclzr\Lclzr.csproj" />
</ItemGroup>

</Project>
31 changes: 31 additions & 0 deletions src/Lclzr.Extensions/RegistryInitializerBackgroundService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Lclzr.Infrastructure;
using Lclzr.Registries;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;

namespace Lclzr.Extensions
{
internal class RegistryInitializerBackgroundService : BackgroundService
{
private readonly IServiceProvider _serviceProvider;

public RegistryInitializerBackgroundService(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
}

protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
var registry = _serviceProvider.GetRequiredService<ILocalizerRegistry>();
if (registry is IInitializable initializable)
{
return initializable.Initialize();
}

return Task.CompletedTask;
}
}
}
42 changes: 42 additions & 0 deletions src/Lclzr.Extensions/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
using System;
using Lclzr.Registries;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;

namespace Lclzr.Extensions
{
public static class ServiceCollectionExtensions
{
public static IServiceCollection AddLocalizer(this IServiceCollection services,
Action<LocalizerBuilder> builder)
{
if (services == null)
{
throw new ArgumentNullException(nameof(services));
}

var localizerBuilder = new LocalizerBuilder();
builder.Invoke(localizerBuilder);

foreach (var provider in localizerBuilder.Providers)
{
services.AddSingleton(provider);
}

services.TryAddSingleton<ILocalizerRegistry, LocalizerRegistry>();

Func<IServiceProvider, object> factory = ctx =>
localizerBuilder
.WithRegistry(ctx.GetRequiredService<ILocalizerRegistry>())
.Build();

var descriptor = new ServiceDescriptor(typeof(ILocalizer), factory, ServiceLifetime.Scoped);
services.TryAdd(descriptor);

services.AddScoped(typeof(ILocalizer<>), typeof(Localizer<>));
services.AddHostedService<RegistryInitializerBackgroundService>();

return services;
}
}
}
4 changes: 4 additions & 0 deletions src/Lclzr/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System.Runtime.CompilerServices;

[assembly:InternalsVisibleTo("Lclzr.Tests")]
[assembly:InternalsVisibleTo("Lclzr.Extensions")]
12 changes: 10 additions & 2 deletions src/Insight.Localizer/Block.cs → src/Lclzr/Block.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Lclzr.Exceptions;

namespace Insight.Localizer
namespace Lclzr
{
public sealed class Block
{
public string Name { get; }

public IReadOnlyCollection<string> AvailableCultures =>
new Lazy<IReadOnlyCollection<string>>(() => _localizations.Keys
.ToList()
.AsReadOnly())
.Value;

private readonly IDictionary<string, IDictionary<string, string>> _localizations;

private Block()
{
_localizations = new Dictionary<string, IDictionary<string, string>>(StringComparer.InvariantCultureIgnoreCase);
_localizations = new Dictionary<string, IDictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
}

internal Block(string name) : this()
Expand Down
15 changes: 15 additions & 0 deletions src/Lclzr/Exceptions/LocalizerException.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System;

namespace Lclzr.Exceptions
{
public class LocalizerException : Exception
{
public LocalizerException(string message) : base(message)
{
}

public LocalizerException(string message, Exception inner) : base(message, inner)
{
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Insight.Localizer
namespace Lclzr.Exceptions
{
public class MissingBlockException : Exception
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Insight.Localizer
namespace Lclzr.Exceptions
{
public class MissingLocalizationException : Exception
{
Expand Down
Loading