From ae60cc11b91f5994f2230b6eb0da334ad6ec7f45 Mon Sep 17 00:00:00 2001
From: Trevor Slocum <trevor@rocket9labs.com>
Date: Fri, 10 Nov 2023 14:29:49 -0800
Subject: [PATCH] Use 12-hour time format

---
 flags.go             | 2 +-
 flags_web.go         | 2 +-
 game/game.go         | 6 +++---
 game/game_android.go | 2 +-
 main.go              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flags.go b/flags.go
index a467c96..c00f27a 100644
--- a/flags.go
+++ b/flags.go
@@ -41,7 +41,7 @@ func parseFlags() *game.Game {
 		}
 		forceLanguage = &tag
 	}
-	game.LoadLocales(forceLanguage)
+	game.LoadLocale(forceLanguage)
 
 	g := game.NewGame()
 	g.Username = username
diff --git a/flags_web.go b/flags_web.go
index 189ba6b..fdc08b9 100644
--- a/flags_web.go
+++ b/flags_web.go
@@ -16,7 +16,7 @@ func parseFlags() *game.Game {
 			forceLanguage = &tag
 		}
 	}
-	game.LoadLocales(forceLanguage)
+	game.LoadLocale(forceLanguage)
 
 	return game.NewGame()
 }
diff --git a/game/game.go b/game/game.go
index db8aca8..63d1d96 100644
--- a/game/game.go
+++ b/game/game.go
@@ -138,7 +138,7 @@ var (
 )
 
 func l(s string) {
-	m := time.Now().Format("15:04") + " " + s
+	m := time.Now().Format("3:04") + " " + s
 	if statusLogged {
 		_, _ = statusBuffer.Write([]byte("\n" + m))
 		_, _ = floatStatusBuffer.Write([]byte("\n" + m))
@@ -152,7 +152,7 @@ func l(s string) {
 }
 
 func lg(s string) {
-	m := time.Now().Format("15:04") + " " + s
+	m := time.Now().Format("3:04") + " " + s
 	if gameLogged {
 		_, _ = gameBuffer.Write([]byte("\n" + m))
 		scheduleFrame()
@@ -1679,7 +1679,7 @@ func randomizeByteSlice(b [][]byte) {
 	}
 }
 
-func LoadLocales(forceLanguage *language.Tag) error {
+func LoadLocale(forceLanguage *language.Tag) error {
 	entries, err := assetFS.ReadDir("locales")
 	if err != nil {
 		return err
diff --git a/game/game_android.go b/game/game_android.go
index afdf8a1..734d865 100644
--- a/game/game_android.go
+++ b/game/game_android.go
@@ -44,7 +44,7 @@ func init() {
 	if err != nil {
 		return
 	}
-	LoadLocales(&tag)
+	LoadLocale(&tag)
 }
 
 func DefaultLocale() string {
diff --git a/main.go b/main.go
index 7e3fa16..85f9e39 100644
--- a/main.go
+++ b/main.go
@@ -33,7 +33,7 @@ func main() {
 	go func() {
 		scanner := bufio.NewScanner(os.Stdin)
 		for scanner.Scan() {
-			g.Client.Out <- append(scanner.Bytes())
+			g.Client.Out <- append(scanner.Bytes(), '\n')
 		}
 	}()