From: Bruno Haible <bruno@clisp.org>
Date: Mon, 15 Mar 2004 11:46:48 +0000 (+0000)
Subject: Remove workarounds for mono bugs that are now fixed.
X-Git-Tag: v0.14.2~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35935a26e1cfeb0c8285ac724ef6f5d7b46b7895;p=thirdparty%2Fgettext.git

Remove workarounds for mono bugs that are now fixed.
---

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index ea9aa16b1..03111b543 100644
--- 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 bb344fb67..4a224f37d 100644
--- 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 ce3c3b8cf..d2db732cf 100644
--- 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!"));