Skip to content
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

fix initialization of EnglishLanguage #3

Open
wants to merge 2 commits into
base: pe
Choose a base branch
from
Open

fix initialization of EnglishLanguage #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e11e92
fix initialization of EnglishLanguage
cc004 Oct 6, 2019
cdaed61
fix compilation issues
cc004 Oct 6, 2019
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
54 changes: 19 additions & 35 deletions TShockAPI/Localization/EnglishLanguage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Terraria;
using Terraria.Localization;
using System.Reflection;


namespace TShockAPI.Localization
{
Expand All @@ -37,40 +39,22 @@ public static class EnglishLanguage

internal static void Initialize()
{
// var culture = Language.ActiveCulture;
//
// var skip = culture == GameCulture.FromCultureName(GameCulture.CultureName.English);
//
// try
// {
// if (!skip)
// {
// LanguageManager.Instance.SetLanguage(GameCulture.FromCultureName(GameCulture.CultureName.English));
// }
//
// for (var i = -48; i < Main.maxItemTypes; i++)
// {
// ItemNames.Add(i, Lang.GetItemNameValue(i));
// }
//
// for (var i = -17; i < Main.maxNPCTypes; i++)
// {
// NpcNames.Add(i, Lang.GetNPCNameValue(i));
// }
//
// foreach (var field in typeof(Main).Assembly.GetType("Terraria.ID.PrefixID")
// .GetFields().Where(f => !f.Name.Equals("Count", StringComparison.Ordinal)))
// {
// Prefixs.Add((int) field.GetValue(null), field.Name);
// }
// }
// finally
// {
// if (!skip)
// {
// LanguageManager.Instance.SetLanguage(culture);
// }
// }
LanguageManager.Instance.SetLanguage("en-US");
Lang.InitializeLegacyLocalization();
for (int i = -48; i < 3930; i++)
{
EnglishLanguage.ItemNames.Add(i, Lang.GetItemNameValue(i));
}
for (int j = -17; j < 580; j++)
{
EnglishLanguage.NpcNames.Add(j, Lang.GetNPCNameValue(j));
}
foreach (FieldInfo fieldInfo in typeof(Main).Assembly.GetType("Terraria.ID.PrefixID").GetFields())
if (!fieldInfo.Name.Equals("Count", StringComparison.Ordinal))
{
EnglishLanguage.Prefixs.Add((int)fieldInfo.GetValue(null), fieldInfo.Name);
}

}

/// <summary>
Expand Down