Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use CUSTOM_LOCALEDIR if specified #3108

Closed

Conversation

ShadowNinja
Copy link
Member

Should fix #1582 (although I haven't tested it).

@ShadowNinja ShadowNinja added Bug Issues that were confirmed to be a bug @ Build CMake, build scripts, official builds, compiler and linker errors @ Translation Testing needed labels Aug 24, 2015
#ifdef STATIC_LOCALEDIR
if (STATIC_LOCALEDIR[0] != '\0')
path_locale = STATIC_LOCALEDIR;
else
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest removing the "else" to fix the indentation on the following code line.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would break it, the later line would reset path_locale.
Is this better?

#ifdef STATIC_LOCALEDIR
    path_locale = STATIC_LOCALEDIR[0] ? STATIC_LOCALEDIR : getDataPath("locale");
#else
    path_locale = getDataPath("locale");
#endif

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that looks better.

@sfan5 sfan5 added low-priority enhancement and removed Bug Issues that were confirmed to be a bug labels Aug 30, 2015
@est31
Copy link
Contributor

est31 commented Aug 31, 2015

Looks good, although I as well haven't tested it.

@ShadowNinja
Copy link
Member Author

@sfan5: This is a bug, as CUSTOM_LOCALEDIR is already supported, but doesn't work.

@ShadowNinja ShadowNinja added Bug Issues that were confirmed to be a bug and removed low-priority enhancement labels Sep 1, 2015
@ghost
Copy link

ghost commented Sep 5, 2015

May be relevant for merging:

https://forum.minetest.net/viewtopic.php?p=189914#p189914

@est31
Copy link
Contributor

est31 commented Sep 6, 2015

645e208

@est31 est31 closed this Sep 6, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Issues that were confirmed to be a bug @ Build CMake, build scripts, official builds, compiler and linker errors Testing needed @ Translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Minetest does not find the locale if installed in a CUSTOM_LOCALEDIR
3 participants