<!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>[175962] trunk/Source</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/175962">175962</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 11:14:07 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Localize strings for action menus
https://bugs.webkit.org/show_bug.cgi?id=138591
<rdar://problem/18815343>
Reviewed by Dan Bates.
* English.lproj/Localizable.strings:
Add a bunch of localizable strings.
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]):
Make use of the new strings.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _showTextIndicator]):
(-[WKActionMenuController _hideTextIndicator]):
(-[WKActionMenuController _createActionMenuItemForTag:]):
Make use of the new strings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175961 => 175962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-11 19:13:06 UTC (rev 175961)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 19:14:07 UTC (rev 175962)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-11 Tim Horton <timothy_horton@apple.com>
+
+ Localize strings for action menus
+ https://bugs.webkit.org/show_bug.cgi?id=138591
+ <rdar://problem/18815343>
+
+ Reviewed by Dan Bates.
+
+ * English.lproj/Localizable.strings:
+ Add a bunch of localizable strings.
+
</ins><span class="cx"> 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup from r175379
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (175961 => 175962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2014-11-11 19:13:06 UTC (rev 175961)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2014-11-11 19:14:07 UTC (rev 175962)
</span><span class="lines">@@ -1075,3 +1075,44 @@
</span><span class="cx"> /* accessibility label for video element controller */
</span><span class="cx"> "video playback" = "video playback";
</span><span class="cx">
</span><ins>+/* "Open Link in Default Browser" action menu item */
+"Open (action menu item)" = "Open";
+
+/* "Preview Link" action menu item */
+"Preview (action menu item)" = "Preview";
+
+/* "Add to Reading List" action menu item */
+"Add to Reading List (action menu item)" = "Add to Reading List";
+
+/* "Copy" action menu item in image menu */
+"Copy (image action menu item)" = "Copy";
+
+/* "Add to Photos" action menu item */
+"Add to Photos (action menu item)" = "Add to Photos";
+
+/* "Save to Downloads" action menu item in image menu */
+"Save to Downloads (image action menu item)" = "Save to Downloads";
+
+/* "Share" action menu item in image menu */
+"Share (image action menu item)" = "Share";
+
+/* "Copy" action menu item in text menu */
+"Copy (text action menu item)" = "Copy";
+
+/* "Look Up" action menu item */
+"Look Up (action menu item)" = "Look Up";
+
+/* "Paste" action menu item */
+"Paste (action menu item)" = "Paste";
+
+/* "Suggestions" action menu item */
+"Suggestions (action menu item)" = "Suggestions";
+
+/* "Copy" action menu item in video menu */
+"Copy (video action menu item)" = "Copy";
+
+/* "Share" action menu item in video menu */
+"Share (video action menu item)" = "Share";
+
+/* "Save to Downloads" action menu item in video menu */
+"Save to Downloads (video action menu item)" = "Save to Downloads";
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (175961 => 175962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-11 19:13:06 UTC (rev 175961)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-11 19:14:07 UTC (rev 175962)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-11 Tim Horton <timothy_horton@apple.com>
+
+ Localize strings for action menus
+ https://bugs.webkit.org/show_bug.cgi?id=138591
+ <rdar://problem/18815343>
+
+ Reviewed by Dan Bates.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]):
+ Make use of the new strings.
+
</ins><span class="cx"> 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup from r175379
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (175961 => 175962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-11 19:13:06 UTC (rev 175961)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-11 19:14:07 UTC (rev 175962)
</span><span class="lines">@@ -441,49 +441,48 @@
</span><span class="cx"> NSImage *image = nil;
</span><span class="cx"> id representedObject = nil;
</span><span class="cx">
</span><del>- // FIXME: We should localize these strings.
</del><span class="cx"> switch (tag) {
</span><span class="cx"> case WebActionMenuItemTagOpenLinkInDefaultBrowser:
</span><span class="cx"> selector = @selector(_openURLFromActionMenu:);
</span><del>- title = @"Open";
</del><ins>+ title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item");
</ins><span class="cx"> image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
</span><span class="cx"> representedObject = [hitTestResult objectForKey:WebElementLinkURLKey];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagPreviewLink:
</span><span class="cx"> selector = @selector(_quickLookURLFromActionMenu:);
</span><del>- title = @"Preview";
</del><ins>+ title = WEB_UI_STRING_KEY("Preview", "Preview (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
</span><span class="cx"> representedObject = hitTestResult;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagAddLinkToSafariReadingList:
</span><span class="cx"> selector = @selector(_addToReadingListFromActionMenu:);
</span><del>- title = @"Add to Safari Reading List";
</del><ins>+ title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:NSImageNameBookmarksTemplate];
</span><span class="cx"> representedObject = [hitTestResult objectForKey:WebElementLinkURLKey];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagCopyText:
</span><span class="cx"> selector = @selector(_copySelection:);
</span><del>- title = @"Copy";
</del><ins>+ title = WEB_UI_STRING_KEY("Copy", "Copy (text action menu item)", "text action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuCopy"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagLookupText:
</span><span class="cx"> selector = @selector(_lookupText:);
</span><del>- title = @"Look Up";
</del><ins>+ title = WEB_UI_STRING_KEY("Look Up", "Look Up (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuLookup"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagPaste:
</span><span class="cx"> selector = @selector(_paste:);
</span><del>- title = @"Paste";
</del><ins>+ title = WEB_UI_STRING_KEY("Paste", "Paste (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuPaste"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagTextSuggestions:
</span><del>- title = @"Suggestions";
</del><ins>+ title = WEB_UI_STRING_KEY("Suggestions", "Suggestions (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSpelling"];
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175961 => 175962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-11 19:13:06 UTC (rev 175961)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-11 19:14:07 UTC (rev 175962)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-11 Tim Horton <timothy_horton@apple.com>
+
+ Localize strings for action menus
+ https://bugs.webkit.org/show_bug.cgi?id=138591
+ <rdar://problem/18815343>
+
+ Reviewed by Dan Bates.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _showTextIndicator]):
+ (-[WKActionMenuController _hideTextIndicator]):
+ (-[WKActionMenuController _createActionMenuItemForTag:]):
+ Make use of the new strings.
+
</ins><span class="cx"> 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup from r175379
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175961 => 175962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-11 19:13:06 UTC (rev 175961)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-11 19:14:07 UTC (rev 175962)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #import <ImageKit/ImageKit.h>
</span><span class="cx"> #import <WebCore/DataDetectorsSPI.h>
</span><span class="cx"> #import <WebCore/GeometryUtilities.h>
</span><ins>+#import <WebCore/LocalizedStrings.h>
</ins><span class="cx"> #import <WebCore/NSSharingServiceSPI.h>
</span><span class="cx"> #import <WebCore/NSSharingServicePickerSPI.h>
</span><span class="cx"> #import <WebCore/NSViewSPI.h>
</span><span class="lines">@@ -723,88 +724,87 @@
</span><span class="cx"> NSString *title = nil;
</span><span class="cx"> NSImage *image = nil;
</span><span class="cx">
</span><del>- // FIXME: These titles need to be localized.
</del><span class="cx"> switch (tag) {
</span><span class="cx"> case kWKContextActionItemTagOpenLinkInDefaultBrowser:
</span><span class="cx"> selector = @selector(_openURLFromActionMenu:);
</span><del>- title = @"Open";
</del><ins>+ title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item");
</ins><span class="cx"> image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> case kWKContextActionItemTagPreviewLink:
</span><span class="cx"> selector = @selector(_keepPreviewOpenFromActionMenu:);
</span><del>- title = @"Preview";
</del><ins>+ title = WEB_UI_STRING_KEY("Preview", "Preview (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagAddLinkToSafariReadingList:
</span><span class="cx"> selector = @selector(_addToReadingListFromActionMenu:);
</span><del>- title = @"Add to Safari Reading List";
</del><ins>+ title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:NSImageNameBookmarksTemplate];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagCopyImage:
</span><span class="cx"> selector = @selector(_copyImage:);
</span><del>- title = @"Copy";
</del><ins>+ title = WEB_UI_STRING_KEY("Copy", "Copy (image action menu item)", "image action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuCopy"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagAddImageToPhotos:
</span><span class="cx"> selector = @selector(_addImageToPhotos:);
</span><del>- title = @"Add to Photos";
</del><ins>+ title = WEB_UI_STRING_KEY("Add to Photos", "Add to Photos (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuAddToPhotos"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagSaveImageToDownloads:
</span><span class="cx"> selector = @selector(_saveImageToDownloads:);
</span><del>- title = @"Save to Downloads";
</del><ins>+ title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (image action menu item)", "image action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagShareImage:
</span><del>- title = @"Share";
</del><ins>+ title = WEB_UI_STRING_KEY("Share (image action menu item)", "Share (image action menu item)", "image action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuShare"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagCopyText:
</span><span class="cx"> selector = @selector(_copySelection:);
</span><del>- title = @"Copy";
</del><ins>+ title = WEB_UI_STRING_KEY("Copy", "Copy (text action menu item)", "text action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuCopy"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagLookupText:
</span><span class="cx"> selector = @selector(_lookupText:);
</span><del>- title = @"Look Up";
</del><ins>+ title = WEB_UI_STRING_KEY("Look Up", "Look Up (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuLookup"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagPaste:
</span><span class="cx"> selector = @selector(_paste:);
</span><del>- title = @"Paste";
</del><ins>+ title = WEB_UI_STRING_KEY("Paste", "Paste (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuPaste"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagTextSuggestions:
</span><del>- title = @"Suggestions";
</del><ins>+ title = WEB_UI_STRING_KEY("Suggestions", "Suggestions (action menu item)", "action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSpelling"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagCopyVideoURL:
</span><span class="cx"> selector = @selector(_copyVideoURL:);
</span><del>- title = @"Copy";
</del><ins>+ title = WEB_UI_STRING_KEY("Copy", "Copy (video action menu item)", "video action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuCopy"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagSaveVideoToDownloads:
</span><span class="cx"> selector = @selector(_saveVideoToDownloads:);
</span><del>- title = @"Save to Downloads";
</del><ins>+ title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagShareVideo:
</span><del>- title = @"Share";
</del><ins>+ title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item");
</ins><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuShare"];
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>