# 
# 
# patch "ChangeLog"
#  from [9978f6a06b9aefca7df0ec4ee0a115816a2ed187]
#    to [3daf50803824a2af8399183e4bdd9fcb696ee38a]
# 
# patch "contrib/usher.cc"
#  from [2e93f4fd2f81596c24b9eb69b4eeba77c9ce2701]
#    to [b64f4dc18a125c94130e73b289958b0d734374cd]
# 
============================================================
--- ChangeLog	9978f6a06b9aefca7df0ec4ee0a115816a2ed187
+++ ChangeLog	3daf50803824a2af8399183e4bdd9fcb696ee38a
@@ -1,5 +1,12 @@
 2006-04-12  Richard Levitte  <address@hidden>
 
+	* contrib/usher.cc (fork_server): Set the C locale before
+	executing monotone itself.  This is needed since usher is
+	trying to interpret the first line of monotone output, and
+	only understands the english message.
+
+2006-04-12  Richard Levitte  <address@hidden>
+
 	* po/sv.po: "ls branches" changed to take a pattern.
 
 2006-04-12 Thomas Keller <address@hidden>
============================================================
--- contrib/usher.cc	2e93f4fd2f81596c24b9eb69b4eeba77c9ce2701
+++ contrib/usher.cc	b64f4dc18a125c94130e73b289958b0d734374cd
@@ -133,6 +133,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <time.h>
+#include <locale.h>
 
 #include <string>
 #include <list>
@@ -517,8 +518,15 @@
     }
     a[args.size()] = 0;
 
+    // Must set C locale, because usher interprets the output from
+    // monotone itself, and only deals with english!
+    setlocale(LC_ALL,"C");
+    setlocale(LC_MESSAGES,"C");
+    setlocale(LC_NUMERIC,"C");
+    setenv("LC_ALL","C",1);
+
     execvp(a[0], a);
-    perror("execvp failed\n");
+    perror("execvp failed");
     exit(1);
   } else {
     close(err[1]);