Password prompt doesn't use translated string

[michaelrsweet]

Version: 1.2.6
CUPS.org User: twaugh.redhat

We have translated strings for "Password for %s on %s?" but they aren't used. Here's the patch to fix that.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

The attached patch uses the (cached) global default language and doesn't use a temporary variable for the format string...

[michaelrsweet]

"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],

[michaelrsweet]

"str2121.patch":

Index: auth.c

--- auth.c (revision 6131)
+++ auth.c (working copy)
@@ -75,6 +75,7 @@
realm[HTTP_MAX_VALUE], /* realm="xyz" string /
nonce[HTTP_MAX_VALUE], / nonce="xyz" string /
encode[512]; / Encoded username:password */

• _cups_globals_t cg; / Global data */

DEBUG_printf(("cupsDoAuthentication(http=%p, method="%s", resource="%s")\n",
@@ -114,9 +115,16 @@

• Nope - get a new password from the user...
  */
• snprintf(prompt, sizeof(prompt), _("Password for %s on %s? "), cupsUser(),

•         http->hostname[0] == '/' ? "localhost" : http->hostname);
  

• cg = _cupsGlobals();
• if (!cg->lang_default)

•  cg->lang_default = cupsLangDefault();
  
• snprintf(prompt, sizeof(prompt),

•         _cupsLangString(cg->lang_default, _("Password for %s on %s? ")),
  

•    cupsUser(),
  

•    http->hostname[0] == '/' ? "localhost" : http->hostname);
  

  http->digest_tries = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
  "Digest", 5) != 0;
  http->userpass[0] = '\0';