Make translations enable by default on all platforms

Author: sharkwouter

CMakeLists.txt

@@ -163,6 +163,19 @@ include_directories(
     vendor/SDL_ttf/include/
 )
 
+# tinygettext
+set(BUILD_TESTS OFF)
+set(TINYGETTEXT_WITH_SDL OFF)
+set(TINYGETTEXT_UTF8_ONLY ON)
+
+add_subdirectory(vendor/tinygettext)
+target_link_libraries(${PROJECT_NAME} PRIVATE
+    tinygettext
+)
+include_directories(
+    vendor/tinygettext/include/
+)
+
 include_directories(
     ${PROJECT_SOURCE_DIR}/include
 )
@@ -174,6 +187,7 @@ set(ASSETS_LEVELS "${CMAKE_SOURCE_DIR}/assets/levels")
 set(ASSETS_SOUNDS "${CMAKE_SOURCE_DIR}/assets/sounds")
 set(ASSETS_MUSIC "${CMAKE_SOURCE_DIR}/assets/music")
 set(ASSETS_BACKGROUNDS "${CMAKE_SOURCE_DIR}/assets/backgrounds")
+set(ASSETS_LANGUAGES "${CMAKE_SOURCE_DIR}/assets/languages")
 
 if(PSP)
     set(ASSETS_BACKGROUNDS "${CMAKE_CURRENT_SOURCE_DIR}/platform/psp/assets/backgrounds")
@@ -207,6 +221,9 @@ if(NOT VITA)
     add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
         ${ASSETS_SOUNDS} ${CMAKE_CURRENT_BINARY_DIR}/assets/sounds)
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${ASSETS_LANGUAGES} ${CMAKE_CURRENT_BINARY_DIR}/assets/languages)
 endif()
 
 # Generate credits file

CONTRIBUTING.md

@@ -23,7 +23,7 @@ When submitting a bug report, please make sure to include this information:
 
 ## Adding a new translation
 
-By running cmake with the `-DTRANSLATION_SUPPORT=1` option, translation support can be enabled. To add a new language, for example German, you would run the following command:
+To add a new language, for example German, you would run the following command:
 
 ```
 platform/add-translation.sh de

src/TranslationManager.cpp

@@ -1,5 +1,3 @@
-#ifdef TRANSLATION_SUPPORT
-
 #include "TranslationManager.hpp"
 
 #include <iostream>
@@ -48,24 +46,23 @@ void TranslationManager::loadTranslations() {
 std::vector<std::string> TranslationManager::getSystemLanguageList() {
     std::vector<std::string> locales;
 
-    SDL_Locale * preferred_locales = SDL_GetPreferredLocales();
-    if(preferred_locales) {
-        for (SDL_Locale * l = preferred_locales; l->language; l++) {
-            std::string language = std::string(l->language);
-            std::string country = "";
-            if (l->country) {
-                country = std::string(l->country);
-            }
-            std::string char_set = "UTF-8";
-            std::string current_locale;
-            if (country.empty()) {
-                locales.push_back(language + "." + char_set);
-            } else {
-                locales.push_back(language + "_" + country + "." + char_set);
-                locales.push_back(language + "_" + country);
-            }
-            locales.push_back(language);
+    int locale_count = 0;
+    SDL_Locale ** preferred_locales = SDL_GetPreferredLocales(&locale_count);
+    for (int i = 0; i < locale_count ;i++) {
+        std::string language = preferred_locales[i]->language;
+        std::string country = "";
+        if (preferred_locales[i]->country) {
+            country = std::string(preferred_locales[i]->country);
         }
+        std::string char_set = "UTF-8";
+        std::string current_locale;
+        if (country.empty()) {
+            locales.push_back(language + "." + char_set);
+        } else {
+            locales.push_back(language + "_" + country + "." + char_set);
+            locales.push_back(language + "_" + country);
+        }
+        locales.push_back(language);
     }
 
     return locales;
@@ -78,5 +75,3 @@ std::string TranslationManager::translate(std::string input) {
         return input;
     }
 }
-
-#endif // TRANSLATION_SUPPORT

src/TranslationManager.hpp

@@ -1,7 +1,6 @@
 #ifndef TRANSLATIONMANAGER_H
 #define TRANSLATIONMANAGER_H
 
-#ifdef TRANSLATION_SUPPORT
 #include <vector>
 
 #include <tinygettext/tinygettext.hpp>
@@ -20,6 +19,5 @@ class TranslationManager {
 
     std::string translate(std::string input); 
 };
-#endif
 
 #endif // TRANSLATIONMANAGER_H

src/main.cpp

@@ -17,10 +17,8 @@
 #include "constants.hpp"
 #include "states/MenuState.hpp"
 
-#ifdef TRANSLATION_SUPPORT
-    // Create global TranslationManager object set in utils.h
-    TranslationManager translation_manager;
-#endif
+// Create global TranslationManager object set in utils.h
+TranslationManager translation_manager;
 
 void run() {
     OptionManager option_manager;

src/utils.hpp

@@ -26,11 +26,7 @@ std::string getResourcePath(std::string file);
 SDL_DisplayMode * getStandardDisplayMode();
 std::vector<SDL_DisplayMode*> getDisplayModes();
 
-#ifdef TRANSLATION_SUPPORT
-    extern TranslationManager translation_manager;
-    #define _(x) translation_manager.translate(x)
-#else
-    #define _(x) x
-#endif
+extern TranslationManager translation_manager;
+#define _(x) translation_manager.translate(x)
 
 #endif // UTILS_HPP