WebCore:

        <rdar://problem/5699509> Allow file upload dialog to be localized.

        Reviewed by Darin.

        * platform/LocalizedStrings.h:
        * platform/win/FileChooserWin.cpp:
        (WebCore::FileChooser::openFileChooser):

WebKit:

        Update localization exceptions.

        Reviewed by Darin.

        * English.lproj/Localizable.strings:
        * StringsNotToBeLocalized.txt:

WebKit/win:

        <rdar://problem/5699509> Allow file upload dialog to be localized.

        Reviewed by Darin.

        * English.lproj/Localizable.strings: Updated.
        * WebCoreLocalizedStrings.cpp:
        (WebCore::uploadFileText): Added.
        (WebCore::allFilesText): Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 354e74e0fa943c1dfe25a5b8fae2c3c0e0ffac01..75db72e8d4d1238759051294b8c14de0738ec167 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-23  Steve Falkenburg  <sfalken@apple.com>
+
+        <rdar://problem/5699509> Allow file upload dialog to be localized.
+
+        Reviewed by Darin.
+
+        * platform/LocalizedStrings.h:
+        * platform/win/FileChooserWin.cpp:
+        (WebCore::FileChooser::openFileChooser):
+
 2008-01-23  Adam Roben  <aroben@apple.com>
 
         Fix behavior of type-to-select in <select> menus

diff --git a/WebCore/platform/LocalizedStrings.h b/WebCore/platform/LocalizedStrings.h
index e0eff1809457265dcc1dad1d0bbede3a5cd4a29d..218192e7e47eccd1c34509246bcc9032ac429310 100644 (file)
--- a/WebCore/platform/LocalizedStrings.h
+++ b/WebCore/platform/LocalizedStrings.h
@@ -94,6 +94,11 @@ namespace WebCore {
     String AXHeadingText();
 
     String unknownFileSizeText();
+
+#if PLATFORM(WIN)
+    String uploadFileText();
+    String allFilesText();
+#endif
 }
 
 #endif

diff --git a/WebCore/platform/win/FileChooserWin.cpp b/WebCore/platform/win/FileChooserWin.cpp
index c50177519a8e7073f291ae1872c744ebf0359599..905bf923110e964356684251d09fb3701648d939 100644 (file)
--- a/WebCore/platform/win/FileChooserWin.cpp
+++ b/WebCore/platform/win/FileChooserWin.cpp
@@ -67,10 +67,13 @@ void FileChooser::openFileChooser(Document* document)
 
     ofn.lStructSize = sizeof(ofn);
     ofn.hwndOwner = view->containingWindow();
-    ofn.lpstrFilter = _T("All Files\0*.*\0\0");
+    String allFiles = allFilesText();
+    allFiles.append(TEXT("\0*.*\0\0"), 6);
+    ofn.lpstrFilter = allFiles.charactersWithNullTermination();
     ofn.lpstrFile = fileBuf;
     ofn.nMaxFile = sizeof(fileBuf);
-    ofn.lpstrTitle = _T("Upload file");
+    String dialogTitle = uploadFileText();
+    ofn.lpstrTitle = dialogTitle.charactersWithNullTermination();
     ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST;
 
     // We need this protector because otherwise we can be deleted if the file upload control is detached while

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b29cb32d9f835306045fa889f37bd0f8f31b73a4..6a8e707c35d40a01aa871587c93d8fb4e694c293 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-23  Steve Falkenburg  <sfalken@apple.com>
+
+        Update localization exceptions.
+        
+        Reviewed by Darin.
+
+        * English.lproj/Localizable.strings:
+        * StringsNotToBeLocalized.txt:
+
 2008-01-20  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index a61ee3131b04a488439dd20c43de73eae0fbfa0d..c2612c29ee2bd90ee6857269efe78c1bfdca6876 100644 (file)
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ

diff --git a/WebKit/StringsNotToBeLocalized.txt b/WebKit/StringsNotToBeLocalized.txt
index 27f0cf660872925dcd168b1f03f755f0a83d46bb..af1c6ceb50a4c4c61e0701602ae547323b9a9af0 100644 (file)
--- a/WebKit/StringsNotToBeLocalized.txt
+++ b/WebKit/StringsNotToBeLocalized.txt
@@ -66,10 +66,7 @@
 "1px"
 "2"
 "3DBD89EB-CEFB-4ddb-8D1A-5BE47ED4E929"
-"419"
 "420+"
-"422"
-"5242880"
 "5CACD637-F82F-491F-947A-5DCA38AA0FEA"
 "6EB8D98F-2723-4472-88D3-5936F9D6E631"
 "7"
@@ -112,10 +109,11 @@
 "DOCBASE"
 "DOMSVGElement"
 "DYLD_FRAMEWORK_PATH"
+"DeleteBackward"
+"DeleteForward"
 "DeleteWordBackward"
 "DeleteWordForward"
 "FD3B2381-0BB6-4B59-AF09-0E599C8901CF"
-"ForwardDelete"
 "FrameName"
 "GroupName"
 "HIDictionaryWindowShow"
@@ -135,7 +133,6 @@
 "ImmReleaseContext"
 "ImmSetCandidateWindow"
 "ImmSetOpenStatus"
-"IncludeDebugMenu"
 "InsertBacktab"
 "InsertNewline"
 "InsertTab"
@@ -198,7 +195,6 @@
 "SAMILang"
 "SAMIStyle"
 "Safari.exe"
-"Safari/419.3"
 "Times"
 "ToggleBold"
 "ToggleItalic"
@@ -403,7 +399,6 @@
 "en"
 "estimatedProgress"
 "file:"
-"flickr.com"
 "ftp:"
 "htm"
 "html"
@@ -418,6 +413,7 @@
 "image/svg+xml"
 "image/tiff"
 "img"
+"insertText:"
 "isLoading"
 "isindex"
 "javascript:"
@@ -474,7 +470,6 @@
 "x"
 "x-apple-web-kit/"
 "xml"
-"yahoo.com"
 "~/Library/Icons"
 "~/Library/WebKit/Databases"
 WebKit/mac/DOM/WebDOMOperations.mm:"background"
@@ -550,7 +545,6 @@ WebKit/mac/WebView/WebPreferenceKeysPrivate.h
 WebKit/mac/WebView/WebPreferences.m
 WebKit/mac/WebView/WebView.mm:"Preferences"
 WebKit/mac/WebView/WebView.mm:"Search With Google"
-WebKit/mac/WebView/WebView.mm:"Show DOM Tree"
 WebKit/mac/WebView/WebView.mm:"control"
 WebKit/mac/WebView/WebView.mm:"return "
 WebKit/win/ProgIDMacros.h:"OpenSource"

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 140ae29d34743e508b9bb8cb925efb2997d90ba2..95d68a48138aecabca1db2a95a0c589449fca658 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-23  Steve Falkenburg  <sfalken@apple.com>
+
+        <rdar://problem/5699509> Allow file upload dialog to be localized.
+        
+        Reviewed by Darin.
+
+        * English.lproj/Localizable.strings: Updated.
+        * WebCoreLocalizedStrings.cpp:
+        (WebCore::uploadFileText): Added.
+        (WebCore::allFilesText): Added.
+
 2008-01-22  Adam Roben  <aroben@apple.com>
 
         Fix <rdar://5693599> REGRESSION (r29369): scroll bars are drawing when they shouldn't be on an ad on cnn.com

diff --git a/WebKit/win/English.lproj/Localizable.strings b/WebKit/win/English.lproj/Localizable.strings
index a61ee3131b04a488439dd20c43de73eae0fbfa0d..c2612c29ee2bd90ee6857269efe78c1bfdca6876 100644 (file)
Binary files a/WebKit/win/English.lproj/Localizable.strings and b/WebKit/win/English.lproj/Localizable.strings differ

diff --git a/WebKit/win/WebCoreLocalizedStrings.cpp b/WebKit/win/WebCoreLocalizedStrings.cpp
index 2187ff08fe8e9cb9aff643f277ba8f293333308f..0447e5ba074fe56a5ce6b5d94d0a624598a5bb50 100644 (file)
--- a/WebKit/win/WebCoreLocalizedStrings.cpp
+++ b/WebKit/win/WebCoreLocalizedStrings.cpp
@@ -81,4 +81,5 @@ String WebCore::AXListMarkerText() { return String(LPCTSTR_UI_STRING("list marke
 String WebCore::AXImageMapText() { return String(LPCTSTR_UI_STRING("image map", "accessibility role description for image map")); }
 String WebCore::AXHeadingText() { return String(LPCTSTR_UI_STRING("heading", "accessibility role description for headings")); }
 String WebCore::unknownFileSizeText() { return String(LPCTSTR_UI_STRING("Unknown", "Unknown filesize FTP directory listing item")); }
-
+String WebCore::uploadFileText() { return String(LPCTSTR_UI_STRING("Upload file", "(Windows) Form submit file upload dialog title")); }
+String WebCore::allFilesText() { return String(LPCTSTR_UI_STRING("All Files", "(Windows) Form submit file upload all files pop-up")); }