The `ppdLocalizeIPPReason` function incorrectly returned a localized version

of "none" (rdar://36566269)

diff --git a/CHANGES.md b/CHANGES.md
index 319b408d2944850a3b2d4632ecfeb1c3f7792ed9..0e5086647ad3dbbf0cebeeb2ab1a367b44567140 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,8 @@ Changes in CUPS v2.3b2
 - Added a USB quirk rule for Canon MP280 series printers (Issue #5221)
 - The `cupsRasterWritePixels` function did not correctly swap bytes for some
   formats (Issue #5225)
+- The `ppdLocalizeIPPReason` function incorrectly returned a localized version
+  of "none" (rdar://36566269)
 - The scheduler did not add ".local" to the default DNS-SD host name when
   needed.
 

diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c
index 5e5ce0d3e59a48fc2215db8458c53994aa67d47c..29b2d3d9ab8ad97f7ed8179f178fa810bc0efab0 100644 (file)
--- a/cups/ppd-localize.c
+++ b/cups/ppd-localize.c
@@ -1,7 +1,7 @@
 /*
  * PPD localization routines for CUPS.
  *
- * Copyright 2007-2017 by Apple Inc.
+ * Copyright 2007-2018 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -265,7 +265,7 @@ ppdLocalizeIPPReason(
 
   if (!locattr)
   {
-    if (lang && (!scheme || !strcmp(scheme, "text")))
+    if (lang && (!scheme || !strcmp(scheme, "text")) && strcmp(reason, "none"))
     {
      /*
       * Try to localize a standard printer-state-reason keyword...