[pkgsrc/trunk]: pkgsrc/mk/tools Minor fix for last commit... in the case wher...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c392de411109
branches:  trunk
changeset: 513876:c392de411109
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jun 05 13:36:14 2006 +0000

description:
Minor fix for last commit... in the case where msgstr is just the
empty string (because no translation has yet been made), it's okay to
have mismatching "\n" in the msgid and msgstr texts.  This should fix
PR pkg/33645 by Carl Brewer.

diffstat:

 mk/tools/msgfmt.sh |  14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diffs (44 lines):

diff -r 3a19a6c1f75f -r c392de411109 mk/tools/msgfmt.sh
--- a/mk/tools/msgfmt.sh        Mon Jun 05 12:41:14 2006 +0000
+++ b/mk/tools/msgfmt.sh        Mon Jun 05 13:36:14 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: msgfmt.sh,v 1.20 2006/06/04 23:18:38 jlam Exp $
+# $NetBSD: msgfmt.sh,v 1.21 2006/06/05 13:36:14 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -213,9 +213,7 @@
                        while ((t > 1) && (translation[t-1] ~ /^""$/)) t--
                        if ((singular[s-1] ~ /\\n"$/) &&
                            (translation[t-1] !~ /\\n"$/)) {
-                               if (translation[t-1] ~ /""/)
-                                       translation[t-1] = "\" \\n\""
-                               else
+                               if (translation[t-1] !~ /""/)
                                        sub("\"$", "\\n\"", translation[t-1])
                        }
                        if (t > 0) {
@@ -254,9 +252,7 @@
                        while ((t > 1) && (translation[t-1] ~ /^""$/)) t--
                        if ((singular[s-1] ~ /\\n"$/) &&
                            (translation[t-1] !~ /\\n"$/)) {
-                               if (translation[t-1] ~ /""/)
-                                       translation[t-1] = "\" \\n\""
-                               else
+                               if (translation[t-1] !~ /""/)
                                        sub("\"$", "\\n\"", translation[t-1])
                        }
                        if (t > 0) {
@@ -319,9 +315,7 @@
                        while ((t > 1) && (translation[t-1] ~ /^""$/)) t--
                        if ((plural[p-1] ~ /\\n"$/) &&
                            (translation[t-1] !~ /\\n"$/)) {
-                               if (translation[t-1] ~ /""/)
-                                       translation[t-1] = "\" \\n\""
-                               else
+                               if (translation[t-1] !~ /""/)
                                        sub("\"$", "\\n\"", translation[t-1])
                        }
                        if (t > 0) {