SF.net SVN: geany:[4877] trunk

[ntrel at users.sourceforge.net]

Revision: 4877
          http://geany.svn.sourceforge.net/geany/?rev=4877&view=rev
Author:   ntrel
Date:     2010-05-06 12:03:11 +0000 (Thu, 06 May 2010)

Log Message:
-----------
Fix marking some strings as translatable (cannot be done in the
ASSIGNIF macro).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-05 16:26:25 UTC (rev 4876)
+++ trunk/ChangeLog	2010-05-06 12:03:11 UTC (rev 4877)
@@ -1,3 +1,10 @@
+2010-05-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/build.c:
+   Fix marking some strings as translatable (cannot be done in the
+   ASSIGNIF macro).
+
+
 2010-05-05  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/search.c, src/search.h, src/document.c, doc/geany.txt,

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2010-05-05 16:26:25 UTC (rev 4876)
+++ trunk/src/build.c	2010-05-06 12:03:11 UTC (rev 4877)
@@ -2356,7 +2356,7 @@
 #define ASSIGNIF(type, id, string, value) \
 	if (NZV(value) && ! type[GBO_TO_CMD(id)].exists) { \
 		type[GBO_TO_CMD(id)].exists = TRUE; \
-		setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_LABEL], g_strdup(_(string))); \
+		setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_LABEL], g_strdup(string)); \
 		setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_COMMAND], (value)); \
 		setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_WORKING_DIR], NULL); \
 		type[GBO_TO_CMD(id)].old = TRUE; \
@@ -2372,21 +2372,21 @@
 			{
 				if (ft->filecmds == NULL)
 					ft->filecmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]);
-				ASSIGNIF(ft->filecmds, GEANY_GBO_COMPILE, "_Compile", value);
+				ASSIGNIF(ft->filecmds, GEANY_GBO_COMPILE, _("_Compile"), value);
 			}
 			value = g_key_file_get_string(config, "build_settings", "linker", NULL);
 			if (value != NULL)
 			{
 				if (ft->filecmds == NULL)
 					ft->filecmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]);
-				ASSIGNIF(ft->filecmds, GEANY_GBO_BUILD, "_Build", value);
+				ASSIGNIF(ft->filecmds, GEANY_GBO_BUILD, _("_Build"), value);
 			}
 			value = g_key_file_get_string(config, "build_settings", "run_cmd", NULL);
 			if (value != NULL)
 			{
 				if (ft->execcmds == NULL)
 					ft->execcmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]);
-				ASSIGNIF(ft->execcmds, GEANY_GBO_EXEC, "_Execute", value);
+				ASSIGNIF(ft->execcmds, GEANY_GBO_EXEC, _("_Execute"), value);
 			}
 			if (ft->error_regex_string == NULL)
 				ft->error_regex_string = g_key_file_get_string(config, "build_settings", "error_regex", NULL);
@@ -2431,11 +2431,11 @@
 			{
 				if (non_ft_pref == NULL)
 					non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]);
-				ASSIGNIF(non_ft_pref, GEANY_GBO_CUSTOM, "Make Custom _Target",
+				ASSIGNIF(non_ft_pref, GEANY_GBO_CUSTOM, _("Make Custom _Target"),
 						g_strdup_printf("%s ", value));
-				ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_OBJECT, "Make _Object",
+				ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_OBJECT, _("Make _Object"),
 						g_strdup_printf("%s %%e.o",value));
-				ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_ALL, "_Make", value);
+				ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_ALL, _("_Make"), value);
 			}
 			break;
 		default:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.