move translate_string definition back to cpp file, to not include tra…

…nslations.h in strings.h
Desour · Oct 16, 2024 · 54402ab · 54402ab
1 parent fad1470
commit 54402ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/util/string.cpp b/src/util/string.cpp
@@ -932,6 +932,11 @@ std::wstring translate_string(std::wstring_view s, Translations *translations)
 	return res;
 }
 
+std::wstring translate_string(std::wstring_view s)
+{
+	return translate_string(s, g_client_translations);
+}
+
 static const std::array<std::wstring_view, 30> disallowed_dir_names = {
 	// Problematic filenames from here:
 	// https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#file-and-directory-names

diff --git a/src/util/string.h b/src/util/string.h
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if IS_CLIENT_BUILD
 #include "irrString.h"
 #endif
-#include "translation.h"
 #include <cstdlib>
 #include <string>
 #include <string_view>
@@ -657,10 +656,7 @@ std::vector<std::basic_string<T> > split(const std::basic_string<T> &s, T delim)
 
 std::wstring translate_string(std::wstring_view s, Translations *translations);
 
-inline std::wstring translate_string(std::wstring_view s)
-{
-	return translate_string(s, g_client_translations);
-}
+std::wstring translate_string(std::wstring_view s);
 
 inline std::wstring unescape_translate(std::wstring_view s)
 {