Update translations and fix test

Includes Return-To-The-Roots/languages#41
fixing a crash where the German translation was missing a format string.

Adapt the test to catch this:
If we don't "translate" something in the `en_GB` file it won't show up
in the `.mo` file and won't be checked.

As the test checks all translated strings (see the `continue`) anyways
iterate over the translation file instead, backreferencing the "gold"
entries.

Author: Flamefire

external/languages

@@ -1,10 +1,10 @@
-# Copyright (C) 2005 - 2021 Settlers Freaks <sf-team at siedler25.org>
+# Copyright (C) 2005 - 2026 Settlers Freaks <sf-team at siedler25.org>
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 configure_file(languageFiles.h.cmake languageFiles.h)
 add_testcase(NAME LanguageFiles
-    LIBS mygettext s25util::common Boost::filesystem rttr::vld
+    LIBS s25Common mygettext s25util::common Boost::filesystem rttr::vld
     INCLUDES ${CMAKE_CURRENT_BINARY_DIR}
     COST 15
 )

tests/languages/CMakeLists.txt

@@ -1,27 +1,42 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #define BOOST_TEST_MODULE RTTR_LanguageFiles
 
+#include "helpers/OptionalIO.h"
 #include "languageFiles.h"
 #include "mygettext/readCatalog.h"
 #include "s25util/utf8.h"
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <boost/test/unit_test.hpp>
 #include <map>
+#include <optional>
 
 #if RTTR_HAS_VLD
 #    include <vld.h>
 #endif
 
+namespace {
 struct FormatProperties
 {
-    int numParameters;
+    std::optional<int> numParameters;
 };
 
-static std::map<std::string, FormatProperties> getGoldMapping()
+FormatProperties getFormatProperties(const std::string& str)
+{
+    try
+    {
+        const boost::format fmt(str);
+        return FormatProperties{fmt.expected_args()};
+    } catch(const std::exception&)
+    {
+        return FormatProperties{std::nullopt};
+    }
+}
+
+std::map<std::string, FormatProperties> getGoldMapping()
 {
     const std::map<std::string, std::string> translations =
       mygettext::readCatalog(std::string(RTTR_TRANSLATION_DIR) + "/rttr-en_GB.mo", "UTF-8");
@@ -30,19 +45,12 @@ static std::map<std::string, FormatProperties> getGoldMapping()
     {
         if(entry.first.empty())
             continue;
-        try
-        {
-            const boost::format fmt(entry.first);
-            result.emplace(std::make_pair(entry.first, FormatProperties{fmt.expected_args()}));
-        } catch(const std::exception&)
-        {
-            result.emplace(std::make_pair(entry.first, FormatProperties{0}));
-        }
+        result.emplace(entry.first, getFormatProperties(entry.first));
     }
     return result;
 }
 
-static std::string replaceLF(std::string s)
+std::string replaceLF(std::string s)
 {
     size_t index = 0;
     while((index = s.find('\n')) != std::string::npos)
@@ -51,41 +59,38 @@ static std::string replaceLF(std::string s)
     }
     return s;
 }
+} // namespace
 
 BOOST_AUTO_TEST_CASE(AllFilesHaveValidFormat)
 {
     const auto goldMapping = getGoldMapping();
-    for(const auto& it : boost::filesystem::directory_iterator(RTTR_TRANSLATION_DIR))
+    for(const auto& itFile : boost::filesystem::directory_iterator(RTTR_TRANSLATION_DIR))
     {
-        if(!is_regular_file(it.status()) || it.path().extension() != ".mo")
+        if(!is_regular_file(itFile.status()) || itFile.path().extension() != ".mo")
             continue; // LCOV_EXCL_LINE
-        const auto translatedStrings = mygettext::readCatalog(it.path().string(), "UTF-8");
+        const auto translatedStrings = mygettext::readCatalog(itFile.path().string(), "UTF-8");
 
-        BOOST_TEST_CONTEXT("Locale: " << it.path().stem())
-        for(const auto& entry : goldMapping)
+        BOOST_TEST_CONTEXT("Locale: " << itFile.path().stem())
+        for(const auto& entry : translatedStrings)
         {
-            const auto it = translatedStrings.find(entry.first);
-            if(it == translatedStrings.end())
-                continue; // Not translated
-            BOOST_TEST_CONTEXT("Entry '" << replaceLF(it->first) << "' => '" << replaceLF(it->second) << "'")
+            const auto itGoldEntry = goldMapping.find(entry.first);
+            const auto& [origTxt, translation] = entry;
+            BOOST_TEST_CONTEXT("Entry '" << replaceLF(origTxt) << "' => '" << replaceLF(translation) << "'")
             {
-                BOOST_TEST(s25util::isValidUTF8(it->second));
+                BOOST_TEST(s25util::isValidUTF8(translation));
                 // Note: "Check 50%" is invalid (ends in %) but "50% checked" is not and translations might move the %
                 // around Hence rely on the number of format args which should be consistent
-                try
-                {
-                    const boost::format fmt(it->second);
-                    BOOST_TEST(fmt.expected_args() == entry.second.numParameters);
-                } catch(const std::exception&)
+                FormatProperties origProps = getFormatProperties(origTxt);
+                FormatProperties transProps = getFormatProperties(translation);
+                // Orig text replacements must match with gold version
+                // Might not exist if orig text is not "translated" (already in English)
+                if(itGoldEntry != goldMapping.end())
+                    BOOST_TEST(origProps.numParameters == itGoldEntry->second.numParameters);
+                if(origProps.numParameters.has_value() == transProps.numParameters.has_value())
                 {
-                    // Should have been a format string
-                    if(entry.second.numParameters > 0)
-                    {
-                        // LCOV_EXCL_START
-                        BOOST_TEST_ERROR("Invalid format string");
-                        // LCOV_EXCL_STOP
-                    }
-                }
+                    BOOST_TEST(origProps.numParameters == transProps.numParameters);
+                } else if(origProps.numParameters > 0)
+                    BOOST_TEST_ERROR("Invalid format string in translation"); // LCOV_EXCL_LINE
             }
         }
     }