[Nautilus-list] Statusbar patch

[Benedikt Roth <Benedikt Roth gmx net>]

Hi!

The attached patch makes the text in the statusbar when selecting 
several folders clearer. And even more important it fixes i18n
problems with German (and probably other languages as well) resulting in
wrong grammar (singular/plural).

Darin was not comfortable with the original wording "(together containing
xxx items)" and proposed to change it to  "(containing a total of xxx
items)" which I did. What are other opinions?

May I commit?

Regards,

	Benedikt

? nautilus-statusbar.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4672
diff -u -r1.4672 ChangeLog
--- ChangeLog	2001/07/03 11:12:47	1.4672
+++ ChangeLog	2001/07/03 11:22:01
@@ -1,5 +1,12 @@
 2001-07-03  Benedikt Roth  <Benedikt Roth gmx net>
 
+	* src/file-manager/fm-directory-view.c:
+	(fm_directory_view_display_selection_info):
+	Made the statusbar messages when selecting several folders clearer
+	and fixed i18n problems
+
+2001-07-03  Benedikt Roth  <Benedikt Roth gmx net>
+
 	* src/file-manager/fm-directory-view.c: (real_update_menus):
 	Fix bug #6202, "'Show Trash' menu item should be greyed 
 	when viewing trash"
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.461
diff -u -r1.461 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	2001/07/03 11:12:50	1.461
+++ src/file-manager/fm-directory-view.c	2001/07/03 11:22:08
@@ -1394,14 +1394,28 @@
 			folder_count_str = g_strdup_printf (_("%d folders selected"), folder_count);
 		}
 
-		if (!folder_item_count_known) {
-			folder_item_count_str = g_strdup ("");
-		} else if (folder_item_count == 0) {
-			folder_item_count_str = g_strdup (_(" (containing 0 items)"));
-		} else if (folder_item_count == 1) {
-			folder_item_count_str = g_strdup (_(" (containing 1 item)"));
-		} else {
-			folder_item_count_str = g_strdup_printf (_(" (containing %d items)"), folder_item_count);
+		if (folder_count == 1) {
+			if (!folder_item_count_known) {
+				folder_item_count_str = g_strdup ("");
+			} else if (folder_item_count == 0) {
+				folder_item_count_str = g_strdup (_(" (containing 0 items)"));
+			} else if (folder_item_count == 1) {
+				folder_item_count_str = g_strdup (_(" (containing 1 item)"));
+			} else {
+				folder_item_count_str = g_strdup_printf (_(" (containing %d items)"), folder_item_count);
+			}
+		}
+		else {
+			if (!folder_item_count_known) {
+				folder_item_count_str = g_strdup ("");
+			} else if (folder_item_count == 0) {
+				folder_item_count_str = g_strdup (_(" (containing a total of 0 items)"));
+			} else if (folder_item_count == 1) {
+				folder_item_count_str = g_strdup (_("(containing a total of 1 item)"));
+			} else {
+				folder_item_count_str = g_strdup_printf (_(" (containing a total of %d items)"), folder_item_count);
+			}
+			
 		}
 	}