Skip to content

Commit d7ce229

Browse files
gonultasmfgonultasmf
committed
Merge remote-tracking branch 'origin/152-localization-support-for-localization-with-resx-file-type'
2 parents e210879 + 8cd637c commit d7ce229

File tree

13 files changed

+957
-78
lines changed

13 files changed

+957
-78
lines changed

‎README.md‎

Lines changed: 264 additions & 33 deletions
Large diffs are not rendered by default.

‎sample/MyMauiMarkupApp/MainPage.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System.Globalization;
22
using System.Reflection;
33

4+
using MyMauiMarkupApp.Resources;
5+
46
namespace MyMauiMarkupApp;
57

68
public partial class MainPage : ContentPage, IFmgLibHotReload
@@ -30,13 +32,26 @@ public void Build()
3032
.CenterHorizontal()
3133
.SemanticHeadingLevel(SemanticHeadingLevel.Level1),
3234

35+
new Label()
36+
.Text(e => e.TranslateResx(nameof(AppResources.hello)))
37+
.FontSize(32)
38+
.CenterHorizontal()
39+
.SemanticHeadingLevel(SemanticHeadingLevel.Level1),
40+
3341
new Label()
3442
.Text(e => e.Translate("Msg"))
3543
.FontSize(18)
3644
.CenterHorizontal()
3745
.SemanticDescription(e => e.Translate("Msg"))
3846
.SemanticHeadingLevel(SemanticHeadingLevel.Level1),
3947

48+
new Label()
49+
.Text(e => e.Translate("Msg"))
50+
.FontSize(18)
51+
.CenterHorizontal()
52+
.SemanticDescription(e => e.TranslateResx("Msg"))
53+
.SemanticHeadingLevel(SemanticHeadingLevel.Level1),
54+
4055

4156
new VerticalStackLayout()
4257
.Center()
@@ -47,13 +62,15 @@ public void Build()
4762
.OnCheckedChanged((sender, e) =>
4863
{
4964
Translator.Instance.ChangeCulture(CultureInfo.GetCultureInfo("tr-TR"));
65+
TranslatorResx.Instance.ChangeCulture(CultureInfo.GetCultureInfo("tr-TR"));
5066
}),
5167
new RadioButton()
5268
.IsChecked(Translator.Instance.CurrentCulture.Name == "en-US")
5369
.Content("en-US")
5470
.OnCheckedChanged((sender, e) =>
5571
{
5672
Translator.Instance.ChangeCulture(CultureInfo.GetCultureInfo("en-US"));
73+
TranslatorResx.Instance.ChangeCulture(CultureInfo.GetCultureInfo("en-US"));
5774
})
5875
),
5976

‎sample/MyMauiMarkupApp/MauiProgram.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace MyMauiMarkupApp;
1+
using MyMauiMarkupApp.Resources;
2+
3+
namespace MyMauiMarkupApp;
24

35
public static class MauiProgram
46
{
@@ -8,6 +10,7 @@ public static MauiApp CreateMauiApp()
810
builder
911
.UseMauiApp<App>()
1012
.UseMauiMarkupLocalization("en-US")
13+
.UseMauiMarkupLocalizationWithResx(AppResources.ResourceManager, "en-US")
1114
.ConfigureFonts(fonts =>
1215
{
1316
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

‎sample/MyMauiMarkupApp/MyMauiMarkupApp.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,19 @@
7979
<ProjectReference Include="..\..\src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj" />
8080
</ItemGroup>
8181

82+
<ItemGroup>
83+
<Compile Update="Resources\AppResources.Designer.cs">
84+
<DesignTime>True</DesignTime>
85+
<AutoGen>True</AutoGen>
86+
<DependentUpon>AppResources.resx</DependentUpon>
87+
</Compile>
88+
</ItemGroup>
89+
90+
<ItemGroup>
91+
<EmbeddedResource Update="Resources\AppResources.resx">
92+
<Generator>ResXFileCodeGenerator</Generator>
93+
<LastGenOutput>AppResources.Designer.cs</LastGenOutput>
94+
</EmbeddedResource>
95+
</ItemGroup>
96+
8297
</Project>

‎sample/MyMauiMarkupApp/Resources/AppResources.Designer.cs‎

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

‎sample/MyMauiMarkupApp/Resources/AppResources.TR.resx‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
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="hello" xml:space="preserve">
121+
<value>Merhaba Dünya!</value>
122+
</data>
123+
<data name="Msg" xml:space="preserve">
124+
<value>FmgLib .NET MAUI Markup App hoşgeldiniz</value>
125+
</data>
126+
</root>

0 commit comments

Comments
 (0)