Fix handling of "yue" language.

diff --git a/cups/language.c b/cups/language.c
index 289f7b41886183506085fbee06f3ea8cf132646a..e6d2d44aad459faea4ededb12b94a8555feae215 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -697,9 +697,9 @@ cupsLangGet(const char *language)   /* I - Language or locale */
       * Map Chinese region codes to legacy country codes.
       */
 
-      if (!strcmp(country, "HANS"))
+      if (!strcmp(language, "zh") && !strcmp(country, "HANS"))
         strlcpy(country, "CN", sizeof(country));
-      if (!strcmp(country, "HANT"))
+      if (!strcmp(language, "zh") && !strcmp(country, "HANT"))
         strlcpy(country, "TW", sizeof(country));
     }
 

diff --git a/cups/testlang.c b/cups/testlang.c
index 5d9a4719af41a707fc44edf6c2b80b0bfc47b412..3f140d9bec17f9f00c34b4e42122ce541d8d7b5b 100644 (file)
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -245,6 +245,9 @@ main(int  argc,                             /* I - Number of command-line arguments */
   }
 #endif /* __APPLE__ */
 
+  if (errors == 0)
+    puts("ALL TESTS PASSED");
+
   return (errors > 0);
 }