<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203888] branches/safari-602-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203888">203888</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:12:49 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203801">r203801</a>. rdar://problem/26102954</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreEnglishlprojLocalizablestrings">branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformLocalizedStringscpp">branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformLocalizedStringsh">branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203887 => 203888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:46 UTC (rev 203887)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:49 UTC (rev 203888)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203801. rdar://problem/26102954
+
+ 2016-07-27 Beth Dakin <bdakin@apple.com>
+
+ Add localizable strings for inserting list types
+ https://bugs.webkit.org/show_bug.cgi?id=160233
+ -and corresponding-
+ rdar://problem/26102954
+
+ Reviewed by Dan Bernstein.
+
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::insertListTypeNone):
+ (WebCore::insertListTypeNoneAccessibilityTitle):
+ (WebCore::insertListTypeBulleted):
+ (WebCore::insertListTypeBulletedAccessibilityTitle):
+ (WebCore::insertListTypeNumbered):
+ (WebCore::insertListTypeNumberedAccessibilityTitle):
+ * platform/LocalizedStrings.h:
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203764. rdar://problem/27434423
</span><span class="cx">
</span><span class="cx"> 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings (203887 => 203888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings 2016-07-29 07:12:46 UTC (rev 203887)
+++ branches/safari-602-branch/Source/WebCore/English.lproj/Localizable.strings 2016-07-29 07:12:49 UTC (rev 203888)
</span><span class="lines">@@ -79,6 +79,9 @@
</span><span class="cx"> /* File Upload single video label */
</span><span class="cx"> "1 Video (file upload on page label for one video)" = "1 Video";
</span><span class="cx">
</span><ins>+/* Option in segmented control for choosing list type in text editing */
+"1. 2. 3.…" = "1. 2. 3.…";
+
</ins><span class="cx"> /* Menu item title for KEYGEN pop-up menu */
</span><span class="cx"> "1024 (Medium Grade)" = "1024 (Medium Grade)";
</span><span class="cx">
</span><span class="lines">@@ -289,6 +292,12 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Insert List (Undo action name)" = "Insert List";
</span><span class="cx">
</span><ins>+/* 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";
+
</ins><span class="cx"> /* Inspect Element context menu item */
</span><span class="cx"> "Inspect Element" = "Inspect Element";
</span><span class="cx">
</span><span class="lines">@@ -364,9 +373,15 @@
</span><span class="cx"> /* Empty select list */
</span><span class="cx"> "No Options Select Popover" = "No Options";
</span><span class="cx">
</span><ins>+/* Accessibility label for not inserting a list in text editing */
+"No list" = "No list";
+
</ins><span class="cx"> /* Label for only item in menu that appears when clicking on the search field image, when no searches have been performed */
</span><span class="cx"> "No recent searches" = "No recent searches";
</span><span class="cx">
</span><ins>+/* Option in segmented control for choosing list type in text editing */
+"None" = "None";
+
</ins><span class="cx"> /* WebKitErrorCannotUseRestrictedPort description */
</span><span class="cx"> "Not allowed to use restricted network port" = "Not allowed to use restricted network port";
</span><span class="cx">
</span><span class="lines">@@ -604,6 +619,9 @@
</span><span class="cx"> /* WebKitErrorBlockedByContentBlocker description */
</span><span class="cx"> "The URL was blocked by a content blocker" = "The URL was blocked by a content blocker";
</span><span class="cx">
</span><ins>+/* WebKitErrorFrameLoadBlockedByContentFilter description */
+"The URL was blocked by a content filter" = "The URL was blocked by a content filter";
+
</ins><span class="cx"> /* WKErrorWebViewInvalidated description */
</span><span class="cx"> "The WKWebView was invalidated" = "The WKWebView was invalidated";
</span><span class="cx">
</span><span class="lines">@@ -1117,5 +1135,6 @@
</span><span class="cx"> /* An ARIA accessibility group that acts as an dialog. */
</span><span class="cx"> "web dialog" = "web dialog";
</span><span class="cx">
</span><del>-/* WebKitErrorFrameLoadBlockedByContentFilter description */
-"The URL was blocked by a content filter" = "The URL was blocked by a content filter";
</del><ins>+/* Option in segmented control for choosing list type in text editing */
+"•" = "•";
+
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp (203887 => 203888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp 2016-07-29 07:12:46 UTC (rev 203887)
+++ branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.cpp 2016-07-29 07:12:49 UTC (rev 203888)
</span><span class="lines">@@ -1176,4 +1176,36 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+String insertListTypeNone()
+{
+ 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");
+}
+
+String insertListTypeBulletedAccessibilityTitle()
+{
+ return WEB_UI_STRING("Insert a bulleted list", "Option in segmented control for inserting a bulleted list in text editing");
+}
+
+String insertListTypeNumbered()
+{
+ return WEB_UI_STRING("1. 2. 3.…", "Option in segmented control for choosing list type in text editing");
+}
+
+String insertListTypeNumberedAccessibilityTitle()
+{
+ return WEB_UI_STRING("Insert a numbered list", "Option in segmented control for inserting a numbered list in text editing");
+}
+#endif // PLATFORM(MAC)
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h (203887 => 203888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h 2016-07-29 07:12:46 UTC (rev 203887)
+++ branches/safari-602-branch/Source/WebCore/platform/LocalizedStrings.h 2016-07-29 07:12:49 UTC (rev 203888)
</span><span class="lines">@@ -279,6 +279,15 @@
</span><span class="cx"> String webCryptoMasterKeyKeychainComment();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ WEBCORE_EXPORT String insertListTypeNone();
+ WEBCORE_EXPORT String insertListTypeNoneAccessibilityTitle();
+ WEBCORE_EXPORT String insertListTypeBulleted();
+ WEBCORE_EXPORT String insertListTypeBulletedAccessibilityTitle();
+ WEBCORE_EXPORT String insertListTypeNumbered();
+ WEBCORE_EXPORT String insertListTypeNumberedAccessibilityTitle();
+#endif
+
</ins><span class="cx"> #define WEB_UI_STRING(string, description) WebCore::localizedString(string)
</span><span class="cx"> #define WEB_UI_STRING_KEY(string, key, description) WebCore::localizedString(key)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>