IPP Everywhere PPDs were not localized to English (Issue #5205)

Install cups.pot as cups_en.po

diff --git a/CHANGES.md b/CHANGES.md
index 52b9be5ab2815467db48b2bdc20ddd88adb69a78..770907fcea26e5bbeb03d57ab9ea95d2de104107 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.3b2 - 2018-01-11
+CHANGES - 2.3b2 - 2018-01-15
 ============================
 
 
@@ -7,6 +7,7 @@ Changes in CUPS v2.3b2
 
 - Localization changes (Issue #5210)
 - Build fixes (Issue #5217)
+- IPP Everywhere PPDs were not localized to English (Issue #5205)
 - The `cupsGetDests` and `cupsEnumDests` functions no longer filter out local
   print services like IPP USB devices (Issue #5206)
 - The `cupsCopyDest` function now correctly copies the `is_default` value

diff --git a/locale/Makefile b/locale/Makefile
index 4db478ce939186c9f9a70c1ab4d81c29a75528d1..1a8e9a9cf7fad5242e3f65b2bed49beaac61abc7 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,7 +1,7 @@
 #
 # Locale file makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1993-2007 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -72,6 +72,8 @@ install-languages:
                        $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
                fi ; \
        done
+       $(INSTALL_DIR) -m 7555 $(LOCALEDIR)/en
+       $(INSTALL_DATA) cups.pot $(LOCALEDIR)/en/cups_en.po
 
 install-langbundle: po2strings
        $(INSTALL_DIR) -m 755 "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj"

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 6924ef1e94eb7c9544193fe408e2e3579ab63e40..763c429495be3066b82c7e50faf25966acce3872 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -3,7 +3,7 @@
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -304,8 +304,9 @@ for file in ../locale/cups_*.po; do
        loc=`basename $file .po | cut -c 6-`
        mkdir $BASE/share/locale/$loc
        ln -s $root/locale/cups_$loc.po $BASE/share/locale/$loc
-       ln -s $root/locale/ppdc_$loc.po $BASE/share/locale/$loc
 done
+mkdir $BASE/share/locale/en
+ln -s $root/locale/cups.pot $BASE/share/locale/en/cups_en.po
 mkdir $BASE/share/mime
 mkdir $BASE/share/model
 mkdir $BASE/share/ppdc