Commit 9d3827a7 authored by weinig@apple.com's avatar weinig@apple.com

WebCore:

2008-05-05  Sam Weinig  <sam@webkit.org>

        Reviewed by Tim Hatcher.

        Make the Inspector's localizable strings file match the format used by Dashboard widgets.

        * English.lproj/InspectorLocalizedStrings.js: Removed.
        * English.lproj/localizedStrings.js: Added.
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * page/inspector/inspector.js:

WebKit/mac:

2008-05-05  Sam Weinig  <sam@webkit.org>

        Reviewed by Tim Hatcher.

        Make the Inspector's localizable strings file match the format used by Dashboard widgets.

        * WebCoreSupport/WebInspectorClient.mm:
        (WebInspectorClient::localizedStringsURL):

WebKit/win:

2008-05-05  Sam Weinig  <sam@webkit.org>

        Reviewed by Tim Hatcher.

        Make the Inspector's localizable strings file match the format used by Dashboard widgets.

        * WebCoreSupport/WebInspectorClient.cpp:
        (WebInspectorClient::localizedStringsURL):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32882 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 14e9c0b4
2008-05-05 Sam Weinig <sam@webkit.org>
Reviewed by Tim Hatcher.
Make the Inspector's localizable strings file match the format used by Dashboard widgets.
* English.lproj/InspectorLocalizedStrings.js: Removed.
* English.lproj/localizedStrings.js: Added.
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* page/inspector/inspector.js:
2008-05-05 Steve Falkenburg <sfalken@apple.com>
Add support for default button appearance.
Binary files a/WebCore/English.lproj/InspectorLocalizedStrings.js and /dev/null differ
Bvar localizedStrings = new Object;
This diff is collapsed.
......@@ -338,7 +338,6 @@
1C26497C0D7E24EC00BD10F2 /* PageMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */; };
1C4C8F020AD85D87009475CE /* DeleteButtonController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C4C8F000AD85D87009475CE /* DeleteButtonController.h */; };
1C4C8F660AD8655D009475CE /* DeleteButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C4C8F640AD8655D009475CE /* DeleteButton.h */; };
1C6B7C9A0CEFC9D00076DE61 /* InspectorLocalizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 1C6B7C980CEFC9BE0076DE61 /* InspectorLocalizedStrings.js */; };
1CAF34810A6C405200ABE06E /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF347E0A6C405200ABE06E /* WebScriptObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CAF347F0A6C405200ABE06E /* WebScriptObject.mm */; };
1CAF34830A6C405200ABE06E /* WebScriptObjectPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF34800A6C405200ABE06E /* WebScriptObjectPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -4786,7 +4785,6 @@
1C4C8F000AD85D87009475CE /* DeleteButtonController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButtonController.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
1C4C8F630AD8655D009475CE /* DeleteButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeleteButton.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
1C4C8F640AD8655D009475CE /* DeleteButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
1C6B7C990CEFC9BE0076DE61 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/InspectorLocalizedStrings.js; sourceTree = SOURCE_ROOT; };
1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
1CAF347E0A6C405200ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObject.h; sourceTree = "<group>"; };
1CAF347F0A6C405200ABE06E /* WebScriptObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptObject.mm; sourceTree = "<group>"; };
......@@ -8045,6 +8043,7 @@
BCC573390D695BF1006EF517 /* DOMTextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTextPrivate.h; sourceTree = "<group>"; };
BCC5BDFE0C0E93110011C2DB /* JSCSSStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleSheet.cpp; sourceTree = "<group>"; };
BCC5BDFF0C0E93110011C2DB /* JSCSSStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSStyleSheet.h; sourceTree = "<group>"; };
BCC64F600DCFB84E0081EF3B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/localizedStrings.js; sourceTree = SOURCE_ROOT; };
BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ColorData.gperf; sourceTree = "<group>"; };
BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollectionCustom.cpp; sourceTree = "<group>"; };
BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollection.cpp; sourceTree = "<group>"; };
......@@ -8395,7 +8394,7 @@
089C1665FE841158C02AAC07 /* Resources */ = {
isa = PBXGroup;
children = (
1C6B7C980CEFC9BE0076DE61 /* InspectorLocalizedStrings.js */,
BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */,
1AB1AE780C051FDE00139F4F /* zoomInCursor.png */,
1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */,
464EA2710B8A350B00A8E6E3 /* crossHairCursor.png */,
......@@ -12030,7 +12029,6 @@
1432E8460C51493800B1500F /* GCController.h */,
E4EEFFC60D34550C00469A58 /* JSAudioConstructor.cpp */,
E4EEFFC70D34550C00469A58 /* JSAudioConstructor.h */,
C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */,
E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */,
......@@ -12137,6 +12135,7 @@
A766F3520D6BDE3500ABDDB3 /* JSCanvasPixelArrayCustom.cpp */,
1A9EF4560A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp */,
BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,
C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */,
BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */,
BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
......@@ -12191,9 +12190,9 @@
516BB7910CE91E6800512F79 /* JSSVGPointListCustom.cpp */,
B2D3FC890C2212CB00CF3618 /* JSSVGTransformListCustom.cpp */,
516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */,
A766F3520D6BDE3500ABDDB3 /* JSCanvasPixelArrayCustom.cpp */,
BC348BBD0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp */,
BCEFE1E40DCA5F3300739219 /* JSXSLTProcessorCustom.cpp */,
A766F3520D6BDE3500ABDDB3 /* JSCanvasPixelArrayCustom.cpp */,
);
name = Custom;
sourceTree = "<group>";
......@@ -15052,7 +15051,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1C6B7C9A0CEFC9D00076DE61 /* InspectorLocalizedStrings.js in Resources */,
B25599480D00D8BA00BB825C /* WKArithmeticFilter.cikernel in Resources */,
B255994B0D00D8BA00BB825C /* WKComponentMergeFilter.cikernel in Resources */,
B255994E0D00D8BA00BB825C /* WKDiffuseLightingFilter.cikernel in Resources */,
......@@ -16703,12 +16701,12 @@
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
1C6B7C980CEFC9BE0076DE61 /* InspectorLocalizedStrings.js */ = {
BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */ = {
isa = PBXVariantGroup;
children = (
1C6B7C990CEFC9BE0076DE61 /* English */,
BCC64F600DCFB84E0081EF3B /* English */,
);
name = InspectorLocalizedStrings.js;
name = localizedStrings.js;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
......@@ -44,7 +44,6 @@ var WebInspector = {
resources: [],
resourceURLMap: {},
searchResultsHeight: 100,
localizedStrings: {},
missingLocalizedStrings: {},
get currentFocusElement()
......@@ -923,8 +922,8 @@ WebInspector.performSearch = function(query)
WebInspector.UIString = function(string)
{
if (string in this.localizedStrings)
string = this.localizedStrings[string];
if (window.localizedStrings && string in window.localizedStrings)
string = window.localizedStrings[string];
else {
if (!(string in this.missingLocalizedStrings)) {
console.error("Localized string \"" + string + "\" not found.");
......
2008-05-05 Sam Weinig <sam@webkit.org>
Reviewed by Tim Hatcher.
Make the Inspector's localizable strings file match the format used by Dashboard widgets.
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorClient::localizedStringsURL):
2008-05-05 Anders Carlsson <andersca@apple.com>
Reviewed by Jess.
......
......@@ -95,7 +95,7 @@ Page* WebInspectorClient::createPage()
String WebInspectorClient::localizedStringsURL()
{
NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"InspectorLocalizedStrings" ofType:@"js"];
NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"localizedStrings" ofType:@"js"];
if (path)
return [[NSURL fileURLWithPath:path] absoluteString];
return String();
......
2008-05-05 Sam Weinig <sam@webkit.org>
Reviewed by Tim Hatcher.
Make the Inspector's localizable strings file match the format used by Dashboard widgets.
* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorClient::localizedStringsURL):
2008-05-05 Steve Falkenburg <sfalken@apple.com>
Add WebPreference for application chrome mode.
......
......@@ -193,7 +193,7 @@ Page* WebInspectorClient::createPage()
String WebInspectorClient::localizedStringsURL()
{
RetainPtr<CFURLRef> url(AdoptCF, CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("InspectorLocalizedStrings"), CFSTR("js"), 0));
RetainPtr<CFURLRef> url(AdoptCF, CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("localizedStrings"), CFSTR("js"), 0));
if (!url)
return String();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment