include cleanup: gettext, language

src/about.cpp

@@ -15,9 +15,9 @@
 #include "events.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "image.hpp"
 #include "key.hpp"
-#include "language.hpp"
 #include "display.hpp"
 #include "show_dialog.hpp"
 #include "sdl_utils.hpp"

src/actions.cpp

@@ -18,8 +18,8 @@
 #include "events.hpp"
 #include "game_config.hpp"
 #include "game_events.hpp"
+#include "gettext.hpp"
 #include "key.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "pathfind.hpp"

src/dialogs.cpp

@@ -18,6 +18,7 @@
 #include "filesystem.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "help.hpp"
 #include "language.hpp"
 #include "log.hpp"

src/display.cpp

@@ -18,6 +18,7 @@
 #include "events.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "halo.hpp"
 #include "hotkeys.hpp"
 #include "image.hpp"

src/editor/editor.cpp

@@ -20,9 +20,9 @@
 #include "../font.hpp"
 #include "../game_config.hpp"
 #include "../gamestatus.hpp"
+#include "../gettext.hpp"
 #include "../key.hpp"
 #include "../widgets/menu.hpp"
-#include "../language.hpp"
 #include "../pathfind.hpp"
 #include "../playlevel.hpp"
 #include "../preferences.hpp"

src/editor/editor_dialogs.cpp

@@ -16,8 +16,8 @@
 #include "../show_dialog.hpp"
 #include "../config.hpp"
 #include "../events.hpp"
-#include "../language.hpp"
 #include "../game_config.hpp"
+#include "../gettext.hpp"
 #include "../mapgen.hpp"
 #include "../map_create.hpp"
 #include "../filesystem.hpp"

src/editor/editor_palettes.cpp

@@ -19,7 +19,7 @@
 #include "../show_dialog.hpp"
 #include "../image.hpp"
 #include "../reports.hpp"
-#include "../language.hpp"
+#include "../gettext.hpp"
 #include "../util.hpp"
 #include "../wassert.hpp"
 

src/font.cpp

@@ -17,7 +17,7 @@
 #include "font.hpp"
 #include "filesystem.hpp"
 #include "game_config.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
 #include "log.hpp"
 #include "sdl_utils.hpp"
 #include "team.hpp"

src/game.cpp

@@ -28,6 +28,7 @@
 #include "game_config.hpp"
 #include "game_events.hpp"
 #include "gamestatus.hpp"
+#include "gettext.hpp"
 #include "hotkeys.hpp"
 #include "intro.hpp"
 #include "key.hpp"

src/gettext.hpp

@@ -1,10 +1,12 @@
 #ifndef GETTEXT_HPP_INCLUDED
 #define GETTEXT_HPP_INCLUDED
 
+// gettext-related declarations
+
 #include "config.hpp"
 
-// gettext-related declarations
 #include <libintl.h>
+#include <string>
 
 const char* egettext (const char*);
 const char* sgettext (const char*);

src/help.cpp

@@ -17,6 +17,7 @@
 #include "events.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "help.hpp"
 #include "image.hpp"
 #include "language.hpp"

src/hotkeys.cpp

@@ -18,7 +18,7 @@
 #include "config.hpp"
 #include "events.hpp"
 #include "hotkeys.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
 #include "playlevel.hpp"
 #include "preferences.hpp"
 #include "show_dialog.hpp"

src/intro.cpp

@@ -16,10 +16,10 @@
 #include "events.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "image.hpp"
 #include "intro.hpp"
 #include "key.hpp"
-#include "language.hpp"
 #include "show_dialog.hpp"
 #include "sound.hpp"
 #include "util.hpp"

src/language.cpp

@@ -14,6 +14,7 @@
 #include "global.hpp"
 
 #include "config.hpp"
+#include "gettext.hpp"
 #include "language.hpp"
 #include "preferences.hpp"
 #include "util.hpp"

src/language.hpp

@@ -13,9 +13,6 @@
 #ifndef LANGUAGE_HPP_INCLUDED
 #define LANGUAGE_HPP_INCLUDED
 
-#include "config.hpp"
-#include "gettext.hpp"
-
 #include <map>
 #include <string>
 #include <vector>

src/mapgen_dialog.cpp

@@ -4,7 +4,7 @@
 
 #include "events.hpp"
 #include "font.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
 #include "mapgen.hpp"
 #include "show_dialog.hpp"
 #include "util.hpp"

src/playlevel.cpp

@@ -16,11 +16,11 @@
 #include "cursor.hpp"
 #include "events.hpp"
 #include "filesystem.hpp"
+#include "gettext.hpp"
 #include "halo.hpp"
 #include "help.hpp"
 #include "hotkeys.hpp"
 #include "intro.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "mapgen.hpp"
 #include "map_create.hpp"

src/playturn.cpp

@@ -15,10 +15,10 @@
 
 #include "actions.hpp"
 #include "events.hpp"
+#include "gettext.hpp"
 #include "help.hpp"
 #include "hotkeys.hpp"
 #include "image.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "map_label.hpp"
 #include "mouse.hpp"

src/preferences.cpp

@@ -19,8 +19,8 @@
 #include "events.hpp"
 #include "filesystem.hpp"
 #include "font.hpp"
+#include "gettext.hpp"
 #include "hotkeys.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "preferences.hpp"
 #include "show_dialog.hpp"

src/reports.cpp

@@ -3,6 +3,7 @@
 #include "actions.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "language.hpp"
 #include "reports.hpp"
 #include "wassert.hpp"

src/show_dialog.cpp

@@ -19,10 +19,10 @@
 #include "cursor.hpp"
 #include "events.hpp"
 #include "font.hpp"
+#include "gettext.hpp"
 #include "help.hpp"
 #include "hotkeys.hpp"
 #include "image.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "playlevel.hpp"
 #include "show_dialog.hpp"

src/titlescreen.cpp

@@ -8,7 +8,7 @@
 #include "game_config.hpp"
 #include "hotkeys.hpp"
 #include "key.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
 #include "log.hpp"
 #include "preferences.hpp"
 #include "sdl_utils.hpp"

src/unit.cpp

@@ -15,7 +15,7 @@
 
 #include "game_config.hpp"
 #include "gamestatus.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
 #include "log.hpp"
 #include "pathfind.hpp"
 #include "preferences.hpp"

src/unit_types.cpp

@@ -15,7 +15,7 @@
 
 #include "game_config.hpp"
 #include "gamestatus.hpp"
-#include "language.hpp"
+#include "gettext.hpp"
 #include "log.hpp"
 #include "unit_types.hpp"
 #include "util.hpp"

src/widgets/file_chooser.cpp

@@ -18,7 +18,7 @@
 #include "../events.hpp"
 #include "../filesystem.hpp"
 #include "../font.hpp"
-#include "../language.hpp"
+#include "../gettext.hpp"
 #include "../show_dialog.hpp"
 #include "../wml_separators.hpp"
 #include "file_chooser.hpp"