RedGuy/easy-18in
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support dots within a single path node

Browse Source 
Resolves #73
This commit is contained in:
marhali 2022-01-07 18:20:32 +01:00
parent a3abce9814
commit fe5367d647
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,6 +3,9 @@
# easy-i18n Changelog
## [Unreleased]
### Added
- Support for dots within key nodes in YAML files
### Fixed
- Key focus within tree or table view after translation change

8
src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java
View File

@ -2,6 +2,7 @@ package de.marhali.easyi18n.io.yaml;
import de.marhali.easyi18n.model.Translation;
import de.marhali.easyi18n.model.TranslationNode;
import de.marhali.easyi18n.util.PathUtil;
import de.marhali.easyi18n.util.StringUtil;
import org.apache.commons.lang.StringEscapeUtils;
@ -23,6 +24,9 @@ public class YamlMapper {
for(String key : section.getKeys()) {
Object value = section.getInScope(key).get();
key = StringUtil.escapeControls(
key.replace(PathUtil.DELIMITER, "\\" + PathUtil.DELIMITER), true);
TranslationNode childNode = node.getOrCreateChildren(key);
if(value instanceof MapSection) {
@ -43,7 +47,9 @@ public class YamlMapper {
public static void write(String locale, Section section, TranslationNode node) {
for(Map.Entry<String, TranslationNode> entry : node.getChildren().entrySet()) {
String key = entry.getKey();
String key = StringEscapeUtils.unescapeJava(
entry.getKey().replace("\\" + PathUtil.DELIMITER, PathUtil.DELIMITER));
TranslationNode childNode = entry.getValue();
if(!childNode.isLeaf()) {

8
src/main/java/de/marhali/easyi18n/util/PathUtil.java
View File

@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
/**
* Utility tool for split and merge translation key paths.
@ -18,7 +19,7 @@ import java.util.List;
*/
public class PathUtil {
public static final char DELIMITER = '.';
public static final String DELIMITER = ".";
private final boolean nestKeys;
@ -32,11 +33,12 @@ public class PathUtil {
public @NotNull List<String> split(@NotNull String path) {
// Does not contain any sections or key nesting is disabled
if(!path.contains(String.valueOf(DELIMITER)) || !nestKeys) {
if(!path.contains(DELIMITER) || !nestKeys) {
return new ArrayList<>(Collections.singletonList(path));
}
return new ArrayList<>(Arrays.asList(path.split("\\" + DELIMITER)));
return new ArrayList<>(Arrays.asList(
path.split("(?<!\\\\)" + Pattern.quote(DELIMITER))));
}
public @NotNull String concat(@NotNull List<String> sections) {