diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-01 15:55:15 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-01 15:55:15 -0400 |
| commit | 3aca6b555e512dc6649d625b8a1c96a01246ba9a (patch) | |
| tree | 332e5642621f15171715a8651f0d01914898209a /ppdc | |
| parent | d6db9ea1dc43510e28e0a29989b4e2e39ee099a7 (diff) | |
| download | cups-3aca6b555e512dc6649d625b8a1c96a01246ba9a.tar.gz | |
Fix ppdi/ppdc unit tests - english localization is the default and shouldn't be overriden by system.
Update sample.drv for new CUPS version.
Diffstat (limited to 'ppdc')
| -rw-r--r-- | ppdc/ppdc-catalog.cxx | 2 | ||||
| -rw-r--r-- | ppdc/sample.drv | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index c791d30dc..602321887 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -58,7 +58,7 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale filename = new ppdcString(f); messages = new ppdcArray(); - if (l) + if (l && strcmp(l, "en")) { // Try loading the base messages for this locale... char pofile[1024]; // Message catalog file diff --git a/ppdc/sample.drv b/ppdc/sample.drv index 89c75fe0d..17e33ac2c 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -114,12 +114,12 @@ #media "w576h468/8.00x6.50\"" 576 468 // Common stuff for all drivers... -Attribute "cupsVersion" "" "2.2" +Attribute "cupsVersion" "" "2.3" Attribute "FileSystem" "" "False" Attribute "LandscapeOrientation" "" "Plus90" Attribute "TTRasterizer" "" "Type42" -Copyright "Copyright 2007-2014 by Apple Inc." +Copyright "Copyright 2007-2017 by Apple Inc." Copyright "Copyright 1997-2007 by Easy Software Products." Copyright "" Copyright "These coded instructions, statements, and computer programs are the" @@ -130,7 +130,7 @@ Copyright "file is missing or damaged, see the license at \"http://www.cups.org/ Font * -Version "2.1" +Version "2.3" // Dymo Label Printer { |