mirror of
https://github.com/amnezia-vpn/amneziawg-windows-client.git
synced 2026-05-17 00:05:45 +03:00
simplify UserKeyString
This commit is contained in:
16
l18n/l18n.go
16
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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user