Renamed src/server/{i18n -> i18n_utils}.h

... so that i18n.h can be introduced in include/

scripts/kiwix-compile-i18n

@@ -61,7 +61,7 @@ lang_table_entry_cxx_template = '''
 
 cxxfile_template = '''// This file is automatically generated. Do not modify it.
 
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 
 namespace kiwix {
 namespace i18n {

src/html_dumper.cpp

@@ -3,7 +3,7 @@
 #include "tools/otherTools.h"
 #include "tools.h"
 #include "tools/regexTools.h"
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 
 namespace kiwix
 {

src/search_renderer.cpp

@@ -32,7 +32,7 @@
 #include "libkiwix-resources.h"
 #include "tools/stringTools.h"
 
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 
 namespace kiwix
 {

src/server/i18n.cpp

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-#include "i18n.h"
+#include "i18n_utils.h"
 
 #include "tools/otherTools.h"
 

src/server/i18n_utils.h

@@ -17,8 +17,8 @@
  * MA 02110-1301, USA.
  */
 
-#ifndef KIWIX_SERVER_I18N
+#ifndef KIWIX_SERVER_I18N_UTILS
-#define KIWIX_SERVER_I18N
+#define KIWIX_SERVER_I18N_UTILS
 
 #include <map>
 #include <string>
@@ -135,4 +135,4 @@ std::string selectMostSuitableLanguage(const UserLangPreferences& prefs);
 
 } // namespace kiwix
 
-#endif // KIWIX_SERVER_I18N
+#endif // KIWIX_SERVER_I18N_UTILS

src/server/internalServer.cpp

@@ -54,7 +54,7 @@ extern "C" {
 #include "search_renderer.h"
 #include "opds_dumper.h"
 #include "html_dumper.h"
-#include "i18n.h"
+#include "i18n_utils.h"
 
 #include <zim/uuid.h>
 #include <zim/error.h>

src/server/request_context.cpp

@@ -28,7 +28,7 @@
 #include <cctype>
 
 #include "tools/stringTools.h"
-#include "i18n.h"
+#include "i18n_utils.h"
 
 namespace kiwix {
 

src/server/response.h

@@ -27,7 +27,7 @@
 #include <mustache.hpp>
 #include "byte_range.h"
 #include "etag.h"
-#include "i18n.h"
+#include "i18n_utils.h"
 
 #include <zim/item.h>
 

src/tools/otherTools.cpp

@@ -32,7 +32,7 @@
 #endif
 
 #include "tools/stringTools.h"
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 #include "libkiwix-resources.h"
 
 #include <map>

test/i18n.cpp

@@ -1,4 +1,4 @@
-#include "../src/server/i18n.h"
+#include "../src/server/i18n_utils.h"
 #include "gtest/gtest.h"
 
 using namespace kiwix;

test/otherTools.cpp

@@ -20,7 +20,7 @@
 #include "gtest/gtest.h"
 #include "../src/tools/otherTools.h"
 #include "zim/suggestion_iterator.h"
-#include "../src/server/i18n.h"
+#include "../src/server/i18n_utils.h"
 
 #include <regex>