Skip to content

Commit cf534c8

Browse files
author
Sam Weinig
committed
2011-04-15 Sam Weinig <sam@webkit.org>
 Reviewed by Maciej Stachowiak. Make mac WebKit1 use the default localization strategy https://bugs.webkit.org/show_bug.cgi?id=58628 * WebCoreSupport/WebPlatformStrategies.h: * WebCoreSupport/WebPlatformStrategies.mm: Remove the localization strategy code. The equivalent is now in WebCore/platform/DefaultLocalizationStrategy.cpp. 2011-04-15 Sam Weinig <sam@webkit.org> Reviewed by Maciej Stachowiak. Make mac WebKit1 use the default localization strategy https://bugs.webkit.org/show_bug.cgi?id=58628 * English.lproj/Localizable.strings: Update by running update-webkit-localizable-strings. * platform/DefaultLocalizationStrategy.cpp: (WebCore::DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary): (WebCore::DefaultLocalizationStrategy::keygenKeychainItemName): (WebCore::DefaultLocalizationStrategy::imageTitle): Match the WebKit1 versions of these functions by special casing CF platforms. Canonical link: https://commits.webkit.org/73739@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83985 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 0f039f7 commit cf534c8

6 files changed

Lines changed: 58 additions & 902 deletions

File tree

‎Source/WebCore/ChangeLog‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2011-04-15 Sam Weinig <sam@webkit.org>
2+
3+
Reviewed by Maciej Stachowiak.
4+
5+
Make mac WebKit1 use the default localization strategy
6+
https://bugs.webkit.org/show_bug.cgi?id=58628
7+
8+
* English.lproj/Localizable.strings:
9+
Update by running update-webkit-localizable-strings.
10+
11+
* platform/DefaultLocalizationStrategy.cpp:
12+
(WebCore::DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary):
13+
(WebCore::DefaultLocalizationStrategy::keygenKeychainItemName):
14+
(WebCore::DefaultLocalizationStrategy::imageTitle):
15+
Match the WebKit1 versions of these functions by special casing CF platforms.
16+
117
2011-04-15 Vsevolod Vlasov <vsevik@chromium.org>
218

319
Reviewed by Pavel Feldman.

‎Source/WebCore/English.lproj/Localizable.strings‎

-1016 Bytes
Binary file not shown.

‎Source/WebCore/platform/DefaultLocalizationStrategy.cpp‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,14 @@ String DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary(const S
301301
#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
302302
UNUSED_PARAM(selectedString);
303303
return WEB_UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu item");
304+
#else
305+
#if USE(CF)
306+
RetainPtr<CFStringRef> selectedCFString(AdoptCF, selectedString.createCFString());
307+
return formatLocalizedString(WEB_UI_STRING("Look Up “%@”", "Look Up context menu item with selected word"), selectedCFString.get());
304308
#else
305309
return WEB_UI_STRING("Look Up “<selection>”", "Look Up context menu item with selected word").replace("<selection>", selectedString);
306310
#endif
311+
#endif
307312
}
308313

309314
String DefaultLocalizationStrategy::contextMenuItemTagOpenLink()
@@ -703,15 +708,36 @@ String DefaultLocalizationStrategy::keygenMenuItem2048()
703708

704709
String DefaultLocalizationStrategy::keygenKeychainItemName(const String& host)
705710
{
706-
return WEB_UI_STRING("Key from <hostname>", "Name of keychain key generated by the KEYGEN tag").replace("<hostname>", host);
711+
RetainPtr<CFStringRef> hostCFString(AdoptCF, host.createCFString());
712+
return formatLocalizedString(WEB_UI_STRING("Key from %@", "Name of keychain key generated by the KEYGEN tag"), hostCFString.get());
707713
}
708714

709715
#endif
710716

711717
String DefaultLocalizationStrategy::imageTitle(const String& filename, const IntSize& size)
712718
{
713-
// FIXME: This should format the numbers correctly. In Mac WebKit, we used +[NSNumberFormatter localizedStringFromNumber:numberStyle:].
714-
return formatLocalizedString(WEB_UI_STRING("<filename> %d×%d pixels", "window title suffix for a standalone image (uses multiplication symbol, not x)"), size.width(), size.height()).replace("<filename>", filename);
719+
#if USE(CF)
720+
#if !defined(BUILDING_ON_LEOPARD)
721+
RetainPtr<CFStringRef> filenameCFString(AdoptCF, filename.createCFString());
722+
RetainPtr<CFLocaleRef> locale(AdoptCF, CFLocaleCopyCurrent());
723+
RetainPtr<CFNumberFormatterRef> formatter(AdoptCF, CFNumberFormatterCreate(0, locale.get(), kCFNumberFormatterDecimalStyle));
724+
725+
int widthInt = size.width();
726+
RetainPtr<CFNumberRef> width(AdoptCF, CFNumberCreate(0, kCFNumberIntType, &widthInt));
727+
RetainPtr<CFStringRef> widthString(AdoptCF, CFNumberFormatterCreateStringWithNumber(0, formatter.get(), width.get()));
728+
729+
int heightInt = size.height();
730+
RetainPtr<CFNumberRef> height(AdoptCF, CFNumberCreate(0, kCFNumberIntType, &heightInt));
731+
RetainPtr<CFStringRef> heightString(AdoptCF, CFNumberFormatterCreateStringWithNumber(0, formatter.get(), height.get()));
732+
733+
return formatLocalizedString(WEB_UI_STRING("%@ %@×%@ pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filenameCFString.get(), widthString.get(), heightString.get());
734+
#else
735+
RetainPtr<CFStringRef> filenameCFString(AdoptCF, filename.createCFString());
736+
return formatLocalizedString(WEB_UI_STRING("%@ %d×%d pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filenameCFString.get(), size.width(), size.height());
737+
#endif
738+
#else
739+
return formatLocalizedString(WEB_UI_STRING("<filename> %d×%d pixels", "window title for a standalone image (uses multiplication symbol, not x)"), size.width(), size.height()).replace("<filename>", filename);
740+
#endif
715741
}
716742

717743
String DefaultLocalizationStrategy::mediaElementLoadingStateText()

‎Source/WebKit/mac/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2011-04-15 Sam Weinig <sam@webkit.org>
2+
3+
Reviewed by Maciej Stachowiak.
4+
5+
Make mac WebKit1 use the default localization strategy
6+
https://bugs.webkit.org/show_bug.cgi?id=58628
7+
8+
* WebCoreSupport/WebPlatformStrategies.h:
9+
* WebCoreSupport/WebPlatformStrategies.mm:
10+
Remove the localization strategy code. The equivalent is now
11+
in WebCore/platform/DefaultLocalizationStrategy.cpp.
12+
113
2011-04-15 Anna Cavender <annacc@chromium.org>
214

315
Reviewed by Eric Carlson.

‎Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h‎

Lines changed: 1 addition & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
#include <WebCore/CookiesStrategy.h>
3030
#include <WebCore/PlatformStrategies.h>
3131
#include <WebCore/PluginStrategy.h>
32-
#include <WebCore/LocalizationStrategy.h>
3332
#include <WebCore/VisitedLinkStrategy.h>
3433

35-
class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::LocalizationStrategy, private WebCore::VisitedLinkStrategy {
34+
class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::VisitedLinkStrategy {
3635
public:
3736
static void initialize();
3837

@@ -42,7 +41,6 @@ class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCor
4241
// WebCore::PlatformStrategies
4342
virtual WebCore::CookiesStrategy* createCookiesStrategy();
4443
virtual WebCore::PluginStrategy* createPluginStrategy();
45-
virtual WebCore::LocalizationStrategy* createLocalizationStrategy();
4644
virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy();
4745

4846
// WebCore::CookiesStrategy
@@ -52,125 +50,6 @@ class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCor
5250
virtual void refreshPlugins();
5351
virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
5452

55-
// WebCore::LocalizationStrategy
56-
virtual WTF::String inputElementAltText();
57-
virtual WTF::String resetButtonDefaultLabel();
58-
virtual WTF::String searchableIndexIntroduction();
59-
virtual WTF::String submitButtonDefaultLabel();
60-
virtual WTF::String fileButtonChooseFileLabel();
61-
virtual WTF::String fileButtonNoFileSelectedLabel();
62-
virtual WTF::String copyImageUnknownFileLabel();
63-
virtual WTF::String defaultDetailsSummaryText();
64-
#if ENABLE(CONTEXT_MENUS)
65-
virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();
66-
virtual WTF::String contextMenuItemTagDownloadLinkToDisk();
67-
virtual WTF::String contextMenuItemTagCopyLinkToClipboard();
68-
virtual WTF::String contextMenuItemTagOpenImageInNewWindow();
69-
virtual WTF::String contextMenuItemTagDownloadImageToDisk();
70-
virtual WTF::String contextMenuItemTagCopyImageToClipboard();
71-
virtual WTF::String contextMenuItemTagOpenFrameInNewWindow();
72-
virtual WTF::String contextMenuItemTagCopy();
73-
virtual WTF::String contextMenuItemTagGoBack();
74-
virtual WTF::String contextMenuItemTagGoForward();
75-
virtual WTF::String contextMenuItemTagStop();
76-
virtual WTF::String contextMenuItemTagReload();
77-
virtual WTF::String contextMenuItemTagCut();
78-
virtual WTF::String contextMenuItemTagPaste();
79-
virtual WTF::String contextMenuItemTagNoGuessesFound();
80-
virtual WTF::String contextMenuItemTagIgnoreSpelling();
81-
virtual WTF::String contextMenuItemTagLearnSpelling();
82-
virtual WTF::String contextMenuItemTagSearchWeb();
83-
virtual WTF::String contextMenuItemTagLookUpInDictionary(const WTF::String& selectedString);
84-
virtual WTF::String contextMenuItemTagOpenLink();
85-
virtual WTF::String contextMenuItemTagIgnoreGrammar();
86-
virtual WTF::String contextMenuItemTagSpellingMenu();
87-
virtual WTF::String contextMenuItemTagShowSpellingPanel(bool show);
88-
virtual WTF::String contextMenuItemTagCheckSpelling();
89-
virtual WTF::String contextMenuItemTagCheckSpellingWhileTyping();
90-
virtual WTF::String contextMenuItemTagCheckGrammarWithSpelling();
91-
virtual WTF::String contextMenuItemTagFontMenu();
92-
virtual WTF::String contextMenuItemTagBold();
93-
virtual WTF::String contextMenuItemTagItalic();
94-
virtual WTF::String contextMenuItemTagUnderline();
95-
virtual WTF::String contextMenuItemTagOutline();
96-
virtual WTF::String contextMenuItemTagWritingDirectionMenu();
97-
virtual WTF::String contextMenuItemTagTextDirectionMenu();
98-
virtual WTF::String contextMenuItemTagDefaultDirection();
99-
virtual WTF::String contextMenuItemTagLeftToRight();
100-
virtual WTF::String contextMenuItemTagRightToLeft();
101-
virtual WTF::String contextMenuItemTagSearchInSpotlight();
102-
virtual WTF::String contextMenuItemTagShowFonts();
103-
virtual WTF::String contextMenuItemTagStyles();
104-
virtual WTF::String contextMenuItemTagShowColors();
105-
virtual WTF::String contextMenuItemTagSpeechMenu();
106-
virtual WTF::String contextMenuItemTagStartSpeaking();
107-
virtual WTF::String contextMenuItemTagStopSpeaking();
108-
virtual WTF::String contextMenuItemTagCorrectSpellingAutomatically();
109-
virtual WTF::String contextMenuItemTagSubstitutionsMenu();
110-
virtual WTF::String contextMenuItemTagShowSubstitutions(bool show);
111-
virtual WTF::String contextMenuItemTagSmartCopyPaste();
112-
virtual WTF::String contextMenuItemTagSmartQuotes();
113-
virtual WTF::String contextMenuItemTagSmartDashes();
114-
virtual WTF::String contextMenuItemTagSmartLinks();
115-
virtual WTF::String contextMenuItemTagTextReplacement();
116-
virtual WTF::String contextMenuItemTagTransformationsMenu();
117-
virtual WTF::String contextMenuItemTagMakeUpperCase();
118-
virtual WTF::String contextMenuItemTagMakeLowerCase();
119-
virtual WTF::String contextMenuItemTagCapitalize();
120-
virtual WTF::String contextMenuItemTagChangeBack(const WTF::String& replacedString);
121-
virtual WTF::String contextMenuItemTagInspectElement();
122-
virtual WTF::String contextMenuItemTagOpenVideoInNewWindow();
123-
virtual WTF::String contextMenuItemTagOpenAudioInNewWindow();
124-
virtual WTF::String contextMenuItemTagCopyVideoLinkToClipboard();
125-
virtual WTF::String contextMenuItemTagCopyAudioLinkToClipboard();
126-
virtual WTF::String contextMenuItemTagToggleMediaControls();
127-
virtual WTF::String contextMenuItemTagToggleMediaLoop();
128-
virtual WTF::String contextMenuItemTagEnterVideoFullscreen();
129-
virtual WTF::String contextMenuItemTagMediaPlay();
130-
virtual WTF::String contextMenuItemTagMediaPause();
131-
virtual WTF::String contextMenuItemTagMediaMute();
132-
#endif // ENABLE(CONTEXT_MENUS)
133-
virtual WTF::String searchMenuNoRecentSearchesText();
134-
virtual WTF::String searchMenuRecentSearchesText();
135-
virtual WTF::String searchMenuClearRecentSearchesText();
136-
virtual WTF::String AXWebAreaText();
137-
virtual WTF::String AXLinkText();
138-
virtual WTF::String AXListMarkerText();
139-
virtual WTF::String AXImageMapText();
140-
virtual WTF::String AXHeadingText();
141-
virtual WTF::String AXDefinitionListTermText();
142-
virtual WTF::String AXDefinitionListDefinitionText();
143-
virtual WTF::String AXARIAContentGroupText(const WTF::String& ariaType);
144-
virtual WTF::String AXButtonActionVerb();
145-
virtual WTF::String AXRadioButtonActionVerb();
146-
virtual WTF::String AXTextFieldActionVerb();
147-
virtual WTF::String AXCheckedCheckBoxActionVerb();
148-
virtual WTF::String AXUncheckedCheckBoxActionVerb();
149-
virtual WTF::String AXMenuListActionVerb();
150-
virtual WTF::String AXMenuListPopupActionVerb();
151-
virtual WTF::String AXLinkActionVerb();
152-
virtual WTF::String missingPluginText();
153-
virtual WTF::String crashedPluginText();
154-
virtual WTF::String multipleFileUploadText(unsigned numberOfFiles);
155-
virtual WTF::String unknownFileSizeText();
156-
virtual WTF::String keygenMenuItem512();
157-
virtual WTF::String keygenMenuItem1024();
158-
virtual WTF::String keygenMenuItem2048();
159-
virtual WTF::String keygenKeychainItemName(const WTF::String& host);
160-
virtual WTF::String imageTitle(const WTF::String& filename, const WebCore::IntSize& size);
161-
virtual WTF::String mediaElementLoadingStateText();
162-
virtual WTF::String mediaElementLiveBroadcastStateText();
163-
virtual WTF::String localizedMediaControlElementString(const WTF::String&);
164-
virtual WTF::String localizedMediaControlElementHelpText(const WTF::String&);
165-
virtual WTF::String localizedMediaTimeDescription(float);
166-
virtual WTF::String validationMessageValueMissingText();
167-
virtual WTF::String validationMessageTypeMismatchText();
168-
virtual WTF::String validationMessagePatternMismatchText();
169-
virtual WTF::String validationMessageTooLongText();
170-
virtual WTF::String validationMessageRangeUnderflowText();
171-
virtual WTF::String validationMessageRangeOverflowText();
172-
virtual WTF::String validationMessageStepMismatchText();
173-
17453
// WebCore::VisitedLinkStrategy
17554
virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash);
17655
virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);

0 commit comments

Comments
 (0)