Changeset 175962 in webkit
- Timestamp:
- Nov 11, 2014, 11:14:07 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/English.lproj/Localizable.strings (modified) (1 diff)
-
WebKit/mac/ChangeLog (modified) (1 diff)
-
WebKit/mac/WebView/WebActionMenuController.mm (modified) (6 diffs)
-
WebKit2/ChangeLog (modified) (1 diff)
-
WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r175961 r175962 1 2014-11-11 Tim Horton <timothy_horton@apple.com> 2 3 Localize strings for action menus 4 https://bugs.webkit.org/show_bug.cgi?id=138591 5 <rdar://problem/18815343> 6 7 Reviewed by Dan Bates. 8 9 * English.lproj/Localizable.strings: 10 Add a bunch of localizable strings. 11 1 12 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com> 2 13 -
trunk/Source/WebCore/English.lproj/Localizable.strings
r173929 r175962 1076 1076 "video playback" = "video playback"; 1077 1077 1078 /* "Open Link in Default Browser" action menu item */ 1079 "Open (action menu item)" = "Open"; 1080 1081 /* "Preview Link" action menu item */ 1082 "Preview (action menu item)" = "Preview"; 1083 1084 /* "Add to Reading List" action menu item */ 1085 "Add to Reading List (action menu item)" = "Add to Reading List"; 1086 1087 /* "Copy" action menu item in image menu */ 1088 "Copy (image action menu item)" = "Copy"; 1089 1090 /* "Add to Photos" action menu item */ 1091 "Add to Photos (action menu item)" = "Add to Photos"; 1092 1093 /* "Save to Downloads" action menu item in image menu */ 1094 "Save to Downloads (image action menu item)" = "Save to Downloads"; 1095 1096 /* "Share" action menu item in image menu */ 1097 "Share (image action menu item)" = "Share"; 1098 1099 /* "Copy" action menu item in text menu */ 1100 "Copy (text action menu item)" = "Copy"; 1101 1102 /* "Look Up" action menu item */ 1103 "Look Up (action menu item)" = "Look Up"; 1104 1105 /* "Paste" action menu item */ 1106 "Paste (action menu item)" = "Paste"; 1107 1108 /* "Suggestions" action menu item */ 1109 "Suggestions (action menu item)" = "Suggestions"; 1110 1111 /* "Copy" action menu item in video menu */ 1112 "Copy (video action menu item)" = "Copy"; 1113 1114 /* "Share" action menu item in video menu */ 1115 "Share (video action menu item)" = "Share"; 1116 1117 /* "Save to Downloads" action menu item in video menu */ 1118 "Save to Downloads (video action menu item)" = "Save to Downloads"; -
trunk/Source/WebKit/mac/ChangeLog
r175961 r175962 1 2014-11-11 Tim Horton <timothy_horton@apple.com> 2 3 Localize strings for action menus 4 https://bugs.webkit.org/show_bug.cgi?id=138591 5 <rdar://problem/18815343> 6 7 Reviewed by Dan Bates. 8 9 * WebView/WebActionMenuController.mm: 10 (-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]): 11 Make use of the new strings. 12 1 13 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com> 2 14 -
trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm
r175842 r175962 442 442 id representedObject = nil; 443 443 444 // FIXME: We should localize these strings.445 444 switch (tag) { 446 445 case WebActionMenuItemTagOpenLinkInDefaultBrowser: 447 446 selector = @selector(_openURLFromActionMenu:); 448 title = @"Open";447 title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item"); 449 448 image = webKitBundleImageNamed(@"OpenInNewWindowTemplate"); 450 449 representedObject = [hitTestResult objectForKey:WebElementLinkURLKey]; … … 453 452 case WebActionMenuItemTagPreviewLink: 454 453 selector = @selector(_quickLookURLFromActionMenu:); 455 title = @"Preview";454 title = WEB_UI_STRING_KEY("Preview", "Preview (action menu item)", "action menu item"); 456 455 image = [NSImage imageNamed:@"NSActionMenuQuickLook"]; 457 456 representedObject = hitTestResult; … … 460 459 case WebActionMenuItemTagAddLinkToSafariReadingList: 461 460 selector = @selector(_addToReadingListFromActionMenu:); 462 title = @"Add to Safari Reading List";461 title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item"); 463 462 image = [NSImage imageNamed:NSImageNameBookmarksTemplate]; 464 463 representedObject = [hitTestResult objectForKey:WebElementLinkURLKey]; … … 467 466 case WebActionMenuItemTagCopyText: 468 467 selector = @selector(_copySelection:); 469 title = @"Copy";468 title = WEB_UI_STRING_KEY("Copy", "Copy (text action menu item)", "text action menu item"); 470 469 image = [NSImage imageNamed:@"NSActionMenuCopy"]; 471 470 break; … … 473 472 case WebActionMenuItemTagLookupText: 474 473 selector = @selector(_lookupText:); 475 title = @"Look Up";474 title = WEB_UI_STRING_KEY("Look Up", "Look Up (action menu item)", "action menu item"); 476 475 image = [NSImage imageNamed:@"NSActionMenuLookup"]; 477 476 break; … … 479 478 case WebActionMenuItemTagPaste: 480 479 selector = @selector(_paste:); 481 title = @"Paste";480 title = WEB_UI_STRING_KEY("Paste", "Paste (action menu item)", "action menu item"); 482 481 image = [NSImage imageNamed:@"NSActionMenuPaste"]; 483 482 break; 484 483 485 484 case WebActionMenuItemTagTextSuggestions: 486 title = @"Suggestions";485 title = WEB_UI_STRING_KEY("Suggestions", "Suggestions (action menu item)", "action menu item"); 487 486 image = [NSImage imageNamed:@"NSActionMenuSpelling"]; 488 487 break; -
trunk/Source/WebKit2/ChangeLog
r175961 r175962 1 2014-11-11 Tim Horton <timothy_horton@apple.com> 2 3 Localize strings for action menus 4 https://bugs.webkit.org/show_bug.cgi?id=138591 5 <rdar://problem/18815343> 6 7 Reviewed by Dan Bates. 8 9 * UIProcess/mac/WKActionMenuController.mm: 10 (-[WKActionMenuController _showTextIndicator]): 11 (-[WKActionMenuController _hideTextIndicator]): 12 (-[WKActionMenuController _createActionMenuItemForTag:]): 13 Make use of the new strings. 14 1 15 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com> 2 16 -
trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm
r175835 r175962 45 45 #import <WebCore/DataDetectorsSPI.h> 46 46 #import <WebCore/GeometryUtilities.h> 47 #import <WebCore/LocalizedStrings.h> 47 48 #import <WebCore/NSSharingServiceSPI.h> 48 49 #import <WebCore/NSSharingServicePickerSPI.h> … … 724 725 NSImage *image = nil; 725 726 726 // FIXME: These titles need to be localized.727 727 switch (tag) { 728 728 case kWKContextActionItemTagOpenLinkInDefaultBrowser: 729 729 selector = @selector(_openURLFromActionMenu:); 730 title = @"Open";730 title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item"); 731 731 image = webKitBundleImageNamed(@"OpenInNewWindowTemplate"); 732 732 break; … … 735 735 case kWKContextActionItemTagPreviewLink: 736 736 selector = @selector(_keepPreviewOpenFromActionMenu:); 737 title = @"Preview";737 title = WEB_UI_STRING_KEY("Preview", "Preview (action menu item)", "action menu item"); 738 738 image = [NSImage imageNamed:@"NSActionMenuQuickLook"]; 739 739 break; … … 742 742 case kWKContextActionItemTagAddLinkToSafariReadingList: 743 743 selector = @selector(_addToReadingListFromActionMenu:); 744 title = @"Add to Safari Reading List";744 title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item"); 745 745 image = [NSImage imageNamed:NSImageNameBookmarksTemplate]; 746 746 break; … … 748 748 case kWKContextActionItemTagCopyImage: 749 749 selector = @selector(_copyImage:); 750 title = @"Copy";750 title = WEB_UI_STRING_KEY("Copy", "Copy (image action menu item)", "image action menu item"); 751 751 image = [NSImage imageNamed:@"NSActionMenuCopy"]; 752 752 break; … … 754 754 case kWKContextActionItemTagAddImageToPhotos: 755 755 selector = @selector(_addImageToPhotos:); 756 title = @"Add to Photos";756 title = WEB_UI_STRING_KEY("Add to Photos", "Add to Photos (action menu item)", "action menu item"); 757 757 image = [NSImage imageNamed:@"NSActionMenuAddToPhotos"]; 758 758 break; … … 760 760 case kWKContextActionItemTagSaveImageToDownloads: 761 761 selector = @selector(_saveImageToDownloads:); 762 title = @"Save to Downloads";762 title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (image action menu item)", "image action menu item"); 763 763 image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"]; 764 764 break; 765 765 766 766 case kWKContextActionItemTagShareImage: 767 title = @"Share";767 title = WEB_UI_STRING_KEY("Share (image action menu item)", "Share (image action menu item)", "image action menu item"); 768 768 image = [NSImage imageNamed:@"NSActionMenuShare"]; 769 769 break; … … 771 771 case kWKContextActionItemTagCopyText: 772 772 selector = @selector(_copySelection:); 773 title = @"Copy";773 title = WEB_UI_STRING_KEY("Copy", "Copy (text action menu item)", "text action menu item"); 774 774 image = [NSImage imageNamed:@"NSActionMenuCopy"]; 775 775 break; … … 777 777 case kWKContextActionItemTagLookupText: 778 778 selector = @selector(_lookupText:); 779 title = @"Look Up";779 title = WEB_UI_STRING_KEY("Look Up", "Look Up (action menu item)", "action menu item"); 780 780 image = [NSImage imageNamed:@"NSActionMenuLookup"]; 781 781 break; … … 783 783 case kWKContextActionItemTagPaste: 784 784 selector = @selector(_paste:); 785 title = @"Paste";785 title = WEB_UI_STRING_KEY("Paste", "Paste (action menu item)", "action menu item"); 786 786 image = [NSImage imageNamed:@"NSActionMenuPaste"]; 787 787 break; 788 788 789 789 case kWKContextActionItemTagTextSuggestions: 790 title = @"Suggestions";790 title = WEB_UI_STRING_KEY("Suggestions", "Suggestions (action menu item)", "action menu item"); 791 791 image = [NSImage imageNamed:@"NSActionMenuSpelling"]; 792 792 break; … … 794 794 case kWKContextActionItemTagCopyVideoURL: 795 795 selector = @selector(_copyVideoURL:); 796 title = @"Copy";796 title = WEB_UI_STRING_KEY("Copy", "Copy (video action menu item)", "video action menu item"); 797 797 image = [NSImage imageNamed:@"NSActionMenuCopy"]; 798 798 break; … … 800 800 case kWKContextActionItemTagSaveVideoToDownloads: 801 801 selector = @selector(_saveVideoToDownloads:); 802 title = @"Save to Downloads";802 title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item"); 803 803 image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"]; 804 804 break; 805 805 806 806 case kWKContextActionItemTagShareVideo: 807 title = @"Share";807 title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item"); 808 808 image = [NSImage imageNamed:@"NSActionMenuShare"]; 809 809 break;
Note:
See TracChangeset
for help on using the changeset viewer.