From 0ed31be796c9b0ffa88d7b473feac466f4b73656 Mon Sep 17 00:00:00 2001 From: RomikB Date: Mon, 7 Apr 2025 21:38:33 +0200 Subject: [PATCH] simplify UserKeyString --- l18n/l18n.go | 16 +++++++--------- services/registry.go | 8 ++++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/l18n/l18n.go b/l18n/l18n.go index 8d5fa20..358b11d 100644 --- a/l18n/l18n.go +++ b/l18n/l18n.go @@ -40,15 +40,13 @@ func prn() *message.Printer { // lang returns the user preferred UI language we have most confident translation in the default catalog available. func lang() (tag language.Tag) { - keyString, res := services.UserKeyString(LanguageUserKey) - if res { - normalizedKeyTag, err := language.Parse(keyString) - if err == nil { - keyTag := message.MatchLanguage(keyString) - if normalizedKeyTag == keyTag { - tag = keyTag - return - } + keyString := services.UserKeyString(LanguageUserKey) + parseTag, err := language.Parse(keyString) + if err == nil { + matchTag := message.MatchLanguage(keyString) + if parseTag == matchTag { + tag = parseTag + return } } tag = language.English diff --git a/services/registry.go b/services/registry.go index c176bf0..a03f493 100644 --- a/services/registry.go +++ b/services/registry.go @@ -39,16 +39,16 @@ func closeUserKey() { userKey = 0 } -func UserKeyString(name string) (string, bool) { +func UserKeyString(name string) string { key, err := openUserKey() if err != nil { - return err.Error(), false + return "" } val, _, err := key.GetStringValue(name) if err != nil { - return err.Error(), false + return "" } - return val, true + return val } func SetUserKeyString(name string, value string) error {