X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpropername.c;h=381a7a72cbafe178f3f81149812f948ed753060c;hb=3f0d472e052865baf722ea457e35dd067b94a477;hp=5cd4d8f49a15936cbae1913cfdd9642a23a8df44;hpb=6b9110352459e246e99a5c2d396f5dc42d0cd32b;p=gnulib.git

diff --git a/lib/propername.c b/lib/propername.c
index 5cd4d8f49..381a7a72c 100644
--- 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
@@ -31,9 +31,7 @@
 
 #include "trim.h"
 #include "mbchar.h"
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 #include "localcharset.h"
 #include "c-strcase.h"
 #include "xstriconv.h"
@@ -60,7 +58,6 @@ mbsstr_trimmed_wordbounded (const char *string, const char *sub)
 	break;
       else
 	{
-#if HAVE_MBRTOWC
 	  if (MB_CUR_MAX > 1)
 	    {
 	      mbui_iterator_t string_iter;
@@ -117,7 +114,6 @@ mbsstr_trimmed_wordbounded (const char *string, const char *sub)
 	      string = tsub_in_string + mb_len (mbui_cur (string_iter));
 	    }
 	  else
-#endif /* HAVE_MBRTOWC */
 	    {
 	      bool word_boundary_before;
 	      const char *p;
@@ -246,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)