[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 123511fe1278d70e7d11a2ea5f265321473e3e03
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 12:40:19 2002 +0000

            - fixed 2876448 - The authentication panel should give a note when
    	the user tried to log in and failed
    
    	Also, made the message different (and more helpful) when the
    	authentication is for a proxy server.
    
            * Panels.subproj/WebAuthenticationPanel.m:
            (-[WebAuthenticationPanel setUpForRequest:]): Use different
    	messages depending on proxy and previous failure count.
    
    	Updated localized strings:
    
    	* English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 47b13a8..a3934ca 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,22 @@
 2002-10-23  Maciej Stachowiak  <mjs at apple.com>
 
+        - fixed 2876448 - The authentication panel should give a note when
+	the user tried to log in and failed
+
+	Also, made the message different (and more helpful) when the
+	authentication is for a proxy server.
+	
+        * Panels.subproj/WebAuthenticationPanel.m:
+        (-[WebAuthenticationPanel setUpForRequest:]): Use different
+	messages depending on proxy and previous failure count.
+
+	Updated localized strings:
+	
+	* English.lproj/Localizable.strings:
+        * English.lproj/StringsNotToBeLocalized.txt:
+
+2002-10-23  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 2876446 - The label in the authentication panel needs to
 	adjust its height depending on content
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 47b13a8..a3934ca 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
 2002-10-23  Maciej Stachowiak  <mjs at apple.com>
 
+        - fixed 2876448 - The authentication panel should give a note when
+	the user tried to log in and failed
+
+	Also, made the message different (and more helpful) when the
+	authentication is for a proxy server.
+	
+        * Panels.subproj/WebAuthenticationPanel.m:
+        (-[WebAuthenticationPanel setUpForRequest:]): Use different
+	messages depending on proxy and previous failure count.
+
+	Updated localized strings:
+	
+	* English.lproj/Localizable.strings:
+        * English.lproj/StringsNotToBeLocalized.txt:
+
+2002-10-23  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 2876446 - The label in the authentication panel needs to
 	adjust its height depending on content
 
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index fad4531..8db90ed 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index de3bae0..47ccba4 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -145,7 +145,6 @@
 "image/jpeg"
 "image/png"
 "lastVisitedDate"
-"name: %@\npath: %@\nisLoaded: %d\nmimeTypes:\n%@\npluginDescription:%@"
 "nullplugin"
 "pluginspage"
 "text/"
@@ -162,6 +161,8 @@ History.subproj/WebHistoryItem.m:"title"
 Misc.subproj/WebIconDatabase.m:"Experiments"
 Misc.subproj/WebIconDatabase.m:"icon:%@"
 Misc.subproj/WebKitLogging.m
+Panels.subproj/WebAuthenticationPanel.m:"%@:%u"
+Plugins.subproj/WebBasePluginPackage.m:"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
 Plugins.subproj/WebNetscapePluginPackage.m:"main"
 WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
 WebCoreSupport.subproj/WebTextRenderer.m:"YES"
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 403dd73..d1bfc7d 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -97,12 +97,44 @@
     // FIXME Radar 2876448: we should display a different dialog depending on the
     // failure count (if the user tried and failed, the dialog should
     // explain possible reasons)
-    [mainLabel setStringValue:[NSString stringWithFormat:
-        UI_STRING("To view this page, you need to log in to area “%@” on %@.",
-            "prompt string in authentication panel"),
-        [resource realm], [[resource URL] host]]];
 
-    [mainLabel sizeToFitAndAdjustWindowHeight];
+    NSString *realm = [resource realm];
+    NSString *proxyType = [resource proxyType];
+    NSString *host;
+
+    if ([resource isProxy]) {
+        host = [resource proxyHost];
+    } else {
+        host = [[resource URL] port] == 0 ? [[resource URL] host] : [NSString stringWithFormat:@"%@:%u", [[resource URL] host], [[resource URL] port]];
+    }
+    
+    NSString *message;
+
+    if ([req previousFailureCount] == 0) {
+        if ([resource isProxy]) {
+            message = [NSString stringWithFormat:UI_STRING("To view this page, you need to log in to the %@ proxy server %@.",
+                                                           "prompt string in authentication panel"),
+                proxyType, host];
+        } else {
+            message = [NSString stringWithFormat:UI_STRING("To view this page, you need to log in to area “%@” on %@.",
+                                                           "prompt string in authentication panel"),
+                realm, host];
+        }
+    } else {
+        if ([resource isProxy]) {
+            message = [NSString stringWithFormat:UI_STRING("The name or password entered for the %@ proxy server %@ was incorrect. Please try again.",
+                                                           "prompt string in authentication panel"),
+                proxyType, host];
+        } else {
+            message = [NSString stringWithFormat:UI_STRING("The name or password entered for area “%@” on %@ was incorrect. Please try again.",
+                                                           "prompt string in authentication panel"),
+                realm, host];
+        }
+    }
+
+[mainLabel setStringValue:message];
+
+[mainLabel sizeToFitAndAdjustWindowHeight];
 
     if ([resource receivesCredentialSecurely]) {
         [smallLabel setStringValue:

-- 
WebKit Debian packaging