simplify UserKeyString

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)
+	keyString := services.UserKeyString(LanguageUserKey)
-	if res {
+	parseTag, err := language.Parse(keyString)
-		normalizedKeyTag, err := language.Parse(keyString)
+	if err == nil {
-		if err == nil {
+		matchTag := message.MatchLanguage(keyString)
-			keyTag := message.MatchLanguage(keyString)
+		if parseTag == matchTag {
-			if normalizedKeyTag == keyTag {
+			tag = parseTag
-				tag = keyTag
+			return
-				return
-			}
 		}
 	}
 	tag = language.English

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 {