Ignore no-op translations.

diff --git a/ChangeLog b/ChangeLog
index 817788ae11b2bf2b86e35ae9b704ac756f9e963f..e8dbe515943720f1abcc38a27d6b5136aaeb437f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-03  Jim Meyering  <meyering@redhat.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * lib/propername.c (proper_name_utf8): Ignore no-op translations;
+       use the converted UTF-8 variant of the name instead.
+
 2009-05-03  Jim Meyering  <meyering@redhat.com>
 
        tests: tighten some getdate tests

diff --git a/lib/propername.c b/lib/propername.c
index b3c91aee166faeb345b37a7877d32424e28dd441..381a7a72cbafe178f3f81149812f948ed753060c 100644 (file)
--- a/lib/propername.c
+++ b/lib/propername.c
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -242,7 +242,10 @@ proper_name_utf8 (const char *name_ascii, const char *name_utf8)
          name_converted_translit != NULL ? name_converted_translit :
          name_ascii);
 
-  if (translation != name_ascii)
+  /* See whether we have a translation.  Some translators have not understood
+     that they should use the UTF-8 form of the name, if possible.  So if the
+     translator provided a no-op translation, we ignore it.  */
+  if (strcmp (translation, name_ascii) != 0)
     {
       /* See whether the translation contains the original name.  */
       if (mbsstr_trimmed_wordbounded (translation, name_ascii)