chore(gui): add missing ref text in untranslated messages (#2319)

fix
This commit is contained in:
Skylot
2024-10-24 17:29:30 +01:00
parent 233f8692b2
commit c0815b12bc
10 changed files with 208 additions and 183 deletions
+57 -35
View File
@@ -9,34 +9,34 @@ import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import jadx.gui.utils.LangLocale;
import jadx.gui.utils.NLS;
import static java.nio.file.Files.exists;
import static java.nio.file.Paths.get;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
public class TestI18n {
private static final String DEFAULT_LANG_FILE = "Messages_en_US.properties";
private static Path guiJavaPath;
private static Path i18nPath;
private List<String> reference;
private String referenceName;
private static Path refPath;
private static Path guiJavaPath;
@BeforeAll
public static void init() {
i18nPath = get("src/main/resources/i18n");
assertThat(exists(i18nPath)).isTrue();
assertThat(i18nPath).exists();
refPath = i18nPath.resolve(DEFAULT_LANG_FILE);
assertThat(refPath).exists();
guiJavaPath = get("src/main/java");
assertThat(exists(guiJavaPath)).isTrue();
assertThat(guiJavaPath).exists();
}
@Test
@@ -51,38 +51,60 @@ public class TestI18n {
@Test
public void filesExactlyMatch() throws IOException {
List<String> reference = Files.readAllLines(refPath)
.stream()
.map(TestI18n::getPrefix)
.collect(Collectors.toList());
try (Stream<Path> list = Files.list(i18nPath)) {
list.forEach(p -> {
List<String> lines;
try {
lines = Files.readAllLines(p);
if (reference == null) {
reference = lines;
referenceName = p.getFileName().toString();
} else {
compareToReference(p);
}
} catch (IOException e) {
Assertions.fail("Error " + e.getMessage());
}
});
list.filter(p -> !p.equals(refPath))
.forEach(path -> compareToReference(path, reference));
}
}
private void compareToReference(Path path) throws IOException {
List<String> lines = Files.readAllLines(path);
for (int i = 0; i < reference.size(); i++) {
String line = trimComment(reference.get(i));
int p0 = line.indexOf('=');
if (p0 != -1) {
String prefix = line.substring(0, p0 + 1);
if (i >= lines.size() || !trimComment(lines.get(i)).startsWith(prefix)) {
/**
* Extract prefix: 'key='
*/
private static String getPrefix(String line) {
if (line.isBlank()) {
return "";
}
int sep = line.indexOf('=');
if (sep == -1) {
return line;
}
if (line.startsWith("#")) {
fail(DEFAULT_LANG_FILE + " shouldn't contain commented values: " + line);
}
return line.substring(0, sep + 1);
}
private void compareToReference(Path path, List<String> reference) {
try {
List<String> lines = Files.readAllLines(path);
for (int i = 0; i < reference.size(); i++) {
String prefix = reference.get(i);
if (prefix.isEmpty()) {
continue;
}
if (i >= lines.size()) {
fail("File '" + path.getFileName() + "' contains unexpected lines at end");
}
String line = lines.get(i);
if (!trimComment(line).startsWith(prefix)) {
failLine(path, i + 1);
}
if (line.startsWith("#")) {
int sep = line.indexOf('=');
if (line.substring(sep + 1).isBlank()) {
fail("File '" + path.getFileName() + "' has empty ref text at line " + (i + 1) + ": " + line);
}
}
}
}
if (lines.size() != reference.size()) {
failLine(path, reference.size());
if (lines.size() != reference.size()) {
failLine(path, reference.size());
}
} catch (IOException e) {
fail("Process error ", e);
}
}
@@ -91,13 +113,13 @@ public class TestI18n {
}
private void failLine(Path path, int line) {
fail("I18n files " + path.getFileName() + " and " + referenceName + " differ in line " + line);
fail("I18n file: " + path.getFileName() + " and " + DEFAULT_LANG_FILE + " differ in line " + line);
}
@Test
public void keyIsUsed() throws IOException {
Properties properties = new Properties();
try (Reader reader = Files.newBufferedReader(i18nPath.resolve("Messages_en_US.properties"))) {
try (Reader reader = Files.newBufferedReader(i18nPath.resolve(DEFAULT_LANG_FILE))) {
properties.load(reader);
}
Set<String> keys = new HashSet<>();