Add gettext support to the android version #10019

oleastre · 2020-06-09T22:08:35Z

Add compact, short information about your PR for easier understanding:

Goal of the PR
Add gettext and internationalization support in the android version
How does the PR work?
Add dependency on a static version of gettext, and add mo files to the packaged android assets.
Depends on Add gettext libraries minetest_android_deps_binaries#3
Does it resolve any reported issue?
Solves Android does not support gettext translations #6093

To do

This PR is Ready for Review.

How to test

Build and launch an android client, set the language to something not english in the settings, restart and enjoy a translated mintest.

MoNTE48 · 2020-06-09T22:14:04Z

Implementation of MultiCraft.
https://github.com/MultiCraft/MultiCraft/tree/master/lib/intl
Very minimal version of the library. It may be more rational to use it on Android, instead of a full (and pervasive) gettext.
It can also be used on other platforms for guaranteed support for locales.

oleastre · 2020-06-09T22:17:46Z

Note that this PR does not automatically detect the android language.
I could add this in a further PR by adding a JNI binding to fetch the info from the java side of the code.

MoNTE48 · 2020-06-09T22:21:21Z

I could add this in a further PR by adding a JNI binding to fetch the info from the java side of the code.

What for? JNI can detect language, just read the documentation.

oleastre · 2020-06-09T22:22:37Z

As stated in the binary part of the PR, I used gettext, as it's already the translation engine for minetest. I also considered https://github.com/tinygettext/tinygettext and https://github.com/j-jorge/libintl-lite, but since the runtime part of gettext is small, self contained, and easy to compile using the NDK, I thought it would be more straight forward to use it to enable translations in the android client.

oleastre · 2020-06-09T22:28:45Z

What for? JNI can detect language, just read the documentation.

That was the purpose of my comment, you have to add a JNI call to get the current locale.
Basically one need to all Locale.getDefault() in java and forward that to the gettext initialization code.
Or did I miss something in the doc ?

MoNTE48 · 2020-06-09T22:30:29Z

@oleastre yes, miss it:
https://github.com/MultiCraft/MultiCraft/blob/7059d450f24843ca4b7699a651eaf131e84cd76c/src/defaultsettings.cpp#L483

oleastre · 2020-06-09T22:35:12Z

@oleastre yes, miss it:

Thanks, I'm not a full time android developer and most of the time, I only play with the java side and almost never touch the NDK.
So adding that call is quite easy. I'll add to this PR.

MoNTE48 · 2020-06-09T22:37:00Z

build/android/app/build.gradle

+		exec {
+			commandLine 'msgfmt', '-o', "${moPath}/minetest.mo", poFile
+		}
+	}


There should be a comment that indicates that gradle will not be able to do this on Windows at all, as well as on macOS without brew install gettext!

True. Is there a place to add this note ?

@sfan5 your suggestions?

Windows can do that as long msgfmt is within the path. All it needs is a comment stating that this section requires gettext to be installed and available in PATH.

I'll see if I can add a test and break early with a meaningful error message.

build/android/native/jni/Android.mk

src/gui/modalMenu.cpp

oleastre · 2020-06-09T23:30:54Z

I added automatic locale detection if it's not set in the UI or minetest.conf

oleastre · 2020-07-13T12:31:03Z

Rebased on latest master after 5.3.0 release

SmallJoker · 2020-08-01T08:15:48Z

I don't have an Android setup, but the code looks good. 👍 if someone else can confirm this as working.

MoNTE48 · 2020-08-19T17:38:47Z

src/gettext.cpp

@@ -202,7 +207,12 @@ void init_gettext(const char *path, const std::string &configured_language,
 #endif // ifndef _WIN32
 	}
 	else {
+#ifdef __ANDROID__
+		char lang[3] = {0};
 		 /* set current system default locale */


Move this before #ifdef

MoNTE48 · 2020-08-19T17:39:14Z

build/android/native/jni/Android.mk

@@ -59,6 +59,11 @@ include $(PREBUILT_STATIC_LIBRARY)
 #LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libcrypto.a
 #include $(PREBUILT_STATIC_LIBRARY)

+include $(CLEAR_VARS)
+LOCAL_MODULE := GetText


Just gettext as here https://www.gnu.org/software/gettext/

MoNTE48 · 2020-10-20T14:03:35Z

I can confirm that this completely works and has been using MultiCraft for a while.
I support this PR!

oleastre · 2020-10-20T14:21:25Z

I'll take time this week to address the few comments, I've left this pending for too much time

MoNTE48 · 2021-01-26T09:55:24Z

@rubenwardy this really can be merged. Tested and used in my fork

srifqi · 2021-02-05T14:00:20Z

I can confirm that this PR works, too.

AntumDeluge · 2021-05-30T14:53:45Z

Is there a reason this hasn't been merged yet?

Pevernow · 2021-07-08T11:50:08Z

@oleastre Are you still work in it?
If not,I would like to make a new pull request for it to rebase it.

oleastre · 2021-07-08T12:40:59Z

@Pevernow I did not updated it for a while, even locally.
If you want to rebase and create a new PR, I'm happy with it; otherwise, I'll have to re-install the full android stack to do it and test against the latest minetest versions

SmallJoker · 2021-08-07T06:16:28Z

Rebased/continued in #11435

sfan5 added @ Translation Android Feature ✨ PRs that add or enhance a feature labels Jun 9, 2020

MoNTE48 reviewed Jun 9, 2020

View reviewed changes

oleastre added 3 commits July 13, 2020 14:22

Add gettext support to the android version

824a4e4

Remove useless define.

6df5e13

If the locale is not set, get the android system default one.

40476c0

oleastre force-pushed the android-client-translation branch from 1b25d44 to 40476c0 Compare July 13, 2020 12:23

SmallJoker mentioned this pull request Aug 1, 2020

Language switching function of Android #10248

Closed

MoNTE48 reviewed Aug 19, 2020

View reviewed changes

SmallJoker added the Rebase needed The PR needs to be rebased by its author label May 30, 2021

Pevernow mentioned this pull request Jul 8, 2021

Gettext support on Android #11435

Merged

SmallJoker closed this Aug 7, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add gettext support to the android version #10019

Add gettext support to the android version #10019

oleastre commented Jun 9, 2020 •

edited

Loading

MoNTE48 commented Jun 9, 2020

oleastre commented Jun 9, 2020

MoNTE48 commented Jun 9, 2020

oleastre commented Jun 9, 2020

oleastre commented Jun 9, 2020

MoNTE48 commented Jun 9, 2020

oleastre commented Jun 9, 2020 •

edited

Loading

MoNTE48 Jun 9, 2020 •

edited

Loading

oleastre Jun 9, 2020

MoNTE48 Jun 9, 2020

SmallJoker Aug 1, 2020

oleastre Aug 11, 2020

oleastre commented Jun 9, 2020

oleastre commented Jul 13, 2020

SmallJoker commented Aug 1, 2020

MoNTE48 Aug 19, 2020

MoNTE48 Aug 19, 2020

MoNTE48 commented Oct 20, 2020

oleastre commented Oct 20, 2020

MoNTE48 commented Jan 26, 2021

srifqi commented Feb 5, 2021

AntumDeluge commented May 30, 2021

Pevernow commented Jul 8, 2021

oleastre commented Jul 8, 2021

SmallJoker commented Aug 7, 2021

Add gettext support to the android version #10019

Add gettext support to the android version #10019

Conversation

oleastre commented Jun 9, 2020 • edited Loading

To do

How to test

MoNTE48 commented Jun 9, 2020

oleastre commented Jun 9, 2020

MoNTE48 commented Jun 9, 2020

oleastre commented Jun 9, 2020

oleastre commented Jun 9, 2020

MoNTE48 commented Jun 9, 2020

oleastre commented Jun 9, 2020 • edited Loading

MoNTE48 Jun 9, 2020 • edited Loading

Choose a reason for hiding this comment

oleastre Jun 9, 2020

Choose a reason for hiding this comment

MoNTE48 Jun 9, 2020

Choose a reason for hiding this comment

SmallJoker Aug 1, 2020

Choose a reason for hiding this comment

oleastre Aug 11, 2020

Choose a reason for hiding this comment

oleastre commented Jun 9, 2020

oleastre commented Jul 13, 2020

SmallJoker commented Aug 1, 2020

MoNTE48 Aug 19, 2020

Choose a reason for hiding this comment

MoNTE48 Aug 19, 2020

Choose a reason for hiding this comment

MoNTE48 commented Oct 20, 2020

oleastre commented Oct 20, 2020

MoNTE48 commented Jan 26, 2021

srifqi commented Feb 5, 2021

AntumDeluge commented May 30, 2021

Pevernow commented Jul 8, 2021

oleastre commented Jul 8, 2021

SmallJoker commented Aug 7, 2021

oleastre commented Jun 9, 2020 •

edited

Loading

oleastre commented Jun 9, 2020 •

edited

Loading

MoNTE48 Jun 9, 2020 •

edited

Loading