Merge pull request #116 from simplelocalize/version-2.8

jpomykala · web-flow · commit 7571b47f59d6 · 2025-02-05T17:27:33.000+01:00
Version 2.8
diff --git a/README.md b/README.md
@@ -338,7 +338,7 @@ uploadOptions:
 
 # Properties used by 'download' command
 downloadPath: ./output-translations/messages_{lang}.json
-downloadLanguageKey: ['de-DE', 'fr-FR', 'pl-PL']
+downloadLanguageKeys: ['de-DE', 'fr-FR', 'pl-PL']
 downloadFormat: single-language-json
 downloadOptions:
   - WRITE_NESTED
diff --git a/junit/blog-posts-keys-as-dir-name/ai-translations/index.md b/junit/blog-posts-keys-as-dir-name/ai-translations/index.md
@@ -0,0 +1 @@
+Translation services have been around for a long time.
diff --git a/junit/blog-posts-keys-as-dir-name/how-to-translate-website/index.md b/junit/blog-posts-keys-as-dir-name/how-to-translate-website/index.md
@@ -0,0 +1 @@
+Any web page can be viewed in multiple languages.
diff --git a/junit/blog-posts-with-lang-name-and-namespace/en/ai-translations_common.md b/junit/blog-posts-with-lang-name-and-namespace/en/ai-translations_common.md
@@ -0,0 +1 @@
+Translation services have been around for a long time.
diff --git a/junit/blog-posts-with-lang-name-and-namespace/en/how-to-translate-website_common.md b/junit/blog-posts-with-lang-name-and-namespace/en/how-to-translate-website_common.md
@@ -0,0 +1 @@
+Any web page can be viewed in multiple languages.
diff --git a/junit/blog-posts-with-lang-name-and-namespace/pl/ai-translations_common.md b/junit/blog-posts-with-lang-name-and-namespace/pl/ai-translations_common.md
@@ -0,0 +1 @@
+Polska wersja o tłumaczeniach AI
diff --git a/junit/blog-posts-with-lang-name-and-namespace/pl/how-to-translate-website_common.md b/junit/blog-posts-with-lang-name-and-namespace/pl/how-to-translate-website_common.md
@@ -0,0 +1 @@
+Polska wersja o tłumaczeniu stron
diff --git a/junit/blog-posts/ai-translations.md b/junit/blog-posts/ai-translations.md
@@ -0,0 +1 @@
+Translation services have been around for a long time.
diff --git a/junit/blog-posts/how-to-translate-website.md b/junit/blog-posts/how-to-translate-website.md
@@ -0,0 +1 @@
+Any web page can be viewed in multiple languages.
diff --git a/simplelocalize.yml b/simplelocalize.yml
@@ -39,7 +39,7 @@ uploadFormat: single-language-json
 downloadPath: ./translations_{lang}.json
 
 # Specify language keys which you want to download, by default all languages are downloaded.
-# downloadLanguageKey: ['pl', 'es']
+# downloadLanguageKeys: ['pl', 'es']
 
 # Output format for translations: https://simplelocalize.io/docs/general/file-formats/
 downloadFormat: single-language-json
diff --git a/src/main/java/io/simplelocalize/cli/io/FileListReader.java b/src/main/java/io/simplelocalize/cli/io/FileListReader.java
@@ -38,11 +38,11 @@ private List<FileToUpload> findMatchingFiles(Path parentDirectory, String patter
                 if (matcher.matches())
                 {
                   String translationKey = getGroupOrNull("translationKey", matcher);
-                  String lang = getGroupOrNull("lang", matcher);
-                  String ns = getGroupOrNull("ns", matcher);
+                  String languageKey = getGroupOrNull("lang", matcher);
+                  String namespace = getGroupOrNull("ns", matcher);
                   return FileToUpload.builder()
-                          .withLanguage(lang)
-                          .withNamespace(ns)
+                          .withLanguage(languageKey)
+                          .withNamespace(namespace)
                           .withTranslationKey(translationKey)
                           .withPath(file)
                           .build();
diff --git a/src/test/java/io/simplelocalize/cli/util/FileListReaderTest.java b/src/test/java/io/simplelocalize/cli/util/FileListReaderTest.java
@@ -15,6 +15,113 @@ class FileListReaderTest
 
   private final FileListReader sut = new FileListReader();
 
+  @Test
+  void shouldFindMarkdownBlogPostsWithNamespaceAndLanguageKey() throws IOException
+  {
+    //given
+    String path = "./junit/blog-posts-with-lang-name-and-namespace/{lang}/{translationKey}_{ns}.md";
+
+    //when
+    List<FileToUpload> result = sut.findFilesToUpload(path);
+
+    //then
+    Assertions.assertThat(result)
+            .containsExactlyInAnyOrder(
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts-with-lang-name-and-namespace/en/ai-translations_common.md"))
+                            .withLanguage("en")
+                            .withNamespace("common")
+                            .withTranslationKey("ai-translations")
+                            .build(),
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts-with-lang-name-and-namespace/en/how-to-translate-website_common.md"))
+                            .withLanguage("en")
+                            .withNamespace("common")
+                            .withTranslationKey("how-to-translate-website")
+                            .build(),
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts-with-lang-name-and-namespace/pl/ai-translations_common.md"))
+                            .withLanguage("pl")
+                            .withNamespace("common")
+                            .withTranslationKey("ai-translations")
+                            .build(),
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts-with-lang-name-and-namespace/pl/how-to-translate-website_common.md"))
+                            .withLanguage("pl")
+                            .withNamespace("common")
+                            .withTranslationKey("how-to-translate-website")
+                            .build()
+            );
+  }
+
+  @Test
+  void shouldFindMarkdownBlogPostsWithoutExtension() throws IOException
+  {
+    //given
+    String path = "./junit/blog-posts/{translationKey}.md";
+
+    //when
+    List<FileToUpload> result = sut.findFilesToUpload(path);
+
+    //then
+    Assertions.assertThat(result)
+            .containsExactlyInAnyOrder(
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts/ai-translations.md"))
+                            .withTranslationKey("ai-translations")
+                            .build(),
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts/how-to-translate-website.md"))
+                            .withTranslationKey("how-to-translate-website")
+                            .build()
+            );
+  }
+
+  @Test
+  void shouldFindMarkdownBlogPostsWithExtension() throws IOException
+  {
+    //given
+    String path = "./junit/blog-posts/{translationKey}";
+
+    //when
+    List<FileToUpload> result = sut.findFilesToUpload(path);
+
+    //then
+    Assertions.assertThat(result)
+            .containsExactlyInAnyOrder(
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts/ai-translations.md"))
+                            .withTranslationKey("ai-translations.md")
+                            .build(),
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts/how-to-translate-website.md"))
+                            .withTranslationKey("how-to-translate-website.md")
+                            .build()
+            );
+  }
+
+  @Test
+  void shouldFindMarkdownBlogPostsWhenKeyAsDirName() throws IOException
+  {
+    //given
+    String path = "./junit/blog-posts-keys-as-dir-name/{translationKey}/index.md";
+
+    //when
+    List<FileToUpload> result = sut.findFilesToUpload(path);
+
+    //then
+    Assertions.assertThat(result)
+            .containsExactlyInAnyOrder(
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts-keys-as-dir-name/ai-translations/index.md"))
+                            .withTranslationKey("ai-translations")
+                            .build(),
+                    FileToUpload.builder()
+                            .withPath(Paths.get("./junit/blog-posts-keys-as-dir-name/how-to-translate-website/index.md"))
+                            .withTranslationKey("how-to-translate-website")
+                            .build()
+            );
+  }
 
   @Test
   void shouldFindJsonFilesWithInLocaleDirectoryWhenNamespaceFirst() throws IOException

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Translation services have been around for a long time.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Any web page can be viewed in multiple languages.`