Refactor localization system and migrate to Fyne's built-in support

Replaced the `i18n` and `toml` dependencies with Fyne's built-in language system for localization management. Updated the `Localizer` implementation to handle translations using JSON files and embed functionality. Simplified language selection and persisted settings via Fyne's preferences API.
2025-06-01 15:20:33 +05:00
parent d69767f5e9
commit 3241b88158
40 changed files with 917 additions and 1869 deletions
--- a/convertor/view.go
+++ b/convertor/view.go
@@ -7,7 +7,6 @@ import (
 	"fyne.io/fyne/v2/widget"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor/view"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"image/color"
 )

@@ -45,9 +44,7 @@ func NewView(app kernel.AppContract) *View {
 }

 func (v View) Main(formConversion view.ConversionContract) {
-	converterVideoFilesTitle := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "converterVideoFilesTitle",
-	})
+	converterVideoFilesTitle := v.app.GetLocalizerService().GetMessage("converterVideoFilesTitle")
 	v.app.GetWindow().SetContent(widget.NewCard(converterVideoFilesTitle, "", container.NewVScroll(formConversion.GetContent())))
 	formConversion.AfterViewContent()
 }
--- a/convertor/view/conversion.go
+++ b/convertor/view/conversion.go
@@ -12,7 +12,6 @@ import (
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel/encoder"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"image/color"
 	"os"
 	"path/filepath"
@@ -54,14 +53,14 @@ func NewConversion(app kernel.AppContract, formats encoder.ConvertorFormatsContr

 	items := []*widget.FormItem{
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "fileForConversionTitle"}),
+			Text:   app.GetLocalizerService().GetMessage("fileForConversionTitle"),
 			Widget: fileForConversion.button,
 		},
 		{
 			Widget: container.NewHScroll(fileForConversion.message),
 		},
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "buttonForSelectedDirTitle"}),
+			Text:   app.GetLocalizerService().GetMessage("buttonForSelectedDirTitle"),
 			Widget: directoryForSaving.button,
 		},
 		{
@@ -74,11 +73,11 @@ func NewConversion(app kernel.AppContract, formats encoder.ConvertorFormatsContr
 			Widget: selectEncoder.SelectFileType,
 		},
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "selectFormat"}),
+			Text:   app.GetLocalizerService().GetMessage("selectFormat"),
 			Widget: selectEncoder.SelectFormat,
 		},
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "selectEncoder"}),
+			Text:   app.GetLocalizerService().GetMessage("selectEncoder"),
 			Widget: selectEncoder.SelectEncoder,
 		},
 	}
@@ -141,30 +140,22 @@ func (c Conversion) selectFileForConversion(err error) {

 func (c Conversion) submit() {
 	if len(c.itemsToConvertService.GetItems()) == 0 {
-		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "errorNoFilesAddedForConversion",
-		})))
+		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage("errorNoFilesAddedForConversion")))
 		c.enableFormConversion()
 		return
 	}

 	if len(c.directoryForSaving.path) == 0 {
-		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "errorSelectedFolderSave",
-		})))
+		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage("errorSelectedFolderSave")))
 		c.enableFormConversion()
 		return
 	}
 	if len(c.selectEncoder.SelectFormat.Selected) == 0 {
-		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "errorSelectedFormat",
-		})))
+		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage("errorSelectedFormat")))
 		return
 	}
 	if c.selectEncoder.Encoder == nil {
-		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "errorSelectedEncoder",
-		})))
+		showConversionMessage(c.conversionMessage, errors.New(c.app.GetLocalizerService().GetMessage("errorSelectedEncoder")))
 		return
 	}
 	c.conversionMessage.Text = ""
@@ -208,13 +199,9 @@ func newFileForConversion(app kernel.AppContract, itemsToConvertService kernel.I
 		changeCallbacks: map[int]func(err error){},
 	}

-	buttonTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "choose",
-	}) + "\n" + app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "or",
-	}) + "\n" + app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "dragAndDropFiles",
-	})
+	buttonTitle := app.GetLocalizerService().GetMessage("choose") + "\n" +
+		app.GetLocalizerService().GetMessage("or") + "\n" +
+		app.GetLocalizerService().GetMessage("dragAndDropFiles")

 	var locationURI fyne.ListableURI

@@ -281,9 +268,7 @@ func newFileForConversion(app kernel.AppContract, itemsToConvertService kernel.I
 		}
 		app.GetWindow().GetLayout().GetRightTabs().SelectAddedFilesTab()
 		if isError {
-			fileForConversion.message.Text = app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-				MessageID: "errorDragAndDropFile",
-			})
+			fileForConversion.message.Text = app.GetLocalizerService().GetMessage("errorDragAndDropFile")
 			setStringErrorStyle(fileForConversion.message)
 			fileForConversion.eventSelectFile(errors.New(fileForConversion.message.Text))
 		} else {
@@ -322,9 +307,7 @@ func newDirectoryForSaving(app kernel.AppContract, settingDirectoryForSaving set
 	directoryForSaving.message.TextSize = 16
 	directoryForSaving.message.TextStyle = fyne.TextStyle{Bold: true}

-	buttonTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "choose",
-	})
+	buttonTitle := app.GetLocalizerService().GetMessage("choose")

 	var locationURI fyne.ListableURI

@@ -386,9 +369,7 @@ func newOverwriteOutputFiles(app kernel.AppContract) *overwriteOutputFiles {
 	overwriteOutputFiles := &overwriteOutputFiles{
 		isChecked: false,
 	}
-	checkboxOverwriteOutputFilesTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "checkboxOverwriteOutputFilesTitle",
-	})
+	checkboxOverwriteOutputFilesTitle := app.GetLocalizerService().GetMessage("checkboxOverwriteOutputFilesTitle")
 	overwriteOutputFiles.checkbox = widget.NewCheck(checkboxOverwriteOutputFilesTitle, func(b bool) {
 		overwriteOutputFiles.isChecked = b
 	})
@@ -437,7 +418,7 @@ func newSelectEncoder(app kernel.AppContract, formats encoder.ConvertorFormatsCo
 		encoders = map[int]encoder2.EncoderDataContract{}
 		for _, e := range format.GetEncoders() {
 			encoders[len(encoders)] = e
-			encoderOptions = append(encoderOptions, app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "encoder_" + e.GetTitle()}))
+			encoderOptions = append(encoderOptions, app.GetLocalizerService().GetMessage("encoder_"+e.GetTitle()))
 		}
 		selectEncoder.SelectEncoder.SetOptions(encoderOptions)
 		selectEncoder.SelectEncoder.SetSelectedIndex(0)
@@ -448,9 +429,9 @@ func newSelectEncoder(app kernel.AppContract, formats encoder.ConvertorFormatsCo
 		fileTypeOptions = append(fileTypeOptions, fileType.Name())
 	}

-	encoderGroupVideo := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "encoderGroupVideo"})
-	encoderGroupAudio := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "encoderGroupAudio"})
-	encoderGroupImage := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "encoderGroupImage"})
+	encoderGroupVideo := app.GetLocalizerService().GetMessage("encoderGroupVideo")
+	encoderGroupAudio := app.GetLocalizerService().GetMessage("encoderGroupAudio")
+	encoderGroupImage := app.GetLocalizerService().GetMessage("encoderGroupImage")
 	encoderGroup := map[string]string{
 		encoderGroupVideo: "video",
 		encoderGroupAudio: "audio",
@@ -517,9 +498,7 @@ type form struct {

 func newForm(app kernel.AppContract, items []*widget.FormItem) *form {
 	f := widget.NewForm()
-	f.SubmitText = app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "converterVideoFilesSubmitTitle",
-	})
+	f.SubmitText = app.GetLocalizerService().GetMessage("converterVideoFilesSubmitTitle")
 	f.Items = items

 	return &form{
--- a/convertor/view/form_items/h264_nvenc/view.go
+++ b/convertor/view/form_items/h264_nvenc/view.go
@@ -6,7 +6,6 @@ import (
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder/h264_nvenc"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 )

 func View(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
@@ -45,7 +44,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []
 	elementSelect.SetSelected(presetDefault)
 	elementSelect.Hide()

-	checkboxTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "parameterCheckbox"})
+	checkboxTitle := app.GetLocalizerService().GetMessage("parameterCheckbox")
 	elementCheckbox := widget.NewCheck(checkboxTitle, func(b bool) {
 		if b == true {
 			parameter.SetEnable()
@@ -58,7 +57,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []

 	return []*widget.FormItem{
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "formPreset"}),
+			Text:   app.GetLocalizerService().GetMessage("formPreset"),
 			Widget: container.NewVBox(elementCheckbox, elementSelect),
 		},
 	}
--- a/convertor/view/form_items/libx264/view.go
+++ b/convertor/view/form_items/libx264/view.go
@@ -6,7 +6,6 @@ import (
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder/libx264"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 )

 func View(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
@@ -28,7 +27,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []
 	presetDefault := ""

 	for _, name := range libx264.Presets {
-		title := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "preset_" + name})
+		title := app.GetLocalizerService().GetMessage("preset_" + name)
 		presetsForSelect = append(presetsForSelect, title)
 		presets[title] = name
 		if name == parameter.Get() {
@@ -45,7 +44,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []
 	elementSelect.SetSelected(presetDefault)
 	elementSelect.Hide()

-	checkboxTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "parameterCheckbox"})
+	checkboxTitle := app.GetLocalizerService().GetMessage("parameterCheckbox")
 	elementCheckbox := widget.NewCheck(checkboxTitle, func(b bool) {
 		if b == true {
 			parameter.SetEnable()
@@ -58,7 +57,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []

 	return []*widget.FormItem{
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "formPreset"}),
+			Text:   app.GetLocalizerService().GetMessage("formPreset"),
 			Widget: container.NewVBox(elementCheckbox, elementSelect),
 		},
 	}
--- a/convertor/view/form_items/libx265/view.go
+++ b/convertor/view/form_items/libx265/view.go
@@ -6,7 +6,6 @@ import (
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder/libx265"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 )

 func View(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
@@ -28,7 +27,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []
 	presetDefault := ""

 	for _, name := range libx265.Presets {
-		title := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "preset_" + name})
+		title := app.GetLocalizerService().GetMessage("preset_" + name)
 		presetsForSelect = append(presetsForSelect, title)
 		presets[title] = name
 		if name == parameter.Get() {
@@ -45,7 +44,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []
 	elementSelect.SetSelected(presetDefault)
 	elementSelect.Hide()

-	checkboxTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "parameterCheckbox"})
+	checkboxTitle := app.GetLocalizerService().GetMessage("parameterCheckbox")
 	elementCheckbox := widget.NewCheck(checkboxTitle, func(b bool) {
 		if b == true {
 			parameter.SetEnable()
@@ -58,7 +57,7 @@ func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []

 	return []*widget.FormItem{
 		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "formPreset"}),
+			Text:   app.GetLocalizerService().GetMessage("formPreset"),
 			Widget: container.NewVBox(elementCheckbox, elementSelect),
 		},
 	}
--- a/convertor/view_setting.go
+++ b/convertor/view_setting.go
@@ -6,7 +6,6 @@ import (
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/storage"
 	"fyne.io/fyne/v2/widget"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"image/color"
 	"net/url"
 	"path/filepath"
@@ -37,33 +36,25 @@ func (v View) SelectFFPath(
 	form := &widget.Form{
 		Items: []*widget.FormItem{
 			{
-				Text: v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-					MessageID: "titleDownloadLink",
-				}),
+				Text:   v.app.GetLocalizerService().GetMessage("titleDownloadLink"),
 				Widget: link,
 			},
 			{
-				Text: v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-					MessageID: "pathToFfmpeg",
-				}),
+				Text:   v.app.GetLocalizerService().GetMessage("pathToFfmpeg"),
 				Widget: buttonFFmpeg,
 			},
 			{
 				Widget: container.NewHScroll(buttonFFmpegMessage),
 			},
 			{
-				Text: v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-					MessageID: "pathToFfprobe",
-				}),
+				Text:   v.app.GetLocalizerService().GetMessage("pathToFfprobe"),
 				Widget: buttonFFprobe,
 			},
 			{
 				Widget: container.NewHScroll(buttonFFprobeMessage),
 			},
 			{
-				Text: v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-					MessageID: "pathToFfplay",
-				}),
+				Text:   v.app.GetLocalizerService().GetMessage("pathToFfplay"),
 				Widget: buttonFFplay,
 			},
 			{
@@ -73,9 +64,7 @@ func (v View) SelectFFPath(
 				Widget: errorMessage,
 			},
 		},
-		SubmitText: v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "save",
-		}),
+		SubmitText: v.app.GetLocalizerService().GetMessage("save"),
 		OnSubmit: func() {
 			err := save(*ffmpegPath, *ffprobePath, *ffplayPath)
 			if err != nil {
@@ -85,13 +74,9 @@ func (v View) SelectFFPath(
 	}
 	if cancel != nil {
 		form.OnCancel = cancel
-		form.CancelText = v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "cancel",
-		})
+		form.CancelText = v.app.GetLocalizerService().GetMessage("cancel")
 	}
-	selectFFPathTitle := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "selectFFPathTitle",
-	})
+	selectFFPathTitle := v.app.GetLocalizerService().GetMessage("selectFFPathTitle")

 	if v.downloadFFmpeg.blockDownloadFFmpegContainer == nil {
 		v.downloadFFmpeg.blockDownloadFFmpegContainer = v.blockDownloadFFmpeg(donwloadFFmpeg)
@@ -110,9 +95,7 @@ func (v View) getButtonSelectFile(path string) (filePath *string, button *widget
 	buttonMessage.TextSize = 16
 	buttonMessage.TextStyle = fyne.TextStyle{Bold: true}

-	buttonTitle := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "choose",
-	})
+	buttonTitle := v.app.GetLocalizerService().GetMessage("choose")

 	var locationURI fyne.ListableURI
 	if len(path) > 0 {
--- a/convertor/view_setting_button_download_ffmpeg_linux.go
+++ b/convertor/view_setting_button_download_ffmpeg_linux.go
@@ -8,7 +8,6 @@ import (
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/widget"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"golang.org/x/image/colornames"
 	"image/color"
 )
@@ -29,9 +28,7 @@ func (v View) blockDownloadFFmpeg(

 	var buttonDownloadFFmpeg *widget.Button

-	buttonDownloadFFmpeg = widget.NewButton(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "download",
-	}), func() {
+	buttonDownloadFFmpeg = widget.NewButton(v.app.GetLocalizerService().GetMessage("download"), func() {
 		fyne.Do(func() {
 			buttonDownloadFFmpeg.Disable()
 		})
@@ -47,15 +44,11 @@ func (v View) blockDownloadFFmpeg(

 	})

-	downloadFFmpegFromSiteMessage := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "downloadFFmpegFromSite",
-	})
+	downloadFFmpegFromSiteMessage := v.app.GetLocalizerService().GetMessage("downloadFFmpegFromSite")

 	return container.NewVBox(
 		canvas.NewLine(colornames.Darkgreen),
-		widget.NewCard(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "buttonDownloadFFmpeg",
-		}), "", container.NewVBox(
+		widget.NewCard(v.app.GetLocalizerService().GetMessage("buttonDownloadFFmpeg"), "", container.NewVBox(
 			widget.NewRichTextFromMarkdown(
 				downloadFFmpegFromSiteMessage+" [https://github.com/BtbN/FFmpeg-Builds/releases](https://github.com/BtbN/FFmpeg-Builds/releases)",
 			),
--- a/convertor/view_setting_button_download_ffmpeg_windows.go
+++ b/convertor/view_setting_button_download_ffmpeg_windows.go
@@ -8,7 +8,6 @@ import (
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/widget"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"golang.org/x/image/colornames"
 	"image/color"
 )
@@ -29,9 +28,7 @@ func (v View) blockDownloadFFmpeg(

 	var buttonDownloadFFmpeg *widget.Button

-	buttonDownloadFFmpeg = widget.NewButton(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "download",
-	}), func() {
+	buttonDownloadFFmpeg = widget.NewButton(v.app.GetLocalizerService().GetMessage("download"), func() {

 		go func() {
 			fyne.Do(func() {
@@ -47,15 +44,11 @@ func (v View) blockDownloadFFmpeg(
 		}()
 	})

-	downloadFFmpegFromSiteMessage := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "downloadFFmpegFromSite",
-	})
+	downloadFFmpegFromSiteMessage := v.app.GetLocalizerService().GetMessage("downloadFFmpegFromSite")

 	return container.NewVBox(
 		canvas.NewLine(colornames.Darkgreen),
-		widget.NewCard(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "buttonDownloadFFmpeg",
-		}), "", container.NewVBox(
+		widget.NewCard(v.app.GetLocalizerService().GetMessage("buttonDownloadFFmpeg"), "", container.NewVBox(
 			widget.NewRichTextFromMarkdown(
 				downloadFFmpegFromSiteMessage+" [https://github.com/BtbN/FFmpeg-Builds/releases](https://github.com/BtbN/FFmpeg-Builds/releases)",
 			),