From 5a77ec62b57e886b5ea7b74c9ddae578499824c5 Mon Sep 17 00:00:00 2001
From: Michal Rudolf <michal.rudolf23@gmail.com>
Date: Mon, 10 Jun 2024 13:46:17 +0200
Subject: [PATCH] Change japanese language code JP to ISO 639's JA

---
 CMakePresets.json                             |  16 +++++------
 ProjectOptions.cmake                          |   2 +-
 src/gui/fonts.cpp                             |   4 +--
 src/gui/res/mini_used_imgs.txt                |   2 +-
 .../{flag_jp_16x11.png => flag_ja_16x11.png}  | Bin
 .../{flag_jp_16x11.png => flag_ja_16x11.png}  | Bin
 src/gui/screen_menu_languages.cpp             |   4 +--
 src/gui/screen_menu_languages.hpp             |   8 ++++--
 .../Prusa-Firmware-Buddy_ja.mo}               | Bin
 .../Prusa-Firmware-Buddy_ja.po}               |   0
 src/lang/translation_provider_CPUFLASH.cpp    |  20 +++++++-------
 src/lang/translation_provider_FILE.cpp        |   8 +++---
 .../translator/option/enable_translation_ja.h |  11 ++++++++
 .../translator/option/enable_translation_jp.h |  11 --------
 .../unit/lang/translator/providerCPUFLASH.cpp |  26 +++++++++---------
 tests/unit/lang/translator/providerFILE.cpp   |  10 +++----
 utils/presets/presets.json                    |   6 ++--
 17 files changed, 65 insertions(+), 63 deletions(-)
 rename src/gui/res/png/{flag_jp_16x11.png => flag_ja_16x11.png} (100%)
 rename src/gui/res/png_before_resize/{flag_jp_16x11.png => flag_ja_16x11.png} (100%)
 rename src/lang/po/{jp/Prusa-Firmware-Buddy_jp.mo => ja/Prusa-Firmware-Buddy_ja.mo} (100%)
 rename src/lang/po/{jp/Prusa-Firmware-Buddy_jp.po => ja/Prusa-Firmware-Buddy_ja.po} (100%)
 create mode 100644 tests/unit/lang/translator/option/enable_translation_ja.h
 delete mode 100644 tests/unit/lang/translator/option/enable_translation_jp.h

diff --git a/CMakePresets.json b/CMakePresets.json
index 888a1f8c13..697f6e3f52 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1979,7 +1979,7 @@
             }
         },
         {
-            "name": "mini-en-jp_debug_boot",
+            "name": "mini-en-ja_debug_boot",
             "generator": "Ninja",
             "binaryDir": "build-vscode-buddy",
             "cacheVariables": {
@@ -2009,7 +2009,7 @@
                 },
                 "TRANSLATIONS_LIST": {
                     "type": "STRING",
-                    "value": "jp"
+                    "value": "ja"
                 },
                 "BOOTLOADER": {
                     "type": "STRING",
@@ -2046,7 +2046,7 @@
             }
         },
         {
-            "name": "mini-en-jp_debug_noboot",
+            "name": "mini-en-ja_debug_noboot",
             "generator": "Ninja",
             "binaryDir": "build-vscode-buddy",
             "cacheVariables": {
@@ -2076,7 +2076,7 @@
                 },
                 "TRANSLATIONS_LIST": {
                     "type": "STRING",
-                    "value": "jp"
+                    "value": "ja"
                 },
                 "BOOTLOADER": {
                     "type": "STRING",
@@ -2113,7 +2113,7 @@
             }
         },
         {
-            "name": "mini-en-jp_release_boot",
+            "name": "mini-en-ja_release_boot",
             "generator": "Ninja",
             "binaryDir": "build-vscode-buddy",
             "cacheVariables": {
@@ -2143,7 +2143,7 @@
                 },
                 "TRANSLATIONS_LIST": {
                     "type": "STRING",
-                    "value": "jp"
+                    "value": "ja"
                 },
                 "BOOTLOADER": {
                     "type": "STRING",
@@ -2180,7 +2180,7 @@
             }
         },
         {
-            "name": "mini-en-jp_release_noboot",
+            "name": "mini-en-ja_release_noboot",
             "generator": "Ninja",
             "binaryDir": "build-vscode-buddy",
             "cacheVariables": {
@@ -2210,7 +2210,7 @@
                 },
                 "TRANSLATIONS_LIST": {
                     "type": "STRING",
-                    "value": "jp"
+                    "value": "ja"
                 },
                 "BOOTLOADER": {
                     "type": "STRING",
diff --git a/ProjectOptions.cmake b/ProjectOptions.cmake
index f94203069f..7321e92d95 100644
--- a/ProjectOptions.cmake
+++ b/ProjectOptions.cmake
@@ -359,7 +359,7 @@ set(LANGUAGES_AVAILABLE
     ES
     FR
     IT
-    JP
+    JA
     PL
     )
 if("${TRANSLATIONS_LIST}" STREQUAL "<default>")
diff --git a/src/gui/fonts.cpp b/src/gui/fonts.cpp
index 9eb10c2f60..f3249b5cd7 100644
--- a/src/gui/fonts.cpp
+++ b/src/gui/fonts.cpp
@@ -5,10 +5,10 @@
 #include "fonts.hpp"
 #include "config.h"
 #include <guiconfig/guiconfig.h>
-#include <option/enable_translation_jp.h>
+#include <option/enable_translation_ja.h>
 
 #ifdef USE_ST7789
-    #if ENABLE_TRANSLATION_JP()
+    #if ENABLE_TRANSLATION_JA()
         #include "res/cc/font_regular_7x13_full.hpp" //Font::small
         #include "res/cc/font_regular_11x18_full.hpp" //Font::normal
         #include "res/cc/font_regular_9x16_full.hpp" //Font::special
diff --git a/src/gui/res/mini_used_imgs.txt b/src/gui/res/mini_used_imgs.txt
index 884905401e..a5d9e18b6a 100644
--- a/src/gui/res/mini_used_imgs.txt
+++ b/src/gui/res/mini_used_imgs.txt
@@ -119,7 +119,7 @@ flag_es_16x11.png
 flag_fr_16x11.png
 flag_it_16x11.png
 flag_pl_16x11.png
-flag_jp_16x11.png
+flag_ja_16x11.png
 language_white_16x16.png
 ok_color_16x16.png
 na_color_16x16.png
diff --git a/src/gui/res/png/flag_jp_16x11.png b/src/gui/res/png/flag_ja_16x11.png
similarity index 100%
rename from src/gui/res/png/flag_jp_16x11.png
rename to src/gui/res/png/flag_ja_16x11.png
diff --git a/src/gui/res/png_before_resize/flag_jp_16x11.png b/src/gui/res/png_before_resize/flag_ja_16x11.png
similarity index 100%
rename from src/gui/res/png_before_resize/flag_jp_16x11.png
rename to src/gui/res/png_before_resize/flag_ja_16x11.png
diff --git a/src/gui/screen_menu_languages.cpp b/src/gui/screen_menu_languages.cpp
index fd0b222c51..beaf18fff4 100644
--- a/src/gui/screen_menu_languages.cpp
+++ b/src/gui/screen_menu_languages.cpp
@@ -75,10 +75,10 @@ uint16_t MI_POLISH::LangCode() const {
 }
 
 MI_JAPANESE::MI_JAPANESE()
-    : MI_LangBase(label, &img::flag_jp_16x11, is_hidden_t::no) {}
+    : MI_LangBase(label, &img::flag_ja_16x11, is_hidden_t::no) {}
 
 uint16_t MI_JAPANESE::LangCode() const {
-    return Translations::MakeLangCode("jp");
+    return Translations::MakeLangCode("ja");
 }
 
 MI_TEST_LANG::MI_TEST_LANG()
diff --git a/src/gui/screen_menu_languages.hpp b/src/gui/screen_menu_languages.hpp
index 4295ccf321..0a8f8e19fb 100644
--- a/src/gui/screen_menu_languages.hpp
+++ b/src/gui/screen_menu_languages.hpp
@@ -15,7 +15,9 @@
 #include <option/enable_translation_fr.h>
 #include <option/enable_translation_it.h>
 #include <option/enable_translation_pl.h>
-#include <option/enable_translation_jp.h>
+#include <option/enable_translation_ja.h>
+#include <str_utils.hpp>
+#include <img_resources.hpp>
 
 class MI_LangBase : public IWindowMenuItem {
 public:
@@ -142,7 +144,7 @@ using ScreenMenuLanguages__ = ScreenMenu<EFooter::Off, MI_RETURN, MI_ENGLISH,
 #if ENABLE_TRANSLATION_PL()
     MI_POLISH,
 #endif
-#if ENABLE_TRANSLATION_JP()
+#if ENABLE_TRANSLATION_JA()
     MI_JAPANESE,
 #endif
     MI_TEST_LANG>;
@@ -174,7 +176,7 @@ using ScreenMenuLanguagesNoReturn__ = ScreenMenu<EFooter::Off, MI_ENGLISH,
 #if ENABLE_TRANSLATION_PL()
     MI_POLISH,
 #endif
-#if ENABLE_TRANSLATION_JP()
+#if ENABLE_TRANSLATION_JA()
     MI_JAPANESE,
 #endif
     MI_TEST_LANG>;
diff --git a/src/lang/po/jp/Prusa-Firmware-Buddy_jp.mo b/src/lang/po/ja/Prusa-Firmware-Buddy_ja.mo
similarity index 100%
rename from src/lang/po/jp/Prusa-Firmware-Buddy_jp.mo
rename to src/lang/po/ja/Prusa-Firmware-Buddy_ja.mo
diff --git a/src/lang/po/jp/Prusa-Firmware-Buddy_jp.po b/src/lang/po/ja/Prusa-Firmware-Buddy_ja.po
similarity index 100%
rename from src/lang/po/jp/Prusa-Firmware-Buddy_jp.po
rename to src/lang/po/ja/Prusa-Firmware-Buddy_ja.po
diff --git a/src/lang/translation_provider_CPUFLASH.cpp b/src/lang/translation_provider_CPUFLASH.cpp
index ef1ce91ac5..5668b78d25 100644
--- a/src/lang/translation_provider_CPUFLASH.cpp
+++ b/src/lang/translation_provider_CPUFLASH.cpp
@@ -9,7 +9,7 @@
 #include <option/enable_translation_es.h>
 #include <option/enable_translation_it.h>
 #include <option/enable_translation_pl.h>
-#include <option/enable_translation_jp.h>
+#include <option/enable_translation_ja.h>
 
 #if HAS_TRANSLATIONS()
     #include <option/translations_in_extflash.h>
@@ -154,23 +154,23 @@ ProviderRegistrator plReg("pl", &pl);
 } // namespace
         #endif
 
-        #if ENABLE_TRANSLATION_JP()
-struct StringTableJP {
+        #if ENABLE_TRANSLATION_JA()
+struct StringTableJA {
     static const uint32_t stringBegins[]; ///< this will get statically precomputed for each translation language separately
     static const uint8_t utf8Raw[]; ///< a piece of memory where the null-terminated strings are situated
 };
 
-using CPUFLASHTranslationProviderJP = CPUFLASHTranslationProvider<StringTableJP>;
+using CPUFLASHTranslationProviderJA = CPUFLASHTranslationProvider<StringTableJA>;
 
-            // precomputed indices and strings for the JP language
-            #include "stringBegins.jp.hpp"
-            #include "utf8Raw.jp.hpp"
+            // precomputed indices and strings for the JA language
+            #include "stringBegins.ja.hpp"
+            #include "utf8Raw.ja.hpp"
 template <>
-const CPUFLASHTranslationProviderJP::RawData CPUFLASHTranslationProviderJP::rawData;
+const CPUFLASHTranslationProviderJA::RawData CPUFLASHTranslationProviderJA::rawData;
 
 namespace {
-static const CPUFLASHTranslationProviderJP jp;
-ProviderRegistrator jpReg("jp", &jp);
+static const CPUFLASHTranslationProviderJA ja;
+ProviderRegistrator jaReg("ja", &ja);
 
 } // namespace
         #endif
diff --git a/src/lang/translation_provider_FILE.cpp b/src/lang/translation_provider_FILE.cpp
index 96c9c1200e..35d583835f 100644
--- a/src/lang/translation_provider_FILE.cpp
+++ b/src/lang/translation_provider_FILE.cpp
@@ -7,7 +7,7 @@
 #include <option/enable_translation_fr.h>
 #include <option/enable_translation_it.h>
 #include <option/enable_translation_pl.h>
-#include <option/enable_translation_jp.h>
+#include <option/enable_translation_ja.h>
 
 extern "C" size_t strlcpy(char *dst, const char *src, size_t dsize);
 
@@ -96,9 +96,9 @@ static const FILETranslationProvider pl("/internal/res/lang/pl.mo");
 ProviderRegistrator plReg("pl", &pl);
         #endif
 
-        #if ENABLE_TRANSLATION_JP()
-static const FILETranslationProvider jp("/internal/res/lang/jp.mo");
-ProviderRegistrator jpReg("jp", &jp);
+        #if ENABLE_TRANSLATION_JA()
+static const FILETranslationProvider ja("/internal/res/lang/ja.mo");
+ProviderRegistrator jaReg("ja", &ja);
         #endif
 } // namespace
     #endif
diff --git a/tests/unit/lang/translator/option/enable_translation_ja.h b/tests/unit/lang/translator/option/enable_translation_ja.h
new file mode 100644
index 0000000000..f8fb1c81e5
--- /dev/null
+++ b/tests/unit/lang/translator/option/enable_translation_ja.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#define ENABLE_TRANSLATION_JA() 1
+
+#ifdef __cplusplus
+
+namespace option {
+inline constexpr bool enable_translation_ja = 1;
+}
+
+#endif
diff --git a/tests/unit/lang/translator/option/enable_translation_jp.h b/tests/unit/lang/translator/option/enable_translation_jp.h
deleted file mode 100644
index 389ac57d38..0000000000
--- a/tests/unit/lang/translator/option/enable_translation_jp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#define ENABLE_TRANSLATION_JP() 1
-
-#ifdef __cplusplus
-
-namespace option {
-inline constexpr bool enable_translation_jp = 1;
-}
-
-#endif
diff --git a/tests/unit/lang/translator/providerCPUFLASH.cpp b/tests/unit/lang/translator/providerCPUFLASH.cpp
index 665186e546..ba93d2999f 100644
--- a/tests/unit/lang/translator/providerCPUFLASH.cpp
+++ b/tests/unit/lang/translator/providerCPUFLASH.cpp
@@ -177,7 +177,7 @@ uint16_t StringTablePLTest::stringBeginsSize;
 using CPUFLASHTranslationProviderPLTest = CPUFLASHTranslationProvider<StringTablePLTest>;
 
 /*
-struct StringTableJPTest {
+struct StringTableJATest {
     // this will get statically precomputed for each translation language separately
     static uint16_t stringCount, stringBytes;
     static uint16_t stringBeginsSize;
@@ -193,12 +193,12 @@ struct StringTableJPTest {
     }
 };
 
-uint32_t StringTableJPTest::stringBegins[maxStringBegins], StringTableJPTest::utf8RawSize;
-uint8_t StringTableJPTest::utf8Raw[maxUtf8Raw];
-uint16_t StringTableJPTest::stringCount, StringTableJPTest::stringBytes;
-uint16_t StringTableJPTest::stringBeginsSize;
+uint32_t StringTableJATest::stringBegins[maxStringBegins], StringTableJATest::utf8RawSize;
+uint8_t StringTableJATest::utf8Raw[maxUtf8Raw];
+uint16_t StringTableJATest::stringCount, StringTableJATest::stringBytes;
+uint16_t StringTableJATest::stringBeginsSize;
 
-using CPUFLASHTranslationProviderJPTest = CPUFLASHTranslationProvider<StringTableJPTest>;
+using CPUFLASHTranslationProviderJATest = CPUFLASHTranslationProvider<StringTableJATest>;
 */
 
 TEST_CASE("providerCPUFLASH::StringTableAt", "[translator]") {
@@ -295,7 +295,7 @@ TEST_CASE("providerCPUFLASH::Translations singleton", "[translator]") {
     REQUIRE(Translations::Instance().LangExists(Translations::MakeLangCode("fr")));
     REQUIRE(Translations::Instance().LangExists(Translations::MakeLangCode("it")));
     REQUIRE(Translations::Instance().LangExists(Translations::MakeLangCode("pl")));
-    // REQUIRE(Translations::Instance().LangExists(Translations::MakeLangCode("jp")));
+    // REQUIRE(Translations::Instance().LangExists(Translations::MakeLangCode("ja")));
 }
 
 /// This is a complex test of the whole translation mechanism
@@ -316,7 +316,7 @@ TEST_CASE("providerCPUFLASH::ComplexTest", "[translator]") {
     CPUFLASHTranslationProviderFRTest providerFR;
     CPUFLASHTranslationProviderITTest providerIT;
     CPUFLASHTranslationProviderPLTest providerPL;
-    // CPUFLASHTranslationProviderPLTest providerJP;
+    // CPUFLASHTranslationProviderPLTest providerJA;
     deque<string> rawStringKeys;
     FillHashTableCPUFLASHProvider(CPUFLASHTranslationProviderBase::hash_table, "keys.txt", rawStringKeys);
 
@@ -328,7 +328,7 @@ TEST_CASE("providerCPUFLASH::ComplexTest", "[translator]") {
     REQUIRE(LoadTranslatedStringsFile("fr.txt", &frStrings));
     REQUIRE(LoadTranslatedStringsFile("it.txt", &itStrings));
     REQUIRE(LoadTranslatedStringsFile("pl.txt", &plStrings));
-    // REQUIRE(LoadTranslatedStringsFile("jp.txt", &jpStrings));
+    // REQUIRE(LoadTranslatedStringsFile("ja.txt", &jaStrings));
 
     // need to have at least the same amount of translations like the keys (normally there will be an exact number of them)
     REQUIRE(rawStringKeys.size() <= csStrings.size());
@@ -337,7 +337,7 @@ TEST_CASE("providerCPUFLASH::ComplexTest", "[translator]") {
     REQUIRE(rawStringKeys.size() <= frStrings.size());
     REQUIRE(rawStringKeys.size() <= itStrings.size());
     REQUIRE(rawStringKeys.size() <= plStrings.size());
-    // REQUIRE(rawStringKeys.size() <= jpStrings.size());
+    // REQUIRE(rawStringKeys.size() <= jaStrings.size());
 
     // now make the string table from cs.txt
     FillStringTable<StringTableCSTest>(csStrings);
@@ -346,7 +346,7 @@ TEST_CASE("providerCPUFLASH::ComplexTest", "[translator]") {
     FillStringTable<StringTableFRTest>(frStrings);
     FillStringTable<StringTableITTest>(itStrings);
     FillStringTable<StringTablePLTest>(plStrings);
-    // FillStringTable<StringTableJPTest>(jpStrings);
+    // FillStringTable<StringTableJATest>(jaStrings);
 
     // prepare a map for comparison
     set<unichar> nonASCIICharacters;
@@ -367,7 +367,7 @@ TEST_CASE("providerCPUFLASH::ComplexTest", "[translator]") {
     REQUIRE(CheckAllTheStrings(rawStringKeys, frStrings, providerFR, nonASCIICharacters, "fr"));
     REQUIRE(CheckAllTheStrings(rawStringKeys, itStrings, providerIT, nonASCIICharacters, "it"));
     REQUIRE(CheckAllTheStrings(rawStringKeys, plStrings, providerPL, nonASCIICharacters, "pl"));
-    // REQUIRE(CheckAllTheStrings(rawStringKeys, jpStrings, providerJP, nonASCIICharacters, "jp"));
+    // REQUIRE(CheckAllTheStrings(rawStringKeys, jaStrings, providerJA, nonASCIICharacters, "ja"));
 
     CompareHashTables();
 
@@ -377,7 +377,7 @@ TEST_CASE("providerCPUFLASH::ComplexTest", "[translator]") {
     CompareProviders(&providerFR, "fr");
     CompareProviders(&providerIT, "it");
     CompareProviders(&providerPL, "pl");
-    // CompareProviders(&providerJP, "jp");
+    // CompareProviders(&providerJA, "ja");
 
     // Check the content of generated non-ascii-chars - to see, if we have enough font bitmaps
 
diff --git a/tests/unit/lang/translator/providerFILE.cpp b/tests/unit/lang/translator/providerFILE.cpp
index ebc1c34a08..c5ef1dc6e5 100644
--- a/tests/unit/lang/translator/providerFILE.cpp
+++ b/tests/unit/lang/translator/providerFILE.cpp
@@ -16,7 +16,7 @@ TEST_CASE("providerFILE::Translations test", "[translator]") {
     FILETranslationProvider providerFR("MO/fr.mo");
     FILETranslationProvider providerIT("MO/it.mo");
     FILETranslationProvider providerPL("MO/pl.mo");
-    // FILETranslationProvider providerPL("MO/jp.mo");
+    // FILETranslationProvider providerPL("MO/ja.mo");
 
     // load transtaled strings
     deque<string> csStrings, deStrings, esStrings, frStrings, itStrings, plStrings;
@@ -26,7 +26,7 @@ TEST_CASE("providerFILE::Translations test", "[translator]") {
     REQUIRE(LoadTranslatedStringsFile("MO/fr.txt", &frStrings));
     REQUIRE(LoadTranslatedStringsFile("MO/it.txt", &itStrings));
     REQUIRE(LoadTranslatedStringsFile("MO/pl.txt", &plStrings));
-    // REQUIRE(LoadTranslatedStringsFile("MO/jp.txt", &jpStrings));
+    // REQUIRE(LoadTranslatedStringsFile("MO/ja.txt", &jaStrings));
 
     // need to have at least the same amount of translations like the keys (normally there will be an exact number of them)
     REQUIRE(stringKeys.size() <= csStrings.size());
@@ -35,7 +35,7 @@ TEST_CASE("providerFILE::Translations test", "[translator]") {
     REQUIRE(stringKeys.size() <= frStrings.size());
     REQUIRE(stringKeys.size() <= itStrings.size());
     REQUIRE(stringKeys.size() <= plStrings.size());
-    // REQUIRE(stringKeys.size() <= jpStrings.size());
+    // REQUIRE(stringKeys.size() <= jaStrings.size());
 
     set<unichar> nonASCIICharacters;
     {
@@ -55,7 +55,7 @@ TEST_CASE("providerFILE::Translations test", "[translator]") {
     REQUIRE(providerFR.EnsureFile());
     REQUIRE(providerIT.EnsureFile());
     REQUIRE(providerPL.EnsureFile());
-    // REQUIRE(providerJP.EnsureFile());
+    // REQUIRE(providerJA.EnsureFile());
 
     REQUIRE(CheckAllTheStrings(stringKeys, csStrings, providerCS, nonASCIICharacters, "cs"));
     REQUIRE(CheckAllTheStrings(stringKeys, deStrings, providerDE, nonASCIICharacters, "de"));
@@ -63,7 +63,7 @@ TEST_CASE("providerFILE::Translations test", "[translator]") {
     REQUIRE(CheckAllTheStrings(stringKeys, frStrings, providerFR, nonASCIICharacters, "fr"));
     REQUIRE(CheckAllTheStrings(stringKeys, itStrings, providerIT, nonASCIICharacters, "it"));
     REQUIRE(CheckAllTheStrings(stringKeys, plStrings, providerPL, nonASCIICharacters, "pl"));
-    // REQUIRE(CheckAllTheStrings(stringKeys, jpStrings, providerJP, nonASCIICharacters, "jp"));
+    // REQUIRE(CheckAllTheStrings(stringKeys, jaStrings, providerJA, nonASCIICharacters, "ja"));
 
     CAPTURE(stringKeys.size());
 }
diff --git a/utils/presets/presets.json b/utils/presets/presets.json
index b6fe078d51..81ddd1838b 100644
--- a/utils/presets/presets.json
+++ b/utils/presets/presets.json
@@ -92,15 +92,15 @@
             }
         },
         {
-            "name": "mini-en-jp",
-            "description": "Original Prusa MINI (EN & JP translation)",
+            "name": "mini-en-ja",
+            "description": "Original Prusa MINI (EN & JA translation)",
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "PRINTER": "MINI",
                 "BOARD": "BUDDY",
                 "BOARD_VERSION": "1.0.0",
                 "DEVELOPMENT_ITEMS_ENABLED": true,
-                "TRANSLATIONS_LIST": "jp"
+                "TRANSLATIONS_LIST": "ja"
             }
         },
         {