summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-05-10 22:03:07 +0000
committerrillig <rillig@pkgsrc.org>2006-05-10 22:03:07 +0000
commitdc1846b76dba77cb4a2deb3fff2fb947b8b5e796 (patch)
tree86e09a7926f9870431cfcea085e3a45dea7b74db
parent08244eaeb801728f2437ad47626b9d68c1eacdb9 (diff)
downloadpkgsrc-dc1846b76dba77cb4a2deb3fff2fb947b8b5e796.tar.gz
Don't let this program get confused just because there is no white-space
between msgstr and the following string. The bug showed off at icewm-1.2.25, file po/tr.po, line 774. While at it, removed an unnecessary variable.
-rwxr-xr-xmk/tools/msgfmt.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/tools/msgfmt.sh b/mk/tools/msgfmt.sh
index edc61b7c415..cd457f72ac3 100755
--- a/mk/tools/msgfmt.sh
+++ b/mk/tools/msgfmt.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: msgfmt.sh,v 1.14 2006/04/15 04:41:08 jlam Exp $
+# $NetBSD: msgfmt.sh,v 1.15 2006/05/10 22:03:07 rillig Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -174,8 +174,7 @@ BEGIN {
# the contents of the singular array and output the
# "msgstr" translation.
#
- MSGSTR_RE = ORE "msgstr[ ]+"
- if ($0 ~ MSGSTR_RE) {
+ if ($0 ~ (ORE "msgstr[ ]*\"")) {
if (s > 0) {
print obsolete "msgid " singular[0]
for (i = 1; i < s; i++)