From defe1b8d94ac9db29135d8d3b1e2b90013c6f7d3 Mon Sep 17 00:00:00 2001
From: CiscOH Bellic <ciscoh.bellic@gmail.com>
Date: Sat, 27 Jul 2024 14:50:51 -0400
Subject: [PATCH] "Removed return statement and newline in enUS.lua, simplified
 locale function in Locale.lua, and commented out locale loading code in
 _bastion.lua"

---
 scripts/Locales/enUS.lua |  2 --
 src/Locale/Locale.lua    | 11 +----------
 src/_bastion.lua         |  4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/scripts/Locales/enUS.lua b/scripts/Locales/enUS.lua
index e372ce4..2a61ba0 100644
--- a/scripts/Locales/enUS.lua
+++ b/scripts/Locales/enUS.lua
@@ -8,5 +8,3 @@ L["Tinkr"] = "Tinkr"
 L["Bastion"] = "Bastion"
 
 Bastion.Locale.SetTable(L)
-
-return L
\ No newline at end of file
diff --git a/src/Locale/Locale.lua b/src/Locale/Locale.lua
index 4cf0056..626ee40 100644
--- a/src/Locale/Locale.lua
+++ b/src/Locale/Locale.lua
@@ -9,13 +9,7 @@ local private = {
     hasNoLocaleTable = false
 }
 
-private.locale = function()
-    local locale = GAME_LOCALE or GetLocale()
-    if locale == "enGB" then
-        locale = "enUS"
-    end
-    return locale
-end
+private.locale = GetLocale()
 
 function Locale.GetTable()
     assert(private.tbl)
@@ -44,7 +38,4 @@ function Locale.SetTable(tbl)
 end
 
 
-
-Locale.SetTable({})
-
 return Locale
diff --git a/src/_bastion.lua b/src/_bastion.lua
index 2ec49b4..d5da534 100644
--- a/src/_bastion.lua
+++ b/src/_bastion.lua
@@ -62,8 +62,8 @@ Bastion.Globals = {}
 ---@type Locale
 Bastion.Locale = Bastion.require("Locale")
 Load("@Locales/")
-Bastion.Locales = {}
-Bastion.Locales.enUS = Bastion:Require("@Locales/enUS")
+-- Bastion.Locales = {}
+-- Bastion.Locales.enUS = Bastion:Require("@Locales/enUS")
 local L = Bastion.Locale.GetTable()
 Bastion.Globals.L = L
 ---@type Environment