Update Apple language ID mapping to POSIX locale IDs (rdar://32419311)

diff --git a/CHANGES.md b/CHANGES.md
index 24270baf33cdf027dd02f454eb5616c37d9e326b..1895cf698238bed989161fac51389b40baa22d01 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,12 @@
-CHANGES - 2.2.4 - 2017-06-30
+CHANGES - 2.2.5 - 2017-06-30
 ============================
 
+CHANGES IN CUPS V2.2.5
+----------------------
+
+- Fixed an issue with Chinese localizations on macOS (rdar://32419311)
+
+
 CHANGES IN CUPS V2.2.4
 ----------------------
 

diff --git a/configure.ac b/configure.ac
index b79a738f685aaa70487aa26b205a6f2e6b7f00f1..9b2177e12de7d0c876489bc911b844df8fa60044 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.2.4], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.2.5], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)

diff --git a/cups/cups.h b/cups/cups.h
index a73cf7aebe41f6bafaee0ca836925543b6bdeb7c..9525ffe9945568d5e2a5f3accfe91b3a5dbdee36 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -47,10 +47,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 2.0204
+#  define CUPS_VERSION                 2.0205
 #  define CUPS_VERSION_MAJOR           2
 #  define CUPS_VERSION_MINOR           2
-#  define CUPS_VERSION_PATCH           4
+#  define CUPS_VERSION_PATCH           5
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/cups/language.c b/cups/language.c
index f3a3496b9f6810f8e802ba5343bf1a9d6a35e3bb..0fdff2c853717b1aa01837ff0fc8a938f5302b8c 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -123,7 +123,9 @@ static const _apple_language_locale_t apple_language_locale[] =
   { "nb",         "no" },
   { "nb_NO",      "no" },
   { "zh-Hans",    "zh_CN" },
+  { "zh_HANS",    "zh_CN" },
   { "zh-Hant",    "zh_TW" },
+  { "zh_HANT",    "zh_TW" },
   { "zh-Hant_CN", "zh_TW" }
 };
 #endif /* __APPLE__ */
@@ -278,7 +280,10 @@ _cupsAppleLocale(CFStringRef languageName, /* I - Apple language ID */
                   sizeof(apple_language_locale[0]));
         i ++)
     {
-      if (!strcmp(locale, apple_language_locale[i].language))
+      size_t len = strlen(apple_language_locale[i].language);
+
+      if (!strcmp(locale, apple_language_locale[i].language) ||
+          (!strncmp(locale, apple_language_locale[i].language, len) && (locale[len] == '_' || locale[len] == '-')))
       {
        strlcpy(locale, apple_language_locale[i].locale, localesize);
        break;

diff --git a/cups/testlang.c b/cups/testlang.c
index 6aa49ab407599045604c82bc11e529b1fe3953d6..9e543a8b2cc68ce210911b8ed47159e9bc3bc3fd 100644 (file)
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -138,6 +138,8 @@ main(int  argc,                             /* I - Number of command-line arguments */
         }
       }
 
+      printf("media-empty: %s\n", ppdLocalizeIPPReason(ppd, "media-empty", NULL, buffer, sizeof(buffer)));
+
       ppdClose(ppd);
     }
   }