Error messages from the scheduler were not localized using the language

specified in the client's IPP request (<rdar://problem/14128011>)

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 48f32de701b57386e1622b76442b92c5e00cdef9..aaba117b1080399dc7e6e237cf5a7841ed404ecd 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,13 @@
-CHANGES.txt - 1.7.0 - 2013-07-25
+CHANGES.txt - 1.7.0 - 2013-07-26
 --------------------------------
 
 CHANGES IN CUPS V1.7.0
 
        - Fax queues did not work when shared via Bonjour
          (<rdar://problem/14498310>)
+       - Error messages from the scheduler were not localized using the
+         language specified in the client's IPP request
+         (<rdar://problem/14128011>)
        - Added an Italian localization (<rdar://problem/14481578>)
        - Fixed a couple memory leaks in ippfind that were reported by Clang.
        - Fixed a compile issue on 64-bit Linux with Clang - need to use the

diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html
index cc4e46e6c945360c4eb301504fe0de460eb7a3cf..0bb0ddcd9a8ae2f1a56e0dc61e2fabe621d27b9e 100644 (file)
--- a/doc/help/man-cupsaddsmb.html
+++ b/doc/help/man-cupsaddsmb.html
@@ -162,6 +162,8 @@ Getting the full set of Windows driver files should be easier.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <i>smbd(8)</i>, <i>smb.conf(5)</i>,
 <a href='http://localhost:631/help'>http://localhost:631/help</a>
+<br>
+<a href='http://www.cups.org/windows/'>http://www.cups.org/windows/</a>
 
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright 2007-2013 by Apple Inc.

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 906f6922e1d07bfd2bab78146ec5885b3f14c960..d04f8c4ff4825170515daf1520605d65b7c2be44 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -353,7 +353,20 @@ cupsdProcessIPPRequest(
       if (attr && attr->name &&
           !strcmp(attr->name, "attributes-natural-language") &&
          (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_LANGUAGE)
+      {
        language = attr;
+
+       /*
+        * Reset language for this request if different from Accept-Language.
+        */
+
+       if (!con->language ||
+           strcmp(attr->values[0].string.text, con->language->language))
+       {
+         cupsLangFree(con->language);
+         con->language = cupsLangGet(attr->values[0].string.text);
+       }
+      }
       else
        language = NULL;