rpms/cups/FC-6 cups-translate-prompt.patch, NONE, 1.1 cups.spec, 1.302, 1.303

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv943

Modified Files:
	cups.spec 
Added Files:
	cups-translate-prompt.patch 
Log Message:
* Thu Nov 23 2006 Tim Waugh <twaugh at redhat.com>
- Use translated string for password prompt (STR #2121).


cups-translate-prompt.patch:
 auth.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE cups-translate-prompt.patch ---
--- cups-1.2.7/cups/auth.c~	2006-09-16 20:08:36.000000000 +0100
+++ cups-1.2.7/cups/auth.c	2006-11-23 09:41:55.000000000 +0000
@@ -114,7 +114,10 @@
     * Nope - get a new password from the user...
     */
 
-    snprintf(prompt, sizeof(prompt), _("Password for %s on %s? "), cupsUser(),
+    cups_lang_t *lang = cupsLangDefault();
+    const char *prompt_fmt = _cupsLangString (lang,
+					      _("Password for %s on %s? "));
+    snprintf(prompt, sizeof(prompt), prompt_fmt, cupsUser(),
              http->hostname[0] == '/' ? "localhost" : http->hostname);
 
     http->digest_tries  = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- cups.spec	22 Nov 2006 12:01:24 -0000	1.302
+++ cups.spec	23 Nov 2006 09:47:08 -0000	1.303
@@ -45,6 +45,7 @@
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
+Patch22: cups-translate-prompt.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -148,6 +149,7 @@
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
+%patch22 -p1 -b .translate-prompt
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -430,6 +432,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Nov 23 2006 Tim Waugh <twaugh at redhat.com>
+- Use translated string for password prompt (STR #2121).
+
 * Wed Nov 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.7-1.3
 - Another LSPP fix (bug #216669).
 - Fixed LSPP SELinux check (bug #216855).