migrated i18n package to ui folder

Jannes-Dailidow · Jannes-Dailidow · commit a4fa7d957286 · 2026-05-31T15:12:23.000+02:00
diff --git a/core/audit_edge_cases_test.go b/core/audit_edge_cases_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/state"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // fakeKeyReaderForAudit is a minimal test implementation of KeyReader interface
diff --git a/core/decommission_and_audit_extra_test.go b/core/decommission_and_audit_extra_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // Test when removeSystemKey=false and no excludes: non-keymaster content should be preserved
diff --git a/core/deploy/audit.go b/core/deploy/audit.go
@@ -12,7 +12,7 @@ import (
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/sshkey"
 	"github.com/toeirei/keymaster/core/state"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // AuditAccountStrict performs a strict audit by comparing the full normalized
diff --git a/core/deploy/audit_test.go b/core/deploy/audit_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/toeirei/keymaster/core/db"
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 func TestAuditAccountSerial_Errors(t *testing.T) {
diff --git a/core/deploy/helpers_test.go b/core/deploy/helpers_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/deploy"
 	"github.com/toeirei/keymaster/core/model"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // TestCanonicalizeHostPort_StandardHost tests standard hostname with default port.
diff --git a/core/deploy/run.go b/core/deploy/run.go
@@ -13,7 +13,7 @@ import (
 	"github.com/toeirei/keymaster/core/db"
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/state"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // RunDeploymentForAccount handles the deployment logic for a single account.
diff --git a/core/deploy_adapter_run_test.go b/core/deploy_adapter_run_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // fake bootstrap deployer used to test NewBootstrapDeployer wrapper
diff --git a/core/deploy_adapter_test.go b/core/deploy_adapter_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // fake deployer that returns provided content or error
diff --git a/core/deploy_audit.go b/core/deploy_audit.go
@@ -12,7 +12,7 @@ import (
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/sshkey"
 	"github.com/toeirei/keymaster/core/state"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // AuditAccountStrict performs a strict audit by comparing the full normalized
diff --git a/core/deploy_audit_serial_test.go b/core/deploy_audit_serial_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // fakeRemote from deploy_audit_test.go reused pattern
diff --git a/core/deploy_audit_test.go b/core/deploy_audit_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 type fakeRemote struct {
diff --git a/core/deploy_decommission_test.go b/core/deploy_decommission_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 type fakeRemoteDeployer struct {
diff --git a/core/deploy_import_test.go b/core/deploy_import_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 type fakeDeployerForImport struct {
diff --git a/core/deploy_run.go b/core/deploy_run.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/state"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // RunDeploymentForAccount handles the deployment logic for a single account.
diff --git a/core/deploy_run_extra_test.go b/core/deploy_run_extra_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // fakeKRPartial returns a system key for serial lookups but nil for active key
diff --git a/core/deploy_run_more_test.go b/core/deploy_run_more_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // retryUpdater simulates transient DB "database is locked" errors a few times
diff --git a/core/deploy_run_test.go b/core/deploy_run_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/toeirei/keymaster/core/db"
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 type fakeDeployer struct {
diff --git a/core/facades.go b/core/facades.go
@@ -22,7 +22,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/toeirei/keymaster/config"
 	"github.com/toeirei/keymaster/core/bootstrap"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/sshkey"
diff --git a/core/facades_audit_test.go b/core/facades_audit_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 type simpleFakeStore struct {
diff --git a/core/facades_commands_test.go b/core/facades_commands_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 type callCountingDM struct {
diff --git a/tools/debug_export/main.go b/tools/debug_export/main.go
@@ -7,7 +7,7 @@ import (
 	log "github.com/charmbracelet/log"
 
 	"github.com/toeirei/keymaster/core/db"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 func main() {
diff --git a/ui/cli/commands_test.go b/ui/cli/commands_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/toeirei/keymaster/core"
 	"github.com/toeirei/keymaster/core/model"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 // TestRotateKeyCmd_HelpText verifies rotate-key command help text is present
diff --git a/ui/cli/main.go b/ui/cli/main.go
@@ -33,7 +33,7 @@ import (
 	"github.com/toeirei/keymaster/core/deploy"
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/sshkey"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 	"github.com/toeirei/keymaster/ui/tui"
 	"github.com/toeirei/keymaster/uiadapters"
 	"golang.org/x/crypto/ssh"
diff --git a/ui/cli/main_cmd_test.go b/ui/cli/main_cmd_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/toeirei/keymaster/core"
 	"github.com/toeirei/keymaster/core/model"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 func TestNewRootCmd_RegistersSubcommandsAndVersion(t *testing.T) {
diff --git a/ui/cli/main_deploy_test.go b/ui/cli/main_deploy_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/toeirei/keymaster/core"
 	"github.com/toeirei/keymaster/core/model"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 func TestRunDeploymentForAccount_NoActiveSystemKey_ReturnsError(t *testing.T) {
diff --git a/ui/cli/main_target_test.go b/ui/cli/main_target_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/toeirei/keymaster/core"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 func TestInitTargetDB_SQLiteMemory(t *testing.T) {
diff --git a/ui/cli/main_test.go b/ui/cli/main_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/toeirei/keymaster/core"
 	"github.com/toeirei/keymaster/core/deploy"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/ui/cli/transfer.go b/ui/cli/transfer.go
@@ -16,7 +16,7 @@ import (
 	"github.com/toeirei/keymaster/core"
 	"github.com/toeirei/keymaster/core/model"
 	"github.com/toeirei/keymaster/core/security"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 	"github.com/toeirei/keymaster/uiadapters"
 )
 
diff --git a/ui/i18n/i18n.go b/ui/i18n/i18n.go
@@ -5,7 +5,7 @@
 // Package i18n handles internationalization for Keymaster.
 // It uses go-i18n to load and manage translation files, and provides
 // a simple interface for the rest of the application to get translated strings.
-package i18n // import "github.com/toeirei/keymaster/i18n"
+package i18n
 
 import (
 	"embed"
diff --git a/ui/i18n/i18n_test.go b/ui/i18n/i18n_test.go
@@ -1,19 +1,21 @@
 // Copyright (c) 2026 Keymaster Team
 // Keymaster - SSH key management system
 // This source code is licensed under the MIT license found in the LICENSE file.
-package i18n
+package i18n_test
 
 import (
 	"testing"
+
+	"github.com/toeirei/keymaster/ui/i18n"
 )
 
 func TestInitAndAvailableLocales(t *testing.T) {
-	Init("en")
-	if GetLang() != "en" {
-		t.Fatalf("expected lang 'en', got %q", GetLang())
+	i18n.Init("en")
+	if i18n.GetLang() != "en" {
+		t.Fatalf("expected lang 'en', got %q", i18n.GetLang())
 	}
 
-	av := GetAvailableLocales()
+	av := i18n.GetAvailableLocales()
 	wantKeys := []string{"en", "de", "art-x-ang"}
 	for _, k := range wantKeys {
 		if _, ok := av[k]; !ok {
@@ -28,24 +30,24 @@ func TestInitAndAvailableLocales(t *testing.T) {
 }
 
 func TestT_BasicAndFormatting(t *testing.T) {
-	Init("en")
+	i18n.Init("en")
 
-	if got := T("all"); got != "All" {
+	if got := i18n.T("all"); got != "All" {
 		t.Fatalf("expected 'All', got %q", got)
 	}
 
 	// fmt-style formatting via non-map template args
-	got := T("dashboard.hosts_current_key", 7)
+	got := i18n.T("dashboard.hosts_current_key", 7)
 	if got != "Current: 7" {
 		t.Fatalf("unexpected formatted translation: %q", got)
 	}
 
 	// switch language to German
-	SetLang("de")
-	if GetLang() != "de" {
-		t.Fatalf("expected lang 'de', got %q", GetLang())
+	i18n.SetLang("de")
+	if i18n.GetLang() != "de" {
+		t.Fatalf("expected lang 'de', got %q", i18n.GetLang())
 	}
-	if got := T("all"); got != "Alle" {
+	if got := i18n.T("all"); got != "Alle" {
 		t.Fatalf("expected German 'Alle', got %q", got)
 	}
 }
diff --git a/ui/i18n/locales/active.art-x-ang.yaml b/ui/i18n/locales/active.art-x-ang.yaml
diff --git a/ui/i18n/locales/active.de.yaml b/ui/i18n/locales/active.de.yaml
diff --git a/ui/i18n/locales/active.en.yaml b/ui/i18n/locales/active.en.yaml
diff --git a/ui/tui/prevent_unwanted_imports_test.go b/ui/tui/prevent_unwanted_imports_test.go
@@ -26,7 +26,7 @@ func TestPreventUnwantedImports(t *testing.T) {
 		regexp.QuoteMeta("github.com/toeirei/keymaster/util") + ".*",
 		regexp.QuoteMeta("github.com/toeirei/keymaster/tags") + ".*",
 		regexp.QuoteMeta("github.com/toeirei/keymaster/client") + ".*",
-		regexp.QuoteMeta("github.com/toeirei/keymaster/i18n"),
+		regexp.QuoteMeta("github.com/toeirei/keymaster/ui/i18n"),
 		regexp.QuoteMeta("github.com/toeirei/keymaster/buildvars"),
 	}
 
diff --git a/ui/tui/views/content/content.go b/ui/tui/views/content/content.go
@@ -12,7 +12,7 @@ import (
 	"github.com/charmbracelet/bubbles/help"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/toeirei/keymaster/client"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 	"github.com/toeirei/keymaster/ui/tui/components/menu"
 	"github.com/toeirei/keymaster/ui/tui/components/router"
 	"github.com/toeirei/keymaster/ui/tui/components/stack"
diff --git a/ui/tui/views/dashboard/model.go b/ui/tui/views/dashboard/model.go
@@ -15,7 +15,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/toeirei/keymaster/client"
-	"github.com/toeirei/keymaster/i18n"
+	"github.com/toeirei/keymaster/ui/i18n"
 	"github.com/toeirei/keymaster/ui/tui/helpers/tablecontroll"
 	"github.com/toeirei/keymaster/ui/tui/util"
 	"github.com/toeirei/keymaster/util/slicest"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/toeirei/keymaster/core/model"`
`10`	`10`	`"github.com/toeirei/keymaster/core/state"`
`11`		`- "github.com/toeirei/keymaster/i18n"`
	`11`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// fakeKeyReaderForAudit is a minimal test implementation of KeyReader interface`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/toeirei/keymaster/core/model"`
`13`	`13`	`"github.com/toeirei/keymaster/core/sshkey"`
`14`	`14`	`"github.com/toeirei/keymaster/core/state"`
`15`		`- "github.com/toeirei/keymaster/i18n"`
	`15`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// AuditAccountStrict performs a strict audit by comparing the full normalized`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/toeirei/keymaster/core/db"`
`11`	`11`	`"github.com/toeirei/keymaster/core/model"`
`12`	`12`	`"github.com/toeirei/keymaster/core/security"`
`13`		`- "github.com/toeirei/keymaster/i18n"`
	`13`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestAuditAccountSerial_Errors(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/toeirei/keymaster/core/deploy"`
`11`	`11`	`"github.com/toeirei/keymaster/core/model"`
`12`		`- "github.com/toeirei/keymaster/i18n"`
	`12`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// TestCanonicalizeHostPort_StandardHost tests standard hostname with default port.`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"github.com/toeirei/keymaster/core/db"`
`14`	`14`	`"github.com/toeirei/keymaster/core/model"`
`15`	`15`	`"github.com/toeirei/keymaster/core/state"`
`16`		`- "github.com/toeirei/keymaster/i18n"`
	`16`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// RunDeploymentForAccount handles the deployment logic for a single account.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/toeirei/keymaster/core/model"`
`8`	`8`	`"github.com/toeirei/keymaster/core/security"`
`9`		`- "github.com/toeirei/keymaster/i18n"`
	`9`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// fake bootstrap deployer used to test NewBootstrapDeployer wrapper`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/toeirei/keymaster/core/model"`
`7`	`7`	`"github.com/toeirei/keymaster/core/security"`
`8`		`- "github.com/toeirei/keymaster/i18n"`
	`8`	`+ "github.com/toeirei/keymaster/ui/i18n"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// fakeRemote from deploy_audit_test.go reused pattern`