[libexif-cvs] exif/exif actions.c,1.28,1.29 exif-i18n.h,1.3,1.4

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16707/exif

Modified Files:
	actions.c exif-i18n.h 
Log Message:
Display "Unknown tag" instead of blank for an unknown maker note tag.
Use ngettext to get the proper plural form for number of tags.


Index: exif-i18n.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- exif-i18n.h	25 Nov 2007 09:13:27 -0000	1.3
+++ exif-i18n.h	6 Jan 2008 02:39:54 -0000	1.4
@@ -33,6 +33,7 @@
 #else
 #  define textdomain(String) (String)
 #  define gettext(String) (String)
+#  define ngettext(String1,String2,Count) ((Count)==1?(String1):(String2))
 #  define dgettext(Domain,Message) (Message)
 #  define dcgettext(Domain,Message,Type) (Message)
 #  define bind_textdomain_codeset(Domain,Codeset) (Codeset)

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- actions.c	30 Oct 2007 06:27:35 -0000	1.28
+++ actions.c	6 Jan 2008 02:39:54 -0000	1.29
@@ -120,11 +120,10 @@ action_mnote_list (const char *filename,
 	case 0:
 		printf (_("MakerNote does not contain any value.\n"));
 		break;
-	case 1:
-		printf (_("MakerNote contains 1 value:\n"));
-		break;
 	default:
-		printf (_("MakerNote contains %i values:\n"), c);
+		printf (ngettext("MakerNote contains %i value:\n",
+			         "MakerNote contains %i values:\n",
+			 	 c), c);
 	}
 	for (i = 0; i < c; i++) {
 	        if ( ids ) {
@@ -132,7 +131,7 @@ action_mnote_list (const char *filename,
 			sprintf(b1,"0x%04x",id);
 		} else {
 			p = C (exif_mnote_data_get_title (n, i));
-			strncpy (b1, p ? p : _("Unknown tag"), bs);
+			strncpy (b1, p && *p ? p : _("Unknown tag"), bs);
 		}
 		p = C (exif_mnote_data_get_value (n, i, b, bs));
 		strncpy (b2, p ? p : _("Unknown value"), bs);