2004-06-05 Atsushi Enomoto <atsushi@ximian.com>

	* Driver.cs : Percent patterns are not properly parsed since they are
	  in fact not separated by '.'
	* Entry.cs : Escape '\' to "\\" (for Japanese yen-sign fix).

svn path=/trunk/mono/; revision=28879

diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog
index 6c8c668eb1443274e8a40a9aa4c205b3bbe5537c..b798d2e50d4550650607c53f409e7c39ff9b06b0 100644 (file)
--- a/tools/locale-builder/ChangeLog
+++ b/tools/locale-builder/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Driver.cs : Percent patterns are not properly parsed since they are
+         in fact not separated by '.'
+       * Entry.cs : Escape '\' to "\\" (for Japanese yen-sign fix).
+
 2004-06-05  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Driver.cs :

diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index fb2051a1f901050ae5c3cc3cfe6a55757cdabc2f..89735c4f68cf6adef07b0e711175a31bdfa2116f 100644 (file)
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -586,8 +586,6 @@ namespace Mono.Tools.LocaleBuilder {
                        }
 
                        part_one = format.Split (new char [1] {'.'}, 2);
-                       if (part_one.Length == 1)
-                               part_one = new string [] {part_one [0], String.Empty};
                        if (part_one.Length == 2) {
                                // assumed same for both positive and negative
                                // decimal digit side
@@ -598,6 +596,9 @@ namespace Mono.Tools.LocaleBuilder {
                                        else
                                                break;
                                }
+                       }
+
+                       if (part_one.Length > 0) {
                                // percent grouping side
                                part_two = part_one [0].Split (',');
                                if (part_two.Length > 1) {

diff --git a/tools/locale-builder/Entry.cs b/tools/locale-builder/Entry.cs
index 15d9a59f4363a3e7280def2949daee2269d1ff85..baf37d2893a4bce46c39b6f9f3e6fa17b414c086 100644 (file)
--- a/tools/locale-builder/Entry.cs
+++ b/tools/locale-builder/Entry.cs
@@ -22,6 +22,8 @@ namespace Mono.Tools.LocaleBuilder {
                                         ret.AppendFormat ("\\x{0:x}", b);
                                         in_hex = true;
                                 } else {
+                                        if (b == '\\')
+                                                ret.Append ('\\');
                                         ret.Append ((char) b);
                                         in_hex = false;
                                 }