|
cvsdist |
79dcdc0 |
diff -ruN cups-1.1.19.orig/cups/language.c cups-1.1.19/cups/language.c
|
|
cvsdist |
79dcdc0 |
--- cups-1.1.19.orig/cups/language.c 2003-08-14 20:13:18.000000000 +0900
|
|
cvsdist |
79dcdc0 |
+++ cups-1.1.19/cups/language.c 2003-08-14 20:37:37.000000000 +0900
|
|
cvsdist |
79dcdc0 |
@@ -188,6 +188,7 @@
|
|
cvsdist |
79dcdc0 |
charset[16], /* Character set */
|
|
cvsdist |
79dcdc0 |
*ptr, /* Pointer into language/ */
|
|
cvsdist |
79dcdc0 |
real[48], /* Real language name */
|
|
cvsdist |
79dcdc0 |
+ ll_cc[48], /* Language + Country name */
|
|
cvsdist |
79dcdc0 |
filename[1024], /* Filename for language locale file */
|
|
cvsdist |
79dcdc0 |
*localedir; /* Directory for locale files */
|
|
cvsdist |
79dcdc0 |
cups_encoding_t encoding; /* Encoding to use */
|
|
cvsdist |
79dcdc0 |
@@ -356,6 +357,7 @@
|
|
cvsdist |
79dcdc0 |
*/
|
|
cvsdist |
79dcdc0 |
|
|
cvsdist |
79dcdc0 |
snprintf(real, sizeof(real), "%s_%s", langname, country);
|
|
cvsdist |
79dcdc0 |
+ strcpy(ll_cc, real);
|
|
cvsdist |
79dcdc0 |
|
|
cvsdist |
79dcdc0 |
if ((lang = cups_cache_lookup(real, encoding)) != NULL)
|
|
cvsdist |
79dcdc0 |
return (lang);
|
|
cvsdist |
79dcdc0 |
@@ -468,7 +470,7 @@
|
|
cvsdist |
79dcdc0 |
*/
|
|
cvsdist |
79dcdc0 |
|
|
cvsdist |
79dcdc0 |
lang->used ++;
|
|
cvsdist |
79dcdc0 |
- strlcpy(lang->language, real, sizeof(lang->language));
|
|
cvsdist |
79dcdc0 |
+ strlcpy(lang->language, ll_cc, sizeof(lang->language));
|
|
cvsdist |
79dcdc0 |
|
|
cvsdist |
79dcdc0 |
if (charset[0])
|
|
cvsdist |
79dcdc0 |
lang->encoding = encoding;
|