Skip to content

Commit

Permalink
Merge pull request #33 from Axemasta/mutliple-providers
Browse files Browse the repository at this point in the history 
Properly Support Multiple File Types
  • Loading branch information
@Axemasta
Axemasta authored Sep 21, 2023
2 parents eb85cfe + eabd25c commit 853d428
Show file tree
Hide file tree
Showing 38 changed files with 1,068 additions and 206 deletions.
135 changes: 135 additions & 0 deletions samples/Locales/AppResources.en-GB.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CurrentLocaleName" xml:space="preserve">
<value>English</value>
</data>
<data name="LocalizationCurrentProviderIs" xml:space="preserve">
<value>GR_The current localization provider is:</value>
</data>
<data name="LocalizationProviderName" xml:space="preserve">
<value>GR_Resx</value>
</data>
<data name="MocaleDescription" xml:space="preserve">
<value>GR_Localization framework for .NET Maui</value>
</data>
<data name="MocaleTitle" xml:space="preserve">
<value>GR_Mocale</value>
</data>
</root>
135 changes: 135 additions & 0 deletions samples/Locales/AppResources.fr-FR.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CurrentLocaleName" xml:space="preserve">
<value>French</value>
</data>
<data name="LocalizationCurrentProviderIs" xml:space="preserve">
<value>GR_Le fournisseur de localisation actuel est:</value>
</data>
<data name="LocalizationProviderName" xml:space="preserve">
<value>GR_Resx</value>
</data>
<data name="MocaleDescription" xml:space="preserve">
<value>GR_Framework de localisation pour .NET Maui</value>
</data>
<data name="MocaleTitle" xml:space="preserve">
<value>GR_Mocale</value>
</data>
</root>
27 changes: 20 additions & 7 deletions samples/Mocale.Samples/MauiProgram.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Globalization;
using Microsoft.Extensions.Logging;
using Mocale.Cache.SQLite;
using Mocale.Models;
using Mocale.Providers.GitHub.Raw;
using Mocale.Samples.ViewModels;
using Mocale.Samples.Views;
Expand All @@ -22,20 +23,32 @@ public static MauiApp CreateMauiApp()
})
.UseSqliteCache(config =>
{
config.UpdateInterval = TimeSpan.FromDays(7);
config.UpdateInterval = TimeSpan.FromDays(1);
})
.UseEmbeddedResources(config =>
{
config.ResourcesPath = "Locales";
config.ResourcesAssembly = typeof(App).Assembly;
})
//.UseGitHubRaw(config =>
//{
// config.Username = "Axemasta";
// config.Repository = "Mocale";
// config.Branch = "main";
// config.LocaleDirectory = "samples/Locales/";
// config.ResourceFileDetails = new ResxResourceFileDetails()
// {
// ResourcePrefix = "AppResources",
// };
//});
.UseGitHubRaw(config =>
{
config.Username = "Axemasta";
config.Repository = "Mocale";
config.Branch = "main";
config.LocaleDirectory = "samples/Locales/";
});
{
config.Username = "Axemasta";
config.Repository = "Mocale";
config.Branch = "main";
config.LocaleDirectory = "samples/Locales/";
config.ResourceFileDetails = new JsonResourceFileDetails();
});
})
.ConfigureFonts(fonts =>
{
Expand Down
4 changes: 3 additions & 1 deletion src/Mocale.Providers.AWS.S3/Abstractions/IBucketConfig.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using Mocale.Abstractions;

namespace Mocale.Providers.AWS.S3.Abstractions;

public interface IBucketConfig
public interface IBucketConfig : IExternalProviderConfiguration
{
/// <summary>
/// Uri for the blob container
Expand Down
4 changes: 2 additions & 2 deletions src/Mocale.Providers.AWS.S3/MocaleBuilderExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ public static class MocaleBuilderExtension
{
public static MocaleBuilder UseS3Bucket(this MocaleBuilder builder, Action<BucketConfig> configureBucket)
{
builder.RegisterExternalProvider(typeof(S3BucketProvider));

var config = new BucketConfig();
configureBucket(config);

builder.RegisterExternalProvider<IBucketConfig>(typeof(S3BucketProvider), config);

var configurationManager = new ConfigurationManager<IBucketConfig>(config);

builder.AppBuilder.Services.AddSingleton<IConfigurationManager<IBucketConfig>>(configurationManager);
Expand Down
3 changes: 3 additions & 0 deletions src/Mocale.Providers.AWS.S3/Models/BucketConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ namespace Mocale.Providers.AWS.S3.Models;
public class BucketConfig : IBucketConfig
{
public Uri? BucketUri { get; set; }

/// <inheritdoc/>
public IResourceFileDetails ResourceFileDetails { get; set; } = new JsonResourceFileDetails();
}
2 changes: 2 additions & 0 deletions src/Mocale.Providers.AWS.S3/Properties/GlobalUsings.cs
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
global using Mocale.Providers.AWS.S3.Abstractions;
global using Mocale.Providers.AWS.S3.Models;
global using Mocale.Abstractions;
global using Mocale.Models;
2 changes: 1 addition & 1 deletion src/Mocale.Providers.Azure.Blob/Abstractions/IBlobStorageConfig.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Mocale.Providers.Azure.Blob.Abstractions;

public interface IBlobStorageConfig : IExternalConfiguration
public interface IBlobStorageConfig : IExternalProviderConfiguration
{
/// <summary>
/// Uri for the blob container
Expand Down
Loading

0 comments on commit 853d428

Please sign in to comment.