fix(yalocales): Slicing of non-existent locales

Author: YaCodesDevelopment

yalocales/locale.go

@@ -37,10 +37,6 @@ func (c *compiledLocale) retriveJSONByCompositeKey(key string) ([]byte, yaerrors
 		)
 	}
 
-	if len(keyPart) == 1 {
-		return c.SubMap[keyPart[0]].JSON, nil
-	}
-
 	subLocale, ok := c.SubMap[keyPart[0]]
 
 	if !ok {
@@ -51,6 +47,10 @@ func (c *compiledLocale) retriveJSONByCompositeKey(key string) ([]byte, yaerrors
 		)
 	}
 
+	if len(keyPart) == 1 {
+		return subLocale.JSON, nil
+	}
+
 	value, err := subLocale.retriveJSONByCompositeKey(keyPart[1])
 	if err != nil {
 		return nil, err.Wrap(fmt.Sprintf("Failed to retrieve JSON for key part '%s'", keyPart[0]))
@@ -74,10 +74,6 @@ func (c *compiledLocale) retriveValueByCompositeKey(key string) (string, yaerror
 		)
 	}
 
-	if len(keyPart) == 1 {
-		return c.SubMap[keyPart[0]].Value, nil
-	}
-
 	subLocale, ok := c.SubMap[keyPart[0]]
 
 	if !ok {
@@ -88,6 +84,10 @@ func (c *compiledLocale) retriveValueByCompositeKey(key string) (string, yaerror
 		)
 	}
 
+	if len(keyPart) == 1 {
+		return subLocale.Value, nil
+	}
+
 	value, err := subLocale.retriveValueByCompositeKey(keyPart[1])
 	if err != nil {
 		return "", err.Wrap(fmt.Sprintf("Failed to retrieve value for key part '%s'", keyPart[0]))