[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55117] trunk/blender/source/blender/ blenfont/intern/blf_translation.c: Fix to BLF_pgettext, which was returning "" when passed NULL msgid...

[Bastien Montagne]

Revision: 55117
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55117
Author:   mont29
Date:     2013-03-08 15:34:23 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Fix to BLF_pgettext, which was returning "" when passed NULL msgid... Never noticed any problem, but it looks it could produce strange UI issues (like deactivated buttons), and it was not consistent anyway!

Thanks to S. Lockal for spotting the issue and providing a patch.

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_translation.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c	2013-03-08 15:15:14 UTC (rev 55116)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c	2013-03-08 15:34:23 UTC (rev 55117)
@@ -90,9 +90,9 @@
 const char *BLF_pgettext(const char *msgctxt, const char *msgid)
 {
 #ifdef WITH_INTERNATIONAL
-	if (msgid && msgid[0]) {
-		const char *ret;
+	const char *ret = msgid;
 
+	if (msgid && msgid[0]) {
 		/*if (msgctxt && !strcmp(msgctxt, BLF_I18NCONTEXT_DEFAULT_BPY_INTERN)) { */
 		if (msgctxt && msgctxt[0] == BLF_I18NCONTEXT_DEFAULT_BPY[0]) {
 			/* BLF_I18NCONTEXT_DEFAULT_BPY context is reserved and considered the same as default NULL one. */
@@ -105,10 +105,9 @@
 		if (ret == msgid) {
 			ret = BPY_app_translations_py_pgettext(msgctxt, msgid);
 		}
-
-		return ret;
 	}
-	return "";
+
+	return ret;
 #else
 	(void)msgctxt;
 	return msgid;