Title: [204887] branches/safari-602-branch/Source/WebCore
- Revision
- 204887
- Author
- [email protected]
- Date
- 2016-08-23 23:38:19 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r204610. rdar://problem/27750446
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (204886 => 204887)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-24 06:15:01 UTC (rev 204886)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-24 06:38:19 UTC (rev 204887)
@@ -1,3 +1,27 @@
+2016-08-23 Babak Shafiei <[email protected]>
+
+ Merge r204610. rdar://problem/27750446
+
+ 2016-08-18 Beth Dakin <[email protected]>
+
+ Update the accessibility titles for list insertion
+ https://bugs.webkit.org/show_bug.cgi?id=160972
+ -and corresponding-
+ rdar://problem/27750446
+
+ Reviewed by Chris Fleizach.
+
+ Update accessibility titles based on feedback.
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::insertListTypeNone):
+ (WebCore::insertListTypeBulleted):
+ (WebCore::insertListTypeBulletedAccessibilityTitle):
+ (WebCore::insertListTypeNumbered):
+ (WebCore::insertListTypeNumberedAccessibilityTitle):
+ (WebCore::insertListTypeNoneAccessibilityTitle): Deleted.
+ * platform/LocalizedStrings.h:
+
2016-08-17 Babak Shafiei <[email protected]>
Merge r204587. rdar://problem/27807479
Modified: branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings (204886 => 204887)
--- branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings 2016-08-24 06:15:01 UTC (rev 204886)
+++ branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings 2016-08-24 06:38:19 UTC (rev 204887)
@@ -127,6 +127,9 @@
/* Undo action name */
"Bold (Undo action name)" = "Bold";
+/* Option in segmented control for inserting a bulleted list in text editing */
+"Bulleted list" = "Bulleted list";
+
/* menu item title for phone number */
"Call Using iPhone:" = "Call Using iPhone:";
@@ -292,12 +295,6 @@
/* Undo action name */
"Insert List (Undo action name)" = "Insert List";
-/* Option in segmented control for inserting a bulleted list in text editing */
-"Insert a bulleted list" = "Insert a bulleted list";
-
-/* Option in segmented control for inserting a numbered list in text editing */
-"Insert a numbered list" = "Insert a numbered list";
-
/* Inspect Element context menu item */
"Inspect Element" = "Inspect Element";
@@ -373,9 +370,6 @@
/* Empty select list */
"No Options Select Popover" = "No Options";
-/* Accessibility label for not inserting a list in text editing */
-"No list" = "No list";
-
/* Label for only item in menu that appears when clicking on the search field image, when no searches have been performed */
"No recent searches" = "No recent searches";
@@ -385,6 +379,9 @@
/* WebKitErrorCannotUseRestrictedPort description */
"Not allowed to use restricted network port" = "Not allowed to use restricted network port";
+/* Option in segmented control for inserting a numbered list in text editing */
+"Numbered list" = "Numbered list";
+
/* OK button label in PDF password failure alert */
"OK (PDF password failure alert)" = "OK";
Modified: branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp (204886 => 204887)
--- branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp 2016-08-24 06:15:01 UTC (rev 204886)
+++ branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp 2016-08-24 06:38:19 UTC (rev 204887)
@@ -1182,11 +1182,6 @@
return WEB_UI_STRING("None", "Option in segmented control for choosing list type in text editing");
}
-String insertListTypeNoneAccessibilityTitle()
-{
- return WEB_UI_STRING("No list", "Accessibility label for not inserting a list in text editing");
-}
-
String insertListTypeBulleted()
{
return WEB_UI_STRING("•", "Option in segmented control for choosing list type in text editing");
@@ -1194,7 +1189,7 @@
String insertListTypeBulletedAccessibilityTitle()
{
- return WEB_UI_STRING("Insert a bulleted list", "Option in segmented control for inserting a bulleted list in text editing");
+ return WEB_UI_STRING("Bulleted list", "Option in segmented control for inserting a bulleted list in text editing");
}
String insertListTypeNumbered()
@@ -1204,7 +1199,7 @@
String insertListTypeNumberedAccessibilityTitle()
{
- return WEB_UI_STRING("Insert a numbered list", "Option in segmented control for inserting a numbered list in text editing");
+ return WEB_UI_STRING("Numbered list", "Option in segmented control for inserting a numbered list in text editing");
}
#endif // PLATFORM(MAC)
Modified: branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h (204886 => 204887)
--- branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h 2016-08-24 06:15:01 UTC (rev 204886)
+++ branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h 2016-08-24 06:38:19 UTC (rev 204887)
@@ -281,7 +281,6 @@
#if PLATFORM(MAC)
WEBCORE_EXPORT String insertListTypeNone();
- WEBCORE_EXPORT String insertListTypeNoneAccessibilityTitle();
WEBCORE_EXPORT String insertListTypeBulleted();
WEBCORE_EXPORT String insertListTypeBulletedAccessibilityTitle();
WEBCORE_EXPORT String insertListTypeNumbered();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes