Skip to content

change static fields to instance fields, and provide static method I18n.t() #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shinji-yoshida wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change static fields to instance fields, and provide static method I18n.t() #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 22 additions & 21 deletions src/I18nUnity/Mgl/I18n.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,18 @@ namespace Mgl
{
public class I18n
{
private static JSONNode translationData = null;

protected static readonly I18n instance = new I18n();

protected static string[] locales = new string[] { "en-US", "fr-FR", "es-ES" };

private static string _currentLocale = "en-US";

private static string _localePath = "Locales/";

private static bool _isLoggingMissing = true;
static I18n instance = new I18n();
private JSONNode translationData = null;
protected string[] locales = new string[] { "en-US", "fr-FR", "es-ES" };
private string _currentLocale = "en-US";
private string _localePath = "Locales/";
private bool _isLoggingMissing = true;

static I18n()
{

}

protected I18n()
{
}

public static I18n Instance
{
get
Expand All @@ -36,7 +27,12 @@ public static I18n Instance
}
}

static void InitConfig()
public static void Reset(I18n newInstance)
{
instance = newInstance;
}

void InitConfig()
{
if (locales.Contains(_currentLocale))
{
Expand All @@ -53,20 +49,20 @@ static void InitConfig()

public static string GetLocale()
{
return _currentLocale;
return instance._currentLocale;
}

public static void SetLocale(string newLocale = null)
{
Configure (newLocale: newLocale);
instance.Configure (newLocale: newLocale);
}

public static void SetPath(string localePath = null)
{
Configure (localePath: localePath);
instance.Configure (localePath: localePath);
}

public static void Configure(string localePath = null, string newLocale = null, bool? logMissing = null, string[] locales = null)
public void Configure(string localePath = null, string newLocale = null, bool? logMissing = null, string[] locales = null)
{
if (localePath != null) {
_localePath = localePath;
Expand All @@ -78,11 +74,16 @@ public static void Configure(string localePath = null, string newLocale = null,
_isLoggingMissing = logMissing.Value;
}
if (locales != null) {
I18n.locales = (string[])locales.Clone ();
this.locales = (string[])locales.Clone ();
}
InitConfig();
}

public static string t(string key, params object[] args)
{
return instance.__ (key, args);
}

public string __(string key, params object[] args)
{
if (translationData == null)
Expand Down
6 changes: 3 additions & 3 deletions src/I18nUnity/Mgl/I18nTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class I18nTest
public void Init()
{
I18n i18n = I18n.Instance;
I18n.Configure(localePath: "Locales/", newLocale: "en-US", logMissing: true, locales: new string[] { "en-US", "fr-FR", "es-ES" });
I18n.Instance.Configure(localePath: "Locales/", newLocale: "en-US", logMissing: true, locales: new string[] { "en-US", "fr-FR", "es-ES" });
}


Expand All @@ -31,7 +31,7 @@ public void TestLocale()
public void TestConfigureLocale()
{
I18n i18n = I18n.Instance;
I18n.Configure("Locales/", "fr-FR");
I18n.Instance.Configure("Locales/", "fr-FR");
Assert.AreEqual("fr-FR", I18n.GetLocale());
}

Expand All @@ -49,7 +49,7 @@ public void TestSetLocale()
public void TestConfigureLocales()
{
I18n i18n = I18n.Instance;
I18n.Configure (newLocale: "de-DE", locales: new string[] { "en-US", "de-DE" });
I18n.Instance.Configure (newLocale: "de-DE", locales: new string[] { "en-US", "de-DE" });
Assert.AreEqual("de-DE", I18n.GetLocale());
Assert.AreEqual("Hallo", i18n.__ ("Hello"));
}
Expand Down