Refactor translation code out of blenfont

- Add blentranslation `BLT_*` module.
- moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`).
- moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.

4 files changed, 125 insertions, 621 deletions

diff --git a/source/blender/blenfont/intern/blf_font_i18n.c b/source/blender/blenfont/intern/blf_font_i18n.c
new file mode 100644
index 00000000000..da7d2adcdf6
--- /dev/null
+++ b/source/blender/blenfont/intern/blf_font_i18n.c
@@ -0,0 +1,123 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenfont/intern/blf_font_access.c
+ *  \ingroup blf
+ *
+ * API for accessing font files.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "BLF_api.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_fileops.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+
+#include "BKE_appdir.h"
+
+#ifdef WITH_INTERNATIONAL
+static const char unifont_filename[] = "droidsans.ttf.gz";
+static unsigned char *unifont_ttf = NULL;
+static int unifont_size = 0;
+static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
+static unsigned char *unifont_mono_ttf = NULL;
+static int unifont_mono_size = 0;
+#endif  /* WITH_INTERNATIONAL */
+
+unsigned char *BLF_get_unifont(int *r_unifont_size)
+{
+#ifdef WITH_INTERNATIONAL
+	if (unifont_ttf == NULL) {
+		const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
+		if (fontpath) {
+			char unifont_path[1024];
+
+			BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
+
+			unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size);
+		}
+		else {
+			printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
+		}
+	}
+
+	*r_unifont_size = unifont_size;
+
+	return unifont_ttf;
+#else
+	(void)r_unifont_size;
+	return NULL;
+#endif
+}
+
+void BLF_free_unifont(void)
+{
+#ifdef WITH_INTERNATIONAL
+	if (unifont_ttf)
+		MEM_freeN(unifont_ttf);
+#else
+#endif
+}
+
+unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
+{
+#ifdef WITH_INTERNATIONAL
+	if (unifont_mono_ttf == NULL) {
+		const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
+		if (fontpath) {
+			char unifont_path[1024];
+
+			BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_mono_filename);
+
+			unifont_mono_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_mono_size);
+		}
+		else {
+			printf("%s: 'fonts' data path not found for international monospace font, continuing\n", __func__);
+		}
+	}
+
+	*r_unifont_size = unifont_mono_size;
+
+	return unifont_mono_ttf;
+#else
+	(void)r_unifont_size;
+	return NULL;
+#endif
+}
+
+void BLF_free_unifont_mono(void)
+{
+#ifdef WITH_INTERNATIONAL
+	if (unifont_mono_ttf)
+		MEM_freeN(unifont_mono_ttf);
+#else
+#endif
+}
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
deleted file mode 100644
index 4683081a1ed..00000000000
--- a/source/blender/blenfont/intern/blf_lang.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- * 
- * Contributor(s): Blender Foundation.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/blenfont/intern/blf_lang.c
- *  \ingroup blf
- *
- * Main internationalization functions to set the locale and query available languages.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _WIN32
-#  include <locale.h>
-#endif
-
-#include "RNA_types.h"
-
-#include "BLF_translation.h" /* own include */
-
-#include "BLI_fileops.h"
-#include "BLI_linklist.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-
-#include "BKE_appdir.h"
-
-#include "DNA_userdef_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#ifdef WITH_INTERNATIONAL
-
-#include "boost_locale_wrapper.h"
-
-/* Locale options. */
-static const char **locales = NULL;
-static int num_locales = 0;
-static EnumPropertyItem *locales_menu = NULL;
-static int num_locales_menu = 0;
-
-static void free_locales(void)
-{
-	if (locales) {
-		int idx = num_locales_menu - 1; /* Last item does not need to be freed! */
-		while (idx--) {
-			MEM_freeN((void *)locales_menu[idx].identifier);
-			MEM_freeN((void *)locales_menu[idx].name);
-			MEM_freeN((void *)locales_menu[idx].description); /* Also frees locales's relevant value! */
-		}
-
-		MEM_freeN((void *)locales);
-		locales = NULL;
-	}
-	if (locales_menu) {
-		MEM_freeN(locales_menu);
-		locales_menu = NULL;
-	}
-	num_locales = num_locales_menu = 0;
-}
-
-static void fill_locales(void)
-{
-	const char * const languages_path = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
-	char languages[FILE_MAX];
-	LinkNode *lines = NULL, *line;
-	char *str;
-	int idx = 0;
-
-	free_locales();
-
-	BLI_join_dirfile(languages, FILE_MAX, languages_path, "languages");
-	line = lines = BLI_file_read_as_lines(languages);
-
-	/* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
-	 * Should not be a problem, though, as this file is script-generated! */
-
-	/* First loop to find highest locale ID */
-	while (line) {
-		int t;
-		str = (char *)line->link;
-		if (str[0] == '#' || str[0] == '\0') {
-			line = line->next;
-			continue; /* Comment or void... */
-		}
-		t = atoi(str);
-		if (t >= num_locales)
-			num_locales = t + 1;
-		num_locales_menu++;
-		line = line->next;
-	}
-	num_locales_menu++; /* The "closing" void item... */
-
-	/* And now, build locales and locale_menu! */
-	locales_menu = MEM_callocN(num_locales_menu * sizeof(EnumPropertyItem), __func__);
-	line = lines;
-	/* Do not allocate locales with zero-sized mem, as LOCALE macro uses NULL locales as invalid marker! */
-	if (num_locales > 0) {
-		locales = MEM_callocN(num_locales * sizeof(char *), __func__);
-		while (line) {
-			int id;
-			char *loc, *sep1, *sep2, *sep3;
-
-			str = (char *)line->link;
-			if (str[0] == '#' || str[0] == '\0') {
-				line = line->next;
-				continue;
-			}
-
-			id = atoi(str);
-			sep1 = strchr(str, ':');
-			if (sep1) {
-				sep1++;
-				sep2 = strchr(sep1, ':');
-				if (sep2) {
-					locales_menu[idx].value = id;
-					locales_menu[idx].icon = 0;
-					locales_menu[idx].name = BLI_strdupn(sep1, sep2 - sep1);
-
-					sep2++;
-					sep3 = strchr(sep2, ':');
-
-					if (sep3) {
-						locales_menu[idx].identifier = loc = BLI_strdupn(sep2, sep3 - sep2);
-					}
-					else {
-						locales_menu[idx].identifier = loc = BLI_strdup(sep2);
-					}
-
-					if (id == 0) {
-						/* The DEFAULT item... */
-						if (BLI_strnlen(loc, 2)) {
-							locales[id] = locales_menu[idx].description = BLI_strdup("");
-						}
-						/* Menu "label", not to be stored in locales! */
-						else {
-							locales_menu[idx].description = BLI_strdup("");
-						}
-					}
-					else {
-						locales[id] = locales_menu[idx].description = BLI_strdup(loc);
-					}
-					idx++;
-				}
-			}
-
-			line = line->next;
-		}
-	}
-
-	/* Add closing item to menu! */
-	locales_menu[idx].identifier = NULL;
-	locales_menu[idx].value = locales_menu[idx].icon = 0;
-	locales_menu[idx].name = locales_menu[idx].description = "";
-
-	BLI_file_free_lines(lines);
-}
-#endif  /* WITH_INTERNATIONAL */
-
-EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
-{
-#ifdef WITH_INTERNATIONAL
-	return locales_menu;
-#else
-	return NULL;
-#endif
-}
-
-void BLF_lang_init(void)
-{
-#ifdef WITH_INTERNATIONAL
-	const char * const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
-#endif
-
-	/* Make sure LANG is correct and wouldn't cause std::rumtime_error. */
-#ifndef _WIN32
-	/* TODO(sergey): This code only ensures LANG is set properly, so later when
-	 * Cycles will try to use file system API from boost there'll be no runtime
-	 * exception generated by std::locale() which _requires_ having proper LANG
-	 * set in the environment.
-	 *
-	 * Ideally we also need to ensure LC_ALL, LC_MESSAGES and others are also
-	 * set to a proper value, but currently it's not a huge deal and doesn't
-	 * cause any headache.
-	 *
-	 * Would also be good to find nicer way to check if LANG is correct.
-	 */
-	const char *lang = getenv("LANG");
-	if (lang != NULL) {
-		char *old_locale = setlocale(LC_ALL, NULL);
-		/* Make a copy so subsequenct setlocale() doesn't interfere. */
-		old_locale = BLI_strdup(old_locale);
-		if (setlocale(LC_ALL, lang) == NULL) {
-			setenv("LANG", "C", 1);
-			printf("Warning: Falling back to the standard locale (\"C\")\n");
-		}
-		setlocale(LC_ALL, old_locale);
-		MEM_freeN(old_locale);
-	}
-#endif
-
-#ifdef WITH_INTERNATIONAL
-	if (messagepath) {
-		bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
-		fill_locales();
-	}
-	else {
-		printf("%s: 'locale' data path for translations not found, continuing\n", __func__);
-	}
-#else
-#endif
-}
-
-void BLF_lang_free(void)
-{
-#ifdef WITH_INTERNATIONAL
-	free_locales();
-#else
-#endif
-}
-
-#ifdef WITH_INTERNATIONAL
-#  define ULANGUAGE ((U.language >= 0 && U.language < num_locales) ? U.language : 0)
-#  define LOCALE(_id) (locales ? locales[(_id)] : "")
-#endif
-
-void BLF_lang_set(const char *str)
-{
-#ifdef WITH_INTERNATIONAL
-	int ulang = ULANGUAGE;
-	const char *short_locale = str ? str : LOCALE(ulang);
-	const char *short_locale_utf8 = NULL;
-
-	if ((U.transopts & USER_DOTRANSLATE) == 0)
-		return;
-
-	/* We want to avoid locales like '.UTF-8'! */
-	if (short_locale[0]) {
-		/* Hurrey! encoding needs to be placed *before* variant! */
-		char *variant = strchr(short_locale, '@');
-		if (variant) {
-			char *locale = BLI_strdupn(short_locale, variant - short_locale);
-			short_locale_utf8 = BLI_sprintfN("%s.UTF-8%s", locale, variant);
-			MEM_freeN(locale);
-		}
-		else {
-			short_locale_utf8 = BLI_sprintfN("%s.UTF-8", short_locale);
-		}
-		bl_locale_set(short_locale_utf8);
-		MEM_freeN((void *)short_locale_utf8);
-	}
-	else {
-		bl_locale_set(short_locale);
-	}
-#else
-	(void)str;
-#endif
-}
-
-/* Get the current locale (short code, e.g. es_ES). */
-const char *BLF_lang_get(void)
-{
-#ifdef WITH_INTERNATIONAL
-	if (BLF_translate()) {
-		const char *locale = LOCALE(ULANGUAGE);
-		if (locale[0] == '\0') {
-			/* Default locale, we have to find which one we are actually using! */
-			locale = bl_locale_get();
-		}
-		return locale;
-	}
-	return "en_US";  /* Kind of default locale in Blender when no translation enabled. */
-#else
-	return "";
-#endif
-}
-
-#undef LOCALE
-#undef ULANGUAGE
-
-/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g. if there is no variant,
- * *variant and *language_variant will always be NULL).
- * Non-null elements are always MEM_mallocN'ed, it's the caller's responsibility to free them.
- * NOTE: Keep that one always available, you never know, may become useful even in no-WITH_INTERNATIONAL context...
- */
-void BLF_locale_explode(const char *locale, char **language, char **country, char **variant,
-                        char **language_country, char **language_variant)
-{
-	char *m1, *m2, *_t = NULL;
-
-	m1 = strchr(locale, '_');
-	m2 = strchr(locale, '@');
-
-	if (language || language_variant) {
-		if (m1 || m2) {
-			_t = m1 ? BLI_strdupn(locale, m1 - locale) : BLI_strdupn(locale, m2 - locale);
-			if (language)
-				*language = _t;
-		}
-		else if (language) {
-			*language = BLI_strdup(locale);
-		}
-	}
-	if (country) {
-		if (m1)
-			*country = m2 ? BLI_strdupn(m1 + 1, m2 - (m1 + 1)) : BLI_strdup(m1 + 1);
-		else
-			*country = NULL;
-	}
-	if (variant) {
-		if (m2)
-			*variant = BLI_strdup(m2 + 1);
-		else
-			*variant = NULL;
-	}
-	if (language_country) {
-		if (m1)
-			*language_country = m2 ? BLI_strdupn(locale, m2 - locale) : BLI_strdup(locale);
-		else
-			*language_country = NULL;
-	}
-	if (language_variant) {
-		if (m2)
-			*language_variant = m1 ? BLI_strdupcat(_t, m2) : BLI_strdup(locale);
-		else
-			*language_variant = NULL;
-	}
-	if (_t && !language) {
-		MEM_freeN(_t);
-	}
-}
diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c
index 4b7a568b8b0..4eea5d581d0 100644
--- a/source/blender/blenfont/intern/blf_thumbs.c
+++ b/source/blender/blenfont/intern/blf_thumbs.c
@@ -45,7 +45,7 @@
 #include "blf_internal_types.h"
 
 #include "BLF_api.h"
-#include "BLF_translation.h"
+#include "BLT_translation.h"
 
 #include "BLI_strict_flags.h"
 
@@ -90,7 +90,7 @@ void BLF_thumb_preview(
 	font_size_curr = font_size;
 
 	for (i = 0; i < draw_str_lines; i++) {
-		const char *draw_str_i18n = BLF_translate_do(BLF_I18NCONTEXT_DEFAULT, draw_str[i]);
+		const char *draw_str_i18n = BLT_translate_do(BLT_I18NCONTEXT_DEFAULT, draw_str[i]);
 		const size_t draw_str_i18n_len = strlen(draw_str_i18n);
 		int draw_str_i18n_nbr = 0;
 
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
deleted file mode 100644
index 5d828d9b7be..00000000000
--- a/source/blender/blenfont/intern/blf_translation.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2011 Blender Foundation.
- * All rights reserved.
- *
- * Contributor(s): Blender Foundation,
- *                 Sergey Sharybin
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/blenfont/intern/blf_translation.c
- *  \ingroup blf
- *
- * Manages translation files and provides translation functions.
- * (which are optional and can be disabled as a preference).
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "BLF_translation.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_fileops.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-
-#include "BKE_appdir.h"
-
-#include "DNA_userdef_types.h" /* For user settings. */
-
-#ifdef WITH_PYTHON
-#include "BPY_extern.h"
-#endif
-
-#ifdef WITH_INTERNATIONAL
-
-#include "boost_locale_wrapper.h"
-
-static const char unifont_filename[] = "droidsans.ttf.gz";
-static unsigned char *unifont_ttf = NULL;
-static int unifont_size = 0;
-static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
-static unsigned char *unifont_mono_ttf = NULL;
-static int unifont_mono_size = 0;
-#endif  /* WITH_INTERNATIONAL */
-
-unsigned char *BLF_get_unifont(int *r_unifont_size)
-{
-#ifdef WITH_INTERNATIONAL
-	if (unifont_ttf == NULL) {
-		const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
-		if (fontpath) {
-			char unifont_path[1024];
-
-			BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
-
-			unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size);
-		}
-		else {
-			printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
-		}
-	}
-
-	*r_unifont_size = unifont_size;
-
-	return unifont_ttf;
-#else
-	(void)r_unifont_size;
-	return NULL;
-#endif
-}
-
-void BLF_free_unifont(void)
-{
-#ifdef WITH_INTERNATIONAL
-	if (unifont_ttf)
-		MEM_freeN(unifont_ttf);
-#else
-#endif
-}
-
-unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
-{
-#ifdef WITH_INTERNATIONAL
-	if (unifont_mono_ttf == NULL) {
-		const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
-		if (fontpath) {
-			char unifont_path[1024];
-
-			BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_mono_filename);
-
-			unifont_mono_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_mono_size);
-		}
-		else {
-			printf("%s: 'fonts' data path not found for international monospace font, continuing\n", __func__);
-		}
-	}
-
-	*r_unifont_size = unifont_mono_size;
-
-	return unifont_mono_ttf;
-#else
-	(void)r_unifont_size;
-	return NULL;
-#endif
-}
-
-void BLF_free_unifont_mono(void)
-{
-#ifdef WITH_INTERNATIONAL
-	if (unifont_mono_ttf)
-		MEM_freeN(unifont_mono_ttf);
-#else
-#endif
-}
-
-bool BLF_is_default_context(const char *msgctxt)
-{
-	/* We use the "short" test, a more complete one could be:
-	 * return (!msgctxt || !msgctxt[0] || STREQ(msgctxt, BLF_I18NCONTEXT_DEFAULT_BPYRNA))
-	 */
-	/* Note: trying without the void string check for now, it *should* not be necessary... */
-	return (!msgctxt || msgctxt[0] == BLF_I18NCONTEXT_DEFAULT_BPYRNA[0]);
-}
-
-const char *BLF_pgettext(const char *msgctxt, const char *msgid)
-{
-#ifdef WITH_INTERNATIONAL
-	const char *ret = msgid;
-
-	if (msgid && msgid[0]) {
-		if (BLF_is_default_context(msgctxt)) {
-			msgctxt = BLF_I18NCONTEXT_DEFAULT;
-		}
-		ret = bl_locale_pgettext(msgctxt, msgid);
-		/* We assume if the returned string is the same (memory level) as the msgid, no translation was found,
-		 * and we can try py scripts' ones!
-		 */
-#ifdef WITH_PYTHON
-		if (ret == msgid) {
-			ret = BPY_app_translations_py_pgettext(msgctxt, msgid);
-		}
-#endif
-	}
-
-	return ret;
-#else
-	(void)msgctxt;
-	return msgid;
-#endif
-}
-
-bool BLF_translate(void)
-{
-#ifdef WITH_INTERNATIONAL
-	return (U.transopts & USER_DOTRANSLATE) != 0;
-#else
-	return false;
-#endif
-}
-
-bool BLF_translate_iface(void)
-{
-#ifdef WITH_INTERNATIONAL
-	return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_IFACE);
-#else
-	return false;
-#endif
-}
-
-bool BLF_translate_tooltips(void)
-{
-#ifdef WITH_INTERNATIONAL
-	return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_TOOLTIPS);
-#else
-	return false;
-#endif
-}
-
-bool BLF_translate_new_dataname(void)
-{
-#ifdef WITH_INTERNATIONAL
-	return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_NEWDATANAME);
-#else
-	return false;
-#endif
-}
-
-const char *BLF_translate_do(const char *msgctxt, const char *msgid)
-{
-#ifdef WITH_INTERNATIONAL
-	if (BLF_translate()) {
-		return BLF_pgettext(msgctxt, msgid);
-	}
-	else {
-		return msgid;
-	}
-#else
-	(void)msgctxt;
-	return msgid;
-#endif
-}
-
-const char *BLF_translate_do_iface(const char *msgctxt, const char *msgid)
-{
-#ifdef WITH_INTERNATIONAL
-	if (BLF_translate_iface()) {
-		return BLF_pgettext(msgctxt, msgid);
-	}
-	else {
-		return msgid;
-	}
-#else
-	(void)msgctxt;
-	return msgid;
-#endif
-}
-
-const char *BLF_translate_do_tooltip(const char *msgctxt, const char *msgid)
-{
-#ifdef WITH_INTERNATIONAL
-	if (BLF_translate_tooltips()) {
-		return BLF_pgettext(msgctxt, msgid);
-	}
-	else {
-		return msgid;
-	}
-#else
-	(void)msgctxt;
-	return msgid;
-#endif
-}
-
-const char *BLF_translate_do_new_dataname(const char *msgctxt, const char *msgid)
-{
-#ifdef WITH_INTERNATIONAL
-	if (BLF_translate_new_dataname()) {
-		return BLF_pgettext(msgctxt, msgid);
-	}
-	else {
-		return msgid;
-	}
-#else
-	(void)msgctxt;
-	return msgid;
-#endif
-}