From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 6 Aug 2015 14:08:01 +0000 (+0000)
Subject: Fix another new Chinese locale ID (<rdar://problem/22086642>)
X-Git-Tag: v2.2b1~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88da9d73514c35594ec73add4c035cce6ff7b7c5;p=thirdparty%2Fcups.git

Fix another new Chinese locale ID (<rdar://problem/22086642>)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12835 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 41cefefc75..4da7ab80a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,8 +3,8 @@ CHANGES.txt - 2.1.0 - 2015-08-06
 
 CHANGES IN CUPS V2.1.0
 
-	- The new Hong Kong Chinese locale did not correctly use Taiwan Chinese
-	  as a fallback (<rdar://problem/22130168>)
+	- Support new Chinese locale IDs and their correct fallback locales
+	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
 	- "make check" incorrectly reported an expectation of 18 warning
 	  messages when 8 were expected (STR #4684)
 
diff --git a/cups/language.c b/cups/language.c
index de6fdeabda..00c7400545 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1324,6 +1324,18 @@ appleMessageLoad(const char *locale)	/* I - Locale ID */
   snprintf(filename, sizeof(filename),
            CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings",
 	   _cupsAppleLanguage(locale, applelang, sizeof(applelang)));
+
+  if (access(filename, 0))
+  {
+   /*
+    * <rdar://problem/22086642>
+    *
+    * Try with original locale string...
+    */
+
+    snprintf(filename, sizeof(filename), CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings", locale);
+  }
+
   DEBUG_printf(("1appleMessageLoad: filename=\"%s\"", filename));
 
   if (access(filename, 0))