Gettext support on Android (#11435)

Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: =?UTF-8?q?Olivier=20Samyn=20=F0=9F=8E=BB?= <code@oleastre.be>

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 47ab64d111b5781e0e6ed9d64aa4ceb1190ba7b2..660b5c8df3b207aeeeafd14c349515c96c2c268e 100644 (file)
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -28,6 +28,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+    - name: Install deps
+      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends gettext
     - name: Build with Gradle
       run: cd android; ./gradlew assemblerelease
     - name: Save armeabi artifact

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b7d93ef0f9fcf4a503c1a17acb34510b0875bc7f..53fe8591014425f7b525b79e9485810675677802 100644 (file)
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -76,10 +76,13 @@ task prepareAssets() {
        copy {
                from "${projRoot}/games/${gameToCopy}" into "${assetsFolder}/games/${gameToCopy}"
        }
-       /*copy {
-               // ToDo: fix broken locales
-               from "${projRoot}/po" into "${assetsFolder}/po"
-       }*/
+       fileTree("${projRoot}/po").include("**/*.po").forEach { poFile ->
+               def moPath = "${assetsFolder}/locale/${poFile.parentFile.name}/LC_MESSAGES/"
+               file(moPath).mkdirs()
+               exec {
+                       commandLine 'msgfmt', '-o', "${moPath}/minetest.mo", poFile
+               }
+       }
        copy {
                from "${projRoot}/textures" into "${assetsFolder}/textures"
        }

diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index 5039f325eabd2ecc6c79a3c3d743fed7132e6951..f92ac1d60dac541c3b063a1d7b5b716b6047da60 100644 (file)
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -47,6 +47,11 @@ LOCAL_MODULE := OpenAL
 LOCAL_SRC_FILES := deps/Android/OpenAL-Soft/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libopenal.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := GetText
+LOCAL_SRC_FILES := deps/Android/GetText/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libintl.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := Vorbis
 LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a
@@ -64,6 +69,7 @@ LOCAL_CFLAGS += \
        -DUSE_FREETYPE=1                \
        -DUSE_LEVELDB=0                 \
        -DUSE_LUAJIT=1                  \
+       -DUSE_GETTEXT=1                 \
        -DVERSION_MAJOR=${versionMajor} \
        -DVERSION_MINOR=${versionMinor} \
        -DVERSION_PATCH=${versionPatch} \
@@ -89,6 +95,7 @@ LOCAL_C_INCLUDES := \
        deps/Android/Freetype/include                   \
        deps/Android/Irrlicht/include                   \
        deps/Android/LevelDB/include                    \
+       deps/Android/GetText/include                    \
        deps/Android/libiconv/include                   \
        deps/Android/libiconv/libcharset/include        \
        deps/Android/LuaJIT/src                         \
@@ -194,7 +201,7 @@ LOCAL_SRC_FILES += \
 # SQLite3
 LOCAL_SRC_FILES += deps/Android/sqlite/sqlite3.c
 
-LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS) #LevelDB
+LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT GetText android_native_app_glue $(PROFILER_LIBS) #LevelDB
 
 LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
 

diff --git a/src/gettext.cpp b/src/gettext.cpp
index 6818004df158eb513abb659e47cc7d9f4b5c0007..de042cf3528a1e3968cc0e7fe918525690cc53f5 100644 (file)
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@@ -127,6 +127,10 @@ void init_gettext(const char *path, const std::string &configured_language,
                // Add user specified locale to environment
                setenv("LANGUAGE", configured_language.c_str(), 1);
 
+#ifdef __ANDROID__
+               setenv("LANG", configured_language.c_str(), 1);
+#endif
+
                // Reload locale with changed environment
                setlocale(LC_ALL, "");
 #elif defined(_MSC_VER)

diff --git a/src/gui/modalMenu.cpp b/src/gui/modalMenu.cpp
index 0d3fb55f0cc7a0c92748962c26da1ad2cf9540da..1016de38979b895dff3990756a9bc9016ab8ea03 100644 (file)
--- a/src/gui/modalMenu.cpp
+++ b/src/gui/modalMenu.cpp
@@ -268,7 +268,7 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
                        std::string label = wide_to_utf8(getLabelByID(hovered->getID()));
                        if (label.empty())
                                label = "text";
-                       message += gettext(label) + ":";
+                       message += strgettext(label) + ":";
 
                        // single line text input
                        int type = 2;

diff --git a/src/porting_android.cpp b/src/porting_android.cpp
index f5870c1748c6e5da2ec98da79ac579d2850358a8..29e95b8ca984e5d5a76681110d54c74c70f81262 100644 (file)
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@@ -190,6 +190,7 @@ void initializePathsAndroid()
 
        path_user    = path_storage + DIR_DELIM + PROJECT_NAME_C;
        path_share   = path_storage + DIR_DELIM + PROJECT_NAME_C;
+       path_locale  = path_share + DIR_DELIM + "locale";
        path_cache   = getAndroidPath(nativeActivity,
                        app_global->activity->clazz, mt_getAbsPath, "getCacheDir");
        migrateCachePath();