fix: WalkLocales

Author: wolfogre

modules/options/base.go

@@ -38,6 +38,16 @@ func Labels(name string) ([]byte, error) {
 	return fileFromDir(path.Join("label", name))
 }
 
+// WalkLocales reads the content of a specific locale from static or custom path.
+func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) error) error {
+	for _, v := range pathsForWalkLocales() {
+		if err := walkAssetDir(v, callback); err != nil && !os.IsNotExist(err) {
+			return fmt.Errorf("failed to walk locales. Error: %w", err)
+		}
+	}
+	return nil
+}
+
 func walkAssetDir(root string, callback func(path, name string, d fs.DirEntry, err error) error) error {
 	if err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
 		// name is the path relative to the root

modules/options/dynamic.go

@@ -7,7 +7,6 @@ package options
 
 import (
 	"fmt"
-	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
@@ -60,16 +59,11 @@ func Dir(name string) ([]string, error) {
 	return directories.AddAndGet(name, result), nil
 }
 
-// WalkLocales reads the content of a specific locale from static or custom path.
-func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) error) error {
-	if err := walkAssetDir(filepath.Join(setting.StaticRootPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("failed to walk locales. Error: %w", err)
+func pathsForWalkLocales() []string {
+	return []string{
+		filepath.Join(setting.StaticRootPath, "options", "locale"),
+		filepath.Join(setting.CustomPath, "options", "locale"),
 	}
-
-	if err := walkAssetDir(filepath.Join(setting.CustomPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("failed to walk locales. Error: %w", err)
-	}
-	return nil
 }
 
 // fileFromDir is a helper to read files from static or custom path.

modules/options/static.go

@@ -8,7 +8,6 @@ package options
 import (
 	"fmt"
 	"io"
-	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
@@ -69,12 +68,10 @@ func AssetDir(dirName string) ([]string, error) {
 	return results, nil
 }
 
-// WalkLocales reads the content of a specific locale from static or custom path.
-func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) error) error {
-	if err := walkAssetDir(filepath.Join(setting.CustomPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("failed to walk locales. Error: %w", err)
+func pathsForWalkLocales() []string {
+	return []string{
+		filepath.Join(setting.CustomPath, "options", "locale"),
 	}
-	return nil
 }
 
 // fileFromDir is a helper to read files from bindata or custom path.