Merging from the master branch.

This commit is contained in:
Pere Pujal i Carabantes 2017-12-19 02:47:08 +01:00
commit b2c176730a
325 changed files with 13191 additions and 20223 deletions

View file

@ -1131,10 +1131,6 @@ int setup_i18n(const char *restrict lang, const char *restrict locale)
if (lang)
locale = language_to_locale(lang);
#ifdef __APPLE__
patch_i18n(locale); //EP
#endif
#ifdef __ANDROID__
if (locale == NULL)
locale = android_locale();