[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 1f6909afe31371192672afb0b24273ad10a04712
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 24 07:35:53 2002 +0000

            * kwq/KWQKLocale.mm: (i18n): Make it obvious when non-localized
    	strings from WebCore show up in the UI, but putting the string
    	"not localized: " in front.
    
            * kwq/KWQKMessageBox.mm:
            (KMessageBox::error): Fix use of NSRunAlertPanel so that we won't
    	accidentally try to interpret % sequences in the messages we are displaying.
            (KMessageBox::warningYesNo): Ditto.
            (KMessageBox::questionYesNo): Ditto.
            (KMessageBox::sorry): Ditto.
            (KMessageBox::information): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7369691..09bdf6f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-24  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKLocale.mm: (i18n): Make it obvious when non-localized
+	strings from WebCore show up in the UI, but putting the string
+	"not localized: " in front.
+
+        * kwq/KWQKMessageBox.mm:
+        (KMessageBox::error): Fix use of NSRunAlertPanel so that we won't
+	accidentally try to interpret % sequences in the messages we are displaying.
+        (KMessageBox::warningYesNo): Ditto.
+        (KMessageBox::questionYesNo): Ditto.
+        (KMessageBox::sorry): Ditto.
+        (KMessageBox::information): Ditto.
+
 2002-10-23  Chris Blumenberg  <cblu at apple.com>
 
 	WebKit now gets called when render_frame subviews are added.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7369691..09bdf6f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-10-24  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKLocale.mm: (i18n): Make it obvious when non-localized
+	strings from WebCore show up in the UI, but putting the string
+	"not localized: " in front.
+
+        * kwq/KWQKMessageBox.mm:
+        (KMessageBox::error): Fix use of NSRunAlertPanel so that we won't
+	accidentally try to interpret % sequences in the messages we are displaying.
+        (KMessageBox::warningYesNo): Ditto.
+        (KMessageBox::questionYesNo): Ditto.
+        (KMessageBox::sorry): Ditto.
+        (KMessageBox::information): Ditto.
+
 2002-10-23  Chris Blumenberg  <cblu at apple.com>
 
 	WebKit now gets called when render_frame subviews are added.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7369691..09bdf6f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-10-24  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKLocale.mm: (i18n): Make it obvious when non-localized
+	strings from WebCore show up in the UI, but putting the string
+	"not localized: " in front.
+
+        * kwq/KWQKMessageBox.mm:
+        (KMessageBox::error): Fix use of NSRunAlertPanel so that we won't
+	accidentally try to interpret % sequences in the messages we are displaying.
+        (KMessageBox::warningYesNo): Ditto.
+        (KMessageBox::questionYesNo): Ditto.
+        (KMessageBox::sorry): Ditto.
+        (KMessageBox::information): Ditto.
+
 2002-10-23  Chris Blumenberg  <cblu at apple.com>
 
 	WebKit now gets called when render_frame subviews are added.
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index 76affe9..dd6a0a8 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -27,16 +27,9 @@
 #import <KWQLogging.h>
 #import <qstring.h>
 
- at interface KWQKLocaleBundleDummy : NSObject { }
- at end
- at implementation KWQKLocaleBundleDummy
- at end
-
 QString i18n(const char *text)
 {
-    NSBundle *bundle = [NSBundle bundleForClass:[KWQKLocaleBundleDummy class]];
-    NSString *locString = [bundle localizedStringForKey:[NSString stringWithCString:text] value:nil table:nil];
-    return QString::fromNSString(locString);
+    return QString("not localized: ") + text;
 }
 
 QString KLocale::language() const
diff --git a/WebCore/kwq/KWQKMessageBox.mm b/WebCore/kwq/KWQKMessageBox.mm
index c097109..852af12 100644
--- a/WebCore/kwq/KWQKMessageBox.mm
+++ b/WebCore/kwq/KWQKMessageBox.mm
@@ -30,9 +30,9 @@ void KMessageBox::error(QWidget *, const QString &message,
     const QString &caption, bool notify)
 {
     if (caption.isNull())
-        NSRunAlertPanel(nil, message.getNSString(), nil, nil, nil);
+        NSRunAlertPanel(nil, @"%@", nil, nil, nil, message.getNSString());
     else
-        NSRunAlertPanel(caption.getNSString(), message.getNSString(), nil, nil, nil);
+        NSRunAlertPanel(caption.getNSString(), @"%@", nil, nil, nil, message.getNSString());
 }
 
 int KMessageBox::warningYesNo(QWidget *, const QString &message, 
@@ -46,9 +46,9 @@ int KMessageBox::warningYesNo(QWidget *, const QString &message,
     int result;
     
     if (caption.isNull())
-        result = NSRunAlertPanel(nil, message.getNSString(), yes, no, nil);
+        result = NSRunAlertPanel(nil, @"%@", yes, no, nil, message.getNSString());
     else
-        result = NSRunAlertPanel(caption.getNSString(), message.getNSString(), yes, no, nil);
+        result = NSRunAlertPanel(caption.getNSString(), @"%@", yes, no, nil, message.getNSString());
 
     if (result == NSAlertDefaultReturn)
         return 1;
@@ -66,9 +66,9 @@ int KMessageBox::questionYesNo(QWidget *, const QString &message,
     int result;
     
     if (caption.isNull())
-        result = NSRunAlertPanel(nil, message.getNSString(), yes, no, nil);
+        result = NSRunAlertPanel(nil, @"%@", yes, no, nil, message.getNSString());
     else
-        result = NSRunAlertPanel(caption.getNSString(), message.getNSString(), yes, no, nil);
+        result = NSRunAlertPanel(caption.getNSString(), @"%@", yes, no, nil, message.getNSString());
 
     if (result == NSAlertDefaultReturn)
         return 1;
@@ -79,12 +79,12 @@ void KMessageBox::sorry(QWidget *, const QString &message,
     const QString &caption, bool notify)
 {
     if (caption.isNull())
-        NSRunAlertPanel(nil, message.getNSString(), nil, nil, nil);
+        NSRunAlertPanel(nil, @"%@", nil, nil, nil, message.getNSString());
     else
-        NSRunAlertPanel(caption.getNSString(), message.getNSString(), nil, nil, nil);
+        NSRunAlertPanel(caption.getNSString(), @"%@", nil, nil, nil, message.getNSString());
 }
 
 void KMessageBox::information(QWidget *, const QString &message, const QString &, const char *)
 {
-    NSRunAlertPanel(nil, message.getNSString(), nil, nil, nil);
+    NSRunAlertPanel(nil, @"%@", nil, nil, nil, message.getNSString());
 }

-- 
WebKit Debian packaging