simplify UserKeyString

This commit is contained in:
RomikB
2025-04-07 21:38:33 +02:00
parent 301b4cc067
commit 0ed31be796
2 changed files with 11 additions and 13 deletions

View File

@@ -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

View File

@@ -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 {