Don't consider a message as being ASCII if its msgid or msgid_plural is

not ASCII.

diff --git a/src/ChangeLog b/src/ChangeLog
index dcd5b8334039c60d1eec7cf1a30424dc60f952cc..544c79cf02947115b99df446f9ef158097cd62e7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-13  Bruno Haible  <bruno@clisp.org>
+
+       * msgl-ascii.c (is_ascii_message): Don't consider a message as being
+       ASCII if its msgid or msgid_plural is not ASCII.
+
 2002-01-12  Bruno Haible  <bruno@clisp.org>
 
        * gettext.c (main): Update year in --version output.

diff --git a/src/msgl-ascii.c b/src/msgl-ascii.c
index 0fb6559055ff6bdc6ea929b4532ef802a32a00d2..b43aca7e0dadc240b47eac97b4bab8f856da8e51 100644 (file)
--- a/src/msgl-ascii.c
+++ b/src/msgl-ascii.c
@@ -1,5 +1,5 @@
 /* Message list test for ASCII character set.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -69,6 +69,13 @@ is_ascii_message (mp)
   if (!is_ascii_string_list (mp->comment_dot))
     return false;
 
+  /* msgid and msgid_plural are normally ASCII, so why checking?
+     Because in complete UTF-8 environments they can be UTF-8, not ASCII.  */
+  if (!is_ascii_string (mp->msgid))
+    return false;
+  if (mp->msgid_plural != NULL && !is_ascii_string (mp->msgid_plural))
+    return false;
+
   return true;
 }