Merge changes from CUPS 1.5svn-r9022.

[thirdparty/cups.git] / ppdc / ppdc.cxx

diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx
index 78ad95f94c8044d23ad3cfab84a7183c4e09a1a2..eaf88fa42ed1648d69b1576bd30a353007d50848 100644 (file)
--- a/ppdc/ppdc.cxx
+++ b/ppdc/ppdc.cxx
@@ -59,6 +59,7 @@ main(int  argc,                               // I - Number of command-line arguments
                        filename[1024]; // PPD filename
   int                  comp,           // Compress
                        do_test,        // Test PPD files
+                       single_language,// Generate single-language files
                        use_model_name, // Use ModelName for filename
                        verbose;        // Verbosity
   ppdcLineEnding       le;             // Line ending to use
@@ -69,16 +70,17 @@ main(int  argc,                             // I - Number of command-line arguments
   _cupsSetLocale(argv);
 
   // Scan the command-line...
-  catalog        = NULL;
-  comp           = 0;
-  do_test        = 0;
-  le             = PPDC_LFONLY;
-  locales        = NULL;
-  outdir         = "ppd";
-  src            = new ppdcSource();
-  use_model_name = 0;
-  verbose        = 0;
-  filenames      = cupsArrayNew((cups_array_func_t)strcasecmp, NULL);
+  catalog         = NULL;
+  comp            = 0;
+  do_test         = 0;
+  le              = PPDC_LFONLY;
+  locales         = NULL;
+  outdir          = "ppd";
+  single_language = 0;
+  src             = new ppdcSource();
+  use_model_name  = 0;
+  verbose         = 0;
+  filenames       = cupsArrayNew((cups_array_func_t)strcasecmp, NULL);
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
@@ -178,6 +180,8 @@ main(int  argc,                             // I - Number of command-line arguments
              }
              else
              {
+               single_language = 1;
+
                if (verbose > 1)
                  _cupsLangPrintf(stdout,
                                  _("ppdc: Loading messages for locale "
@@ -383,7 +387,7 @@ main(int  argc,                             // I - Number of command-line arguments
 
       ppdcArray *templocales = locales;
 
-      if (!templocales)
+      if (!templocales && !single_language)
       {
        templocales = new ppdcArray();
        for (ppdcCatalog *tempcatalog = (ppdcCatalog *)src->po_files->first();