Move to embed.FS so we automatically include all

fyne-io · Jul 16, 2024 · 3e89c6e · 3e89c6e
1 parent 25a0868
commit 3e89c6e
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 44 deletions.
diff --git 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
diff --git a/translation/active.en.json → cmd/fyneterm/translation/active.en.json b/translation/active.en.json → cmd/fyneterm/translation/active.en.json
diff --git a/translation/active.fr.json → cmd/fyneterm/translation/active.fr.json b/translation/active.fr.json → cmd/fyneterm/translation/active.fr.json
diff --git a/translation/active.pt_BR.json → cmd/fyneterm/translation/active.pt_BR.json b/translation/active.pt_BR.json → cmd/fyneterm/translation/active.pt_BR.json
diff --git a/translation/active.ru.json → cmd/fyneterm/translation/active.ru.json b/translation/active.ru.json → cmd/fyneterm/translation/active.ru.json
diff --git a/translation/active.sk.json → cmd/fyneterm/translation/active.sk.json b/translation/active.sk.json → cmd/fyneterm/translation/active.sk.json
diff --git a/translation/active.uk.json → cmd/fyneterm/translation/active.uk.json b/translation/active.uk.json → cmd/fyneterm/translation/active.uk.json