Sort ARB keys alphabetically

leancodepl · Apr 3, 2024 · 7faca3d · 7faca3d
1 parent e306c96
commit 7faca3d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/convert/poe2arb/converter.go b/convert/poe2arb/converter.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"regexp"
+	"sort"
 	"strings"
 
 	"github.com/leancodepl/poe2arb/convert"
@@ -57,6 +58,15 @@ func (c *Converter) Convert(output io.Writer) error {
 	prefixedRegexp := regexp.MustCompile("(?:([a-zA-Z]+):)?(.*)")
 	var errs []error
 
+	// Sort terms by key alphabetically
+	sort.SliceStable(jsonContents, func(i, j int) bool {
+		a, b := jsonContents[i], jsonContents[j]
+		aKey := prefixedRegexp.FindStringSubmatch(a.Term)[2]
+		bKey := prefixedRegexp.FindStringSubmatch(b.Term)[2]
+
+		return aKey < bKey
+	})
+
 	for _, term := range jsonContents {
 		// Filter by term prefix
 		matches := prefixedRegexp.FindStringSubmatch(term.Term)

diff --git a/convert/poe2arb/testdata/attributes-req-attrs.golden b/convert/poe2arb/testdata/attributes-req-attrs.golden
@@ -1,13 +1,13 @@
 {
     "@@locale": "en",
-    "noAttrs": "Foobar",
-    "@noAttrs": {},
     "attrs": "Foo {bar}",
     "@attrs": {
         "placeholders": {
             "bar": {
                 "type": "String"
             }
         }
-    }
+    },
+    "noAttrs": "Foobar",
+    "@noAttrs": {}
 }
diff --git a/convert/poe2arb/testdata/attributes.golden b/convert/poe2arb/testdata/attributes.golden
@@ -1,12 +1,12 @@
 {
     "@@locale": "en",
-    "noAttrs": "Foobar",
     "attrs": "Foo {bar}",
     "@attrs": {
         "placeholders": {
             "bar": {
                 "type": "String"
             }
         }
-    }
+    },
+    "noAttrs": "Foobar"
 }