Remove workarounds for mono bugs that are now fixed.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index ea9aa16b17b697be51191fb7e2c270a1de96fca7..03111b5439086c17ec9fae3a0472ba9ed734c2d4 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-24  Bruno Haible  <bruno@clisp.org>
+
+       * hello-csharp*/hello.cs (Hello.Main): Remove workaround for mono bug,
+       fixed in mono-0.30.1.
+
 2004-02-24  Bruno Haible  <bruno@clisp.org>
 
        * hello-csharp*/autogen.sh: Copy also the csharp.m4 file.

diff --git a/gettext-tools/examples/hello-csharp-forms/hello.cs b/gettext-tools/examples/hello-csharp-forms/hello.cs
index bb344fb674acd854a4c9343fd02bacc69105ff8c..4a224f37d5ee79334b1ddff70ef6194a7a4e21c6 100644 (file)
--- a/gettext-tools/examples/hello-csharp-forms/hello.cs
+++ b/gettext-tools/examples/hello-csharp-forms/hello.cs
@@ -77,20 +77,6 @@ public class Hello {
   }
 
   public static void Main () {
-    #if __MonoCS__
-    // Some systems don't set CurrentCulture and CurrentUICulture as specified
-    // by LC_ALL. So set it by hand.
-    String locale = System.Environment.GetEnvironmentVariable("LC_ALL");
-    if (locale == null || locale == "")
-      locale = System.Environment.GetEnvironmentVariable("LANG");
-    if (!(locale == null || locale == "")) {
-      if (locale.IndexOf('.') >= 0)
-        locale = locale.Substring(0,locale.IndexOf('.'));
-      System.Threading.Thread.CurrentThread.CurrentCulture =
-      System.Threading.Thread.CurrentThread.CurrentUICulture =
-        new System.Globalization.CultureInfo(locale.Replace('_','-'));
-    }
-    #endif
     Application.Run(new HelloWindow());
   }
 }

diff --git a/gettext-tools/examples/hello-csharp/hello.cs b/gettext-tools/examples/hello-csharp/hello.cs
index ce3c3b8cf7f32558f97edbe33d3fab33c5ccc826..d2db732cf9414359fa07929912f4534328a54955 100644 (file)
--- a/gettext-tools/examples/hello-csharp/hello.cs
+++ b/gettext-tools/examples/hello-csharp/hello.cs
@@ -10,20 +10,6 @@ using System.Diagnostics; /* Process */
 
 public class Hello {
   public static void Main (String[] args) {
-    #if __MonoCS__
-    // Some systems don't set CurrentCulture and CurrentUICulture as specified
-    // by LC_ALL. So set it by hand.
-    String locale = System.Environment.GetEnvironmentVariable("LC_ALL");
-    if (locale == null || locale == "")
-      locale = System.Environment.GetEnvironmentVariable("LANG");
-    if (!(locale == null || locale == "")) {
-      if (locale.IndexOf('.') >= 0)
-        locale = locale.Substring(0,locale.IndexOf('.'));
-      System.Threading.Thread.CurrentThread.CurrentCulture =
-      System.Threading.Thread.CurrentThread.CurrentUICulture =
-        new System.Globalization.CultureInfo(locale.Replace('_','-'));
-    }
-    #endif
     GettextResourceManager catalog =
       new GettextResourceManager("hello-csharp");
     Console.WriteLine(catalog.GetString("Hello, world!"));