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

[darin]

The following commit has been merged in the debian/unstable branch:
commit dadfaee16e799203b28ad613bcc44f78c75eec2c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 29 16:17:22 2004 +0000

            Reviewed by John.
    
            - fixed <rdar://problem/3559178>: navigator.language always returns "en"
    
            * WebCoreSupport.subproj/WebViewFactory.m: (-[WebViewFactory defaultLanguageCode]):
            Call +[NSUserDefaults _web_preferredLanguageCode] rather than returning "en".
    
            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d51754a..55a3c00 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed <rdar://problem/3559178>: navigator.language always returns "en"
+
+        * WebCoreSupport.subproj/WebViewFactory.m: (-[WebViewFactory defaultLanguageCode]):
+        Call +[NSUserDefaults _web_preferredLanguageCode] rather than returning "en".
+
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 2004-03-26  John Sullivan  <sullivan at apple.com>
 
         - fixed <rdar://problem/3576334>: Printing "empty" page gives print error, 
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 8b167e5..b25b197 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -48,7 +48,7 @@
 "=================\nERROR: "
 "=================\nFATAL ERROR: "
 "=================\nSHOULD NEVER BE REACHED (%s:%d %s)\n=================\n"
-">,"
+">,?"
 "?"
 "@"
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-."
@@ -271,7 +271,6 @@
 "com.apple.hiview"
 "com.apple.universalaccess"
 "displayTitle"
-"en"
 "ftp:"
 "htm"
 "html"
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index 91408f7..b7ced21 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -3,25 +3,25 @@
 //  WebKit
 //
 //  Created by Darin Adler on Tue May 07 2002.
-//  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//  Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
 //
 
 #import <WebKit/WebViewFactory.h>
 
+#import <Foundation/NSUserDefaults_NSURLExtras.h>
 #import <WebKit/WebAssertions.h>
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebControllerSets.h>
-#import <WebKit/WebFrameView.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebLocalizableStrings.h>
-
 #import <WebKit/WebPluginDatabase.h>
 
- at interface NSMenu (BrowserMenuAdditions)
+ at interface NSMenu (WebViewFactoryAdditions)
 - (NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action tag:(int)tag;
 @end
 
- at implementation NSMenu (BrowserMenuAdditions)
+ at implementation NSMenu (WebViewFactoryAdditions)
+
 - (NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action tag:(int)tag
 {
     NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:title action:action keyEquivalent:@""] autorelease];
@@ -29,11 +29,12 @@
     [self addItem:item];
     return item;
 }
+
 @end
 
 @implementation WebViewFactory
 
-+ (void)createSharedFactory;
++ (void)createSharedFactory
 {
     if (![self sharedFactory]) {
         [[[self alloc] init] release];
@@ -106,8 +107,7 @@
 
 - (NSString *)defaultLanguageCode
 {
-    // FIXME: Need implementation. Defaults gives us a list of languages, but by name, not code.
-    return @"en";
+    return [NSUserDefaults _web_preferredLanguageCode];
 }
 
 @end

-- 
WebKit Debian packaging