Title: [229939] trunk/Source/WebCore
- Revision
- 229939
- Author
- wenson_hs...@apple.com
- Date
- 2018-03-23 17:33:52 -0700 (Fri, 23 Mar 2018)
Log Message
[Extra zoom mode] Fix some localizable strings after r229878
https://bugs.webkit.org/show_bug.cgi?id=183963
Reviewed by Tim Horton.
The WEB_UI_STRING macro was incorrectly used for certain localized strings pertaining to extra zoom mode. To
correct this, make the "Done" string use WEB_UI_STRING with actual UI-facing text; since day, year and month
labels in the date picker are less generalizable to other UI, leave these as unique keys, but change them to
use WEB_UI_STRING_KEY instead.
Additionally, remove now-unused localizable strings for the text input view controller.
* English.lproj/Localizable.strings:
* platform/LocalizedStrings.cpp:
(WebCore::formControlDoneButtonTitle):
(WebCore::datePickerDayLabelTitle):
(WebCore::datePickerMonthLabelTitle):
(WebCore::datePickerYearLabelTitle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (229938 => 229939)
--- trunk/Source/WebCore/ChangeLog 2018-03-24 00:00:32 UTC (rev 229938)
+++ trunk/Source/WebCore/ChangeLog 2018-03-24 00:33:52 UTC (rev 229939)
@@ -1,3 +1,24 @@
+2018-03-23 Wenson Hsieh <wenson_hs...@apple.com>
+
+ [Extra zoom mode] Fix some localizable strings after r229878
+ https://bugs.webkit.org/show_bug.cgi?id=183963
+
+ Reviewed by Tim Horton.
+
+ The WEB_UI_STRING macro was incorrectly used for certain localized strings pertaining to extra zoom mode. To
+ correct this, make the "Done" string use WEB_UI_STRING with actual UI-facing text; since day, year and month
+ labels in the date picker are less generalizable to other UI, leave these as unique keys, but change them to
+ use WEB_UI_STRING_KEY instead.
+
+ Additionally, remove now-unused localizable strings for the text input view controller.
+
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::formControlDoneButtonTitle):
+ (WebCore::datePickerDayLabelTitle):
+ (WebCore::datePickerMonthLabelTitle):
+ (WebCore::datePickerYearLabelTitle):
+
2018-03-23 Chris Dumez <cdu...@apple.com>
NetworkStateNotifier::updateStateWithoutNotifying() is inefficient
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (229938 => 229939)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2018-03-24 00:00:32 UTC (rev 229938)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2018-03-24 00:33:52 UTC (rev 229939)
@@ -212,7 +212,7 @@
"Cut (Undo action name)" = "Cut";
/* Day label in date picker */
-"Day label in date picker" = "Day label in date picker";
+"Day (Date picker for extra zoom mode)" = "Day";
/* Fullscreen Deceptive Website Warning Sheet Title */
"Deceptive Website Warning" = "Deceptive Website Warning";
@@ -230,7 +230,7 @@
"Dictation (Undo action name)" = "Dictation";
/* Title of the Done button for zoomed form controls. */
-"Done (extra zoomed form controls)" = "Done (extra zoomed form controls)";
+"Done" = "Done";
/* Download Audio To Disk context menu item */
"Download Audio" = "Download Audio";
@@ -416,7 +416,7 @@
"Missing Plug-in" = "Missing Plug-in";
/* Month label in date picker */
-"Month label in date picker" = "Month label in date picker";
+"Month (Date picker for extra zoom mode)" = "Month";
/* Media Mute context menu item */
"Mute" = "Mute";
@@ -625,9 +625,6 @@
/* Title of the label to show on a snapshotted plug-in */
"Snapshotted Plug-In" = "Snapshotted Plug-In";
-/* Title of the dictation button for zoomed form controls. */
-"Speak" = "Speak";
-
/* Speech context sub-menu item */
"Speech" = "Speech";
@@ -835,11 +832,8 @@
/* WebKitErrorInternal description */
"WebKit encountered an internal error" = "WebKit encountered an internal error";
-/* Title of the writing button for zoomed form controls. */
-"Write" = "Write";
-
/* Year label in date picker */
-"Year label in date picker" = "Year label in date picker";
+"Year (Date picker for extra zoom mode)" = "Year";
/* message in authentication panel */
"Your login information will be sent securely." = "Your login information will be sent securely.";
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (229938 => 229939)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2018-03-24 00:00:32 UTC (rev 229938)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2018-03-24 00:33:52 UTC (rev 229939)
@@ -1038,7 +1038,7 @@
String formControlDoneButtonTitle()
{
- return WEB_UI_STRING("Done (extra zoomed form controls)", "Title of the Done button for zoomed form controls.");
+ return WEB_UI_STRING("Done", "Title of the Done button for zoomed form controls.");
}
String formControlCancelButtonTitle()
@@ -1061,29 +1061,19 @@
return WEB_UI_STRING("Search", "Title of the Search button for zoomed form controls.");
}
-String textInputModeWriteButtonTitle()
-{
- return WEB_UI_STRING("Write", "Title of the writing button for zoomed form controls.");
-}
-
-String textInputModeSpeechButtonTitle()
-{
- return WEB_UI_STRING("Speak", "Title of the dictation button for zoomed form controls.");
-}
-
String datePickerDayLabelTitle()
{
- return WEB_UI_STRING("Day label in date picker", "Day label in date picker");
+ return WEB_UI_STRING_KEY("Day", "Day (Date picker for extra zoom mode)", "Day label in date picker");
}
String datePickerMonthLabelTitle()
{
- return WEB_UI_STRING("Month label in date picker", "Month label in date picker");
+ return WEB_UI_STRING_KEY("Month", "Month (Date picker for extra zoom mode)", "Month label in date picker");
}
String datePickerYearLabelTitle()
{
- return WEB_UI_STRING("Year label in date picker", "Year label in date picker");
+ return WEB_UI_STRING_KEY("Year", "Year (Date picker for extra zoom mode)", "Year label in date picker");
}
#endif
Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (229938 => 229939)
--- trunk/Source/WebCore/platform/LocalizedStrings.h 2018-03-24 00:00:32 UTC (rev 229938)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2018-03-24 00:33:52 UTC (rev 229939)
@@ -322,8 +322,6 @@
WEBCORE_EXPORT String formControlHideButtonTitle();
WEBCORE_EXPORT String formControlGoButtonTitle();
WEBCORE_EXPORT String formControlSearchButtonTitle();
- WEBCORE_EXPORT String textInputModeWriteButtonTitle();
- WEBCORE_EXPORT String textInputModeSpeechButtonTitle();
WEBCORE_EXPORT String datePickerDayLabelTitle();
WEBCORE_EXPORT String datePickerMonthLabelTitle();
WEBCORE_EXPORT String datePickerYearLabelTitle();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
