Small fixes. Load ru translation file.

leighmacdonald · Feb 28, 2023 · 34f1fcc · 34f1fcc
1 parent 2277f03
commit 34f1fcc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/pkg/rules/engine.go b/pkg/rules/engine.go
@@ -57,7 +57,6 @@ type Engine struct {
 	rulesLists     []*RuleSchema
 	playerLists    []*PlayerListSchema
 	knownTags      []string
-	skipTags       []string
 }
 
 type MarkOpts struct {

diff --git a/pkg/rules/engine_test.go b/pkg/rules/engine_test.go
@@ -140,7 +140,7 @@ func TestTextRules(t *testing.T) {
 			require.Equal(t, tc.matched, re.MatchMessage(tc.text) != nil, "Test %d failed", num)
 		}
 	}
-	require.NoError(t, re.Mark(MarkOpts{}))
+	require.Error(t, re.Mark(MarkOpts{}))
 }
 
 func TestAvatarRules(t *testing.T) {

diff --git a/pkg/rules/matchers.go b/pkg/rules/matchers.go
@@ -51,7 +51,7 @@ func (m avatarMatcher) Type() avatarMatchType {
 func (m avatarMatcher) Match(hexDigest string) *MatchResult {
 	for _, hash := range m.hashes {
 		if hash == hexDigest {
-			return &MatchResult{Origin: m.origin, MatcherType: string(m.Type())}
+			return &MatchResult{Origin: m.origin, MatcherType: string(m.Type()), Attributes: m.attributes}
 		}
 	}
 	return nil

diff --git a/translations/translations.go b/translations/translations.go
@@ -69,9 +69,9 @@ func One(key Key) string {
 }
 
 func init() {
-	bundle = i18n.NewBundle(language.English)
+	bundle = i18n.NewBundle(language.Russian)
 	bundle.RegisterUnmarshalFunc("yaml", yaml.Unmarshal)
-	for _, langFile := range []string{"active.en.yaml"} {
+	for _, langFile := range []string{"active.en.yaml", "ru.yaml"} {
 		_, errLoad := bundle.LoadMessageFileFS(localeFS, langFile)
 		if errLoad != nil {
 			log.Fatalf(errLoad.Error())

diff --git a/ui/settings.go b/ui/settings.go
@@ -32,14 +32,6 @@ func (s *boundSettings) getBoundStringDefault(key string, def string) binding.St
 	return binding.BindString(&v)
 }
 
-func (s *boundSettings) getBoundStringListDefault(key string, def []string) binding.StringList {
-	value, apiKeyErr := s.GetValue(key)
-	if apiKeyErr != nil {
-		value = def
-	}
-	v := value.([]string)
-	return binding.BindStringList(&v)
-}
 func (s *boundSettings) getBoundBoolDefault(key string, def bool) binding.Bool {
 	value, apiKeyErr := s.GetValue(key)
 	if apiKeyErr != nil {