SF.net SVN: geany: [2472] trunk

[eht16 at users.sourceforge.net]

Revision: 2472
          http://geany.svn.sourceforge.net/geany/?rev=2472&view=rev
Author:   eht16
Date:     2008-04-11 08:39:44 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
Revert the translatable filetype name of filetype All, add a workaround in ui_update_statusbar() instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-11 15:32:48 UTC (rev 2471)
+++ trunk/ChangeLog	2008-04-11 15:39:44 UTC (rev 2472)
@@ -3,6 +3,9 @@
  * THANKS, doc/geany.txt, doc/geany.html:
    Add documentation for several options in the preferences dialog
    (patch from Robert McGinley, thanks).
+ * src/filetypes.c, src/ui_utils.c:
+   Revert the translatable filetype name of filetype All, add a
+   workaround in ui_update_statusbar() instead.
 
 
 2008-04-10  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2008-04-11 15:32:48 UTC (rev 2471)
+++ trunk/src/filetypes.c	2008-04-11 15:39:44 UTC (rev 2472)
@@ -476,7 +476,7 @@
 
 #define ALL
 	filetypes[GEANY_FILETYPES_ALL]->id = GEANY_FILETYPES_ALL;
-	filetypes[GEANY_FILETYPES_ALL]->name = g_strdup(_("None"));
+	filetypes[GEANY_FILETYPES_ALL]->name = g_strdup("None");
 	filetypes[GEANY_FILETYPES_ALL]->uid = FILETYPE_UID_ALL;
 	filetypes[GEANY_FILETYPES_ALL]->lang = -2;
 	filetypes[GEANY_FILETYPES_ALL]->title = g_strdup(_("All files"));

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2008-04-11 15:32:48 UTC (rev 2471)
+++ trunk/src/ui_utils.c	2008-04-11 15:39:44 UTC (rev 2472)
@@ -128,7 +128,14 @@
 		const gchar sp[] = "      ";
 		guint line, col;
 		const gchar *cur_tag;
+		gchar *filetype_name;
 
+		/* workaround to make the name of filetype GEANY_FILETYPES_ALL translatable */
+		if (doc_list[idx].file_type == NULL || doc_list[idx].file_type->id == GEANY_FILETYPES_ALL)
+			filetype_name = _("None");
+		else
+			filetype_name = doc_list[idx].file_type->name;
+
 		if (stats_str == NULL)
 			stats_str = g_string_sized_new(120);
 
@@ -166,9 +173,7 @@
 				/* BOM = byte order mark */
 				((doc_list[idx].has_bom) ? _("(with BOM)") : "") : "");
 		g_string_append(stats_str, sp);
-		g_string_append_printf(stats_str, _("filetype: %s"),
-			(doc_list[idx].file_type) ? doc_list[idx].file_type->name :
-				filetypes[GEANY_FILETYPES_ALL]->name);
+		g_string_append_printf(stats_str, _("filetype: %s"), filetype_name);
 		g_string_append(stats_str, sp);
 		if (doc_list[idx].changed)
 		{


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