From 3e89c6e7d4fb821ef0d8f806622dbb83b5cbac7a Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andy.xyz>
Date: Mon, 15 Jul 2024 21:19:48 -0400
Subject: [PATCH] Move to embed.FS so we automatically include all

---
 cmd/fyneterm/main.go                          | 12 +++---
 cmd/fyneterm/translation.go                   | 37 -------------------
 .../fyneterm/translation}/active.en.json      |  0
 .../fyneterm/translation}/active.fr.json      |  0
 .../fyneterm/translation}/active.pt_BR.json   |  0
 .../fyneterm/translation}/active.ru.json      |  0
 .../fyneterm/translation}/active.sk.json      |  0
 .../fyneterm/translation}/active.uk.json      |  0
 8 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 cmd/fyneterm/translation.go
 rename {translation => cmd/fyneterm/translation}/active.en.json (100%)
 rename {translation => cmd/fyneterm/translation}/active.fr.json (100%)
 rename {translation => cmd/fyneterm/translation}/active.pt_BR.json (100%)
 rename {translation => cmd/fyneterm/translation}/active.ru.json (100%)
 rename {translation => cmd/fyneterm/translation}/active.sk.json (100%)
 rename {translation => cmd/fyneterm/translation}/active.uk.json (100%)

diff --git a/cmd/fyneterm/main.go b/cmd/fyneterm/main.go
index 1f721f92..16600f21 100644
--- a/cmd/fyneterm/main.go
+++ b/cmd/fyneterm/main.go
@@ -1,8 +1,7 @@
-//go:generate fyne bundle -o translation.go ../../translation/
-
 package main
 
 import (
+	"embed"
 	"flag"
 	"image/color"
 
@@ -21,6 +20,9 @@ const termOverlay = fyne.ThemeColorName("termOver")
 
 var sizer *termTheme
 
+//go:embed translation
+var translations embed.FS
+
 func setupListener(t *terminal.Terminal, w fyne.Window) {
 	listen := make(chan terminal.Config)
 	go func() {
@@ -53,11 +55,7 @@ func main() {
 	flag.BoolVar(&debug, "debug", false, "Show terminal debug messages")
 	flag.Parse()
 
-	lang.AddTranslations(resourceActiveEnJson)
-	lang.AddTranslations(resourceActiveFrJson)
-	lang.AddTranslations(resourceActiveRuJson)
-	lang.AddTranslations(resourceActiveSkJson)
-	lang.AddTranslations(resourceActiveUkJson)
+	lang.AddTranslationsFS(translations, "translation")
 
 	a := app.New()
 	a.SetIcon(data.Icon)
diff --git a/cmd/fyneterm/translation.go b/cmd/fyneterm/translation.go
deleted file mode 100644
index 133db167..00000000
--- a/cmd/fyneterm/translation.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// auto-generated
-// Code generated by '$ fyne bundle'. DO NOT EDIT.
-
-package main
-
-import "fyne.io/fyne/v2"
-
-var resourceActiveEnJson = &fyne.StaticResource{
-	StaticName: "active.en.json",
-	StaticContent: []byte(
-		"{\n  \"Title\": \"Fyne Terminal\"\n}\n"),
-}
-var resourceActiveFrJson = &fyne.StaticResource{
-	StaticName: "active.fr.json",
-	StaticContent: []byte(
-		"{\n  \"Title\": \"Fyne Terminale\"\n}\n"),
-}
-var resourceActivePtBRJson = &fyne.StaticResource{
-	StaticName: "active.pt_BR.json",
-	StaticContent: []byte(
-		"{\n    \"Title\": \"Fyne Terminal\"\n}\n"),
-}
-var resourceActiveRuJson = &fyne.StaticResource{
-	StaticName: "active.ru.json",
-	StaticContent: []byte(
-		"{\n  \"Title\": \"Fyne Терминал\"\n}\n"),
-}
-var resourceActiveSkJson = &fyne.StaticResource{
-	StaticName: "active.sk.json",
-	StaticContent: []byte(
-		"{\n    \"Title\": \"Fyne Terminál\"\n}\n"),
-}
-var resourceActiveUkJson = &fyne.StaticResource{
-	StaticName: "active.uk.json",
-	StaticContent: []byte(
-		"{\n    \"Title\": \"Термінал Fyne\"\n}\n"),
-}
diff --git a/translation/active.en.json b/cmd/fyneterm/translation/active.en.json
similarity index 100%
rename from translation/active.en.json
rename to cmd/fyneterm/translation/active.en.json
diff --git a/translation/active.fr.json b/cmd/fyneterm/translation/active.fr.json
similarity index 100%
rename from translation/active.fr.json
rename to cmd/fyneterm/translation/active.fr.json
diff --git a/translation/active.pt_BR.json b/cmd/fyneterm/translation/active.pt_BR.json
similarity index 100%
rename from translation/active.pt_BR.json
rename to cmd/fyneterm/translation/active.pt_BR.json
diff --git a/translation/active.ru.json b/cmd/fyneterm/translation/active.ru.json
similarity index 100%
rename from translation/active.ru.json
rename to cmd/fyneterm/translation/active.ru.json
diff --git a/translation/active.sk.json b/cmd/fyneterm/translation/active.sk.json
similarity index 100%
rename from translation/active.sk.json
rename to cmd/fyneterm/translation/active.sk.json
diff --git a/translation/active.uk.json b/cmd/fyneterm/translation/active.uk.json
similarity index 100%
rename from translation/active.uk.json
rename to cmd/fyneterm/translation/active.uk.json