add support for JFS Set locale to "C" before running mount/umoun to be

* libnautilus-private/filesystem-attributes.xml: add support for JFS
* libnautilus-private/nautilus-volume-monitor.c:
(close_error_pipe), (mount_unmount_callback): Set locale to "C"
before running mount/umoun to be able to parse mount message in english
* po/fr.po: Add missing '\n' in one translation which was
oversizing Nautilus Preference Dialog

4 files changed, 28 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c6b7bfe7..91dfb95f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-02  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* libnautilus-private/filesystem-attributes.xml: add support for JFS
+	* libnautilus-private/nautilus-volume-monitor.c:
+	(close_error_pipe), (mount_unmount_callback): Set locale to "C"
+	before running mount/umoun to be able to parse mount message in english
+	* po/fr.po: Add missing '\n' in one translation which was
+	oversizing Nautilus Preference Dialog
+
 2001-10-01  Darin Adler  <darin@bentspoon.com>
 
 	* libnautilus-private/nautilus-directory-async.c:
diff --git a/libnautilus-private/filesystem-attributes.xml b/libnautilus-private/filesystem-attributes.xml
index 037aaff78..e910fd456 100644
--- a/libnautilus-private/filesystem-attributes.xml
+++ b/libnautilus-private/filesystem-attributes.xml
@@ -10,6 +10,7 @@
     <filesystem name="ext3"     _default_volume_name="Ext3 Linux Volume" trash="yes"/>
     <filesystem name="fat"      _default_volume_name="MSDOS Volume" trash="yes"/>
     <filesystem name="iso9660"  _default_volume_name="CDROM Volume"/>
+    <filesystem name="jfs"      _default_volume_name="JFS Volume" trash="yes"/>
     <filesystem name="hpfs"     _default_volume_name="Windows NT Volume"/>
     <filesystem name="minix"    _default_volume_name="Minix Volume"/>
     <filesystem name="msdos"    _default_volume_name="MSDOS Volume"/>
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index 615a6037c..3716d70b4 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -31,6 +31,7 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-iso9660.h"
 #include "nautilus-volume-monitor.h"
+#include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
@@ -1438,14 +1439,12 @@ close_error_pipe (gboolean mount, const char *mount_path)
 	is_floppy = strstr (mount_path, "floppy") != NULL;
 		
 	/* Determine a user readable message from the obscure pipe error */
-	/* Attention localizers: The strings being examined by strstr need to be identical
-	   to the errors returned to the terminal by mount. */
 	if (mount) {
-		if (strstr (detailed_msg, _("is write-protected, mounting read-only")) != NULL) {
+		if (strstr (detailed_msg, "is write-protected, mounting read-only") != NULL) {
 			/* This is not an error. Just an informative message from mount. */
 			return;
-		} else if ((strstr (detailed_msg, _("is not a valid block device")) != NULL) ||
-			   (strstr (detailed_msg, _("No medium found")) != NULL)) {
+		} else if ((strstr (detailed_msg, "is not a valid block device") != NULL) ||
+			   (strstr (detailed_msg, "No medium found") != NULL)) {
 			/* No media in drive */
 			if (is_floppy) {
 				/* Handle floppy case */
@@ -1456,7 +1455,7 @@ close_error_pipe (gboolean mount, const char *mount_path)
 				message = g_strdup_printf (_("Nautilus was unable to mount the volume. "
 							     "There is probably no media in the device."));
 			}
-		} else if (strstr (detailed_msg, _("wrong fs type, bad option, bad superblock on")) != NULL) {
+		} else if (strstr (detailed_msg, "wrong fs type, bad option, bad superblock on") != NULL) {
 			/* Unknown filesystem */
 			if (is_floppy) {
 				message = g_strdup_printf (_("Nautilus was unable to mount the floppy drive. "
@@ -1493,14 +1492,24 @@ mount_unmount_callback (void *arg)
 {
 	FILE *file;
 	MountThreadInfo *info;
+	gchar *old_locale;
+
 	info = arg;
 	
 	if (info != NULL) {	
 		open_error_pipe ();
+		old_locale = g_getenv("LC_ALL");
+		eel_setenv("LC_ALL", "C", TRUE);
 		file = popen (info->command, "r");
 		close_error_pipe (info->should_mount, info->mount_point);
 		pclose (file);
 		
+		if (old_locale != NULL) {
+			eel_setenv("LC_ALL", old_locale, TRUE);
+		}
+		else {
+			eel_unsetenv("LC_ALL");
+		}
 		g_free (info->command);
 		g_free (info->mount_point);
 		g_free (info);
diff --git a/po/fr.po b/po/fr.po
index 8cea6fdbe..e1f77ea93 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 1.0.4.1\n"
 "POT-Creation-Date: 2001-09-01 10:57+0200\n"
-"PO-Revision-Date: 2001-09-01 10:45+0200\n"
+"PO-Revision-Date: 2001-10-02 14:03+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -7190,9 +7190,8 @@ msgid ""
 "Choose the order for information to appear beneath icon names.\n"
 "More information appears as you zoom in closer"
 msgstr ""
-"Choisissez l'ordre des informations apparaîssant sous le nom des icônes. "
-"Plus vous zoomez sur un élément et plus les informations qui vont apparaître "
-"seront nombreuses."
+"Choisissez l'ordre des informations apparaîssant sous le nom des icônes.\n"
+"Plus vous zoomez sur un élément et plus les informations qui vont apparaître seront nombreuses."
 
 #: src/nautilus-preferences-dialog.c:187
 msgid "Default View"