- Revision
- 182735
- Author
- [email protected]
- Date
- 2015-04-13 08:41:40 -0700 (Mon, 13 Apr 2015)
Log Message
[Cocoa] Localizable strings are inconsistent and need to be regenerated
https://bugs.webkit.org/show_bug.cgi?id=143661
Source/WebCore:
rdar://problem/19634388
Reviewed by Dan Bernstein.
* English.lproj/Localizable.strings: Updated by running the
update-webkit-localizable-strings script.
Source/WebKit/mac:
rdar://problem/19634388
Reviewed by Dan Bernstein.
* Misc/WebLocalizableStrings.mm:
(LoadWebLocalizedStringsTimerCallback): Moved the comment, useful for programmers but
not for localization, into a C++ source code comment, and made the localizer comment
consistent with the place this localizable string is used for actual localization.
* WebCoreSupport/WebEditorClient.mm:
(undoNameForEditAction): Changed the localizer comments for Delete and Dictation
to match the ones in WebKit2; no need to specify that these are iOS only, and if we do
want to specify that, we should not be using the term PLATFORM(IOS) since there is no
reason for us to expect localizers to understand that terminology. Also added a comment
about the fact that we have two copies of all the localizable strings.
Source/WebKit2:
Reviewed by Dan Bernstein.
* UIProcess/WebEditCommandProxy.cpp:
(WebKit::WebEditCommandProxy::nameForEditAction): Also added a comment
about the fact that we have two copies of all the localizable strings.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182734 => 182735)
--- trunk/Source/WebCore/ChangeLog 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebCore/ChangeLog 2015-04-13 15:41:40 UTC (rev 182735)
@@ -1,3 +1,14 @@
+2015-04-12 Darin Adler <[email protected]>
+
+ [Cocoa] Localizable strings are inconsistent and need to be regenerated
+ https://bugs.webkit.org/show_bug.cgi?id=143661
+ rdar://problem/19634388
+
+ Reviewed by Dan Bernstein.
+
+ * English.lproj/Localizable.strings: Updated by running the
+ update-webkit-localizable-strings script.
+
2015-04-13 Darin Adler <[email protected]>
Remove needless recreation of URL in NavigationScheduler::scheduleLocationChange
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (182734 => 182735)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2015-04-13 15:41:40 UTC (rev 182735)
@@ -91,9 +91,15 @@
/* WKErrorJavaScriptExceptionOccurred description */
"A _javascript_ exception occurred" = "A _javascript_ exception occurred";
+/* action menu item */
+"Add to Photos (action menu item)" = "Add to Photos";
+
/* Title for Add to Reading List action button */
"Add to Reading List" = "Add to Reading List";
+/* action menu item */
+"Add to Reading List (action menu item)" = "Add to Reading List";
+
/* Undo action name */
"Align Left (Undo action name)" = "Align Left";
@@ -181,6 +187,15 @@
/* Copy context menu item */
"Copy" = "Copy";
+/* image action menu item */
+"Copy (image action menu item)" = "Copy";
+
+/* text action menu item */
+"Copy (text action menu item)" = "Copy";
+
+/* video action menu item */
+"Copy (video action menu item)" = "Copy";
+
/* Title for Copy Link or Image action button */
"Copy ActionSheet Link" = "Copy";
@@ -211,13 +226,13 @@
/* Default writing direction context menu item */
"Default" = "Default";
-/* Undo action name (Used only by PLATFORM(IOS) code) */
+/* Undo action name */
"Delete (Undo action name)" = "Delete";
/* text to display in <details> tag when it has no <summary> child */
"Details" = "Details";
-/* Undo action name (Used only by PLATFORM(IOS) code) */
+/* Undo action name */
"Dictation (Undo action name)" = "Dictation";
/* Download Audio To Disk context menu item */
@@ -364,6 +379,9 @@
/* Menu item label for the track that represents disabling closed captions */
"Off" = "Off";
+/* action menu item */
+"Open (action menu item)" = "Open";
+
/* Title for Open Link action button */
"Open ActionSheet Link" = "Open";
@@ -406,6 +424,9 @@
/* Undo action name */
"Paste (Undo action name)" = "Paste";
+/* action menu item */
+"Paste (action menu item)" = "Paste";
+
/* Undo action name */
"Paste Font (Undo action name)" = "Paste Font";
@@ -457,6 +478,12 @@
/* Title for Save Image action button */
"Save Image" = "Save Image";
+/* image action menu item */
+"Save to Downloads (image action menu item)" = "Save to Downloads";
+
+/* video action menu item */
+"Save to Downloads (video action menu item)" = "Save to Downloads";
+
/* Search in Spotlight context menu item */
"Search in Spotlight" = "Search in Spotlight";
@@ -562,6 +589,9 @@
/* Menu section heading for subtitles */
"Subtitles" = "Subtitles";
+/* action menu item */
+"Suggestions (action menu item)" = "Suggestions";
+
/* Undo action name */
"Superscript (Undo action name)" = "Superscript";
@@ -628,7 +658,7 @@
/* Undo action name */
"Turn Off Ligatures (Undo action name)" = "Turn Off Ligatures";
-/* We don't care if we find this string, but searching for it will load the plist and save the results. */
+/* Undo action name */
"Typing (Undo action name)" = "Typing";
/* Underline context menu item */
@@ -637,6 +667,9 @@
/* Undo action name */
"Underline (Undo action name)" = "Underline";
+/* Menu item label for an audio track that has no other name */
+"Unknown (audio track)" = "Unknown";
+
/* Unknown filesize FTP directory listing item */
"Unknown (filesize)" = "Unknown";
@@ -1075,38 +1108,3 @@
/* accessibility label for video element controller */
"video playback" = "video playback";
-/* "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";
-
-/* "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";
-
-/* "Save to Downloads" action menu item in video menu */
-"Save to Downloads (video action menu item)" = "Save to Downloads";
Modified: trunk/Source/WebKit/mac/ChangeLog (182734 => 182735)
--- trunk/Source/WebKit/mac/ChangeLog 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-13 15:41:40 UTC (rev 182735)
@@ -1,3 +1,22 @@
+2015-04-12 Darin Adler <[email protected]>
+
+ [Cocoa] Localizable strings are inconsistent and need to be regenerated
+ https://bugs.webkit.org/show_bug.cgi?id=143661
+ rdar://problem/19634388
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebLocalizableStrings.mm:
+ (LoadWebLocalizedStringsTimerCallback): Moved the comment, useful for programmers but
+ not for localization, into a C++ source code comment, and made the localizer comment
+ consistent with the place this localizable string is used for actual localization.
+ * WebCoreSupport/WebEditorClient.mm:
+ (undoNameForEditAction): Changed the localizer comments for Delete and Dictation
+ to match the ones in WebKit2; no need to specify that these are iOS only, and if we do
+ want to specify that, we should not be using the term PLATFORM(IOS) since there is no
+ reason for us to expect localizers to understand that terminology. Also added a comment
+ about the fact that we have two copies of all the localizable strings.
+
2015-04-11 Yusuke Suzuki <[email protected]>
[ES6] Enable Symbol in web pages
Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm (182734 => 182735)
--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2015-04-13 15:41:40 UTC (rev 182735)
@@ -74,11 +74,14 @@
}
#if PLATFORM(IOS)
+
// See <rdar://problem/7902473> Optimize WebLocalizedString for why we do this on a background thread on a timer callback
static void LoadWebLocalizedStringsTimerCallback(CFRunLoopTimerRef timer, void *info)
{
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
- UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "We don't care if we find this string, but searching for it will load the plist and save the results.");
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+ // We don't care if we find this string, but searching for it will load the plist and save the results.
+ // FIXME: It would be nicer to do this in a more direct way.
+ UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "Undo action name");
});
}
@@ -88,4 +91,5 @@
CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
CFRelease(timer);
}
+
#endif
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (182734 => 182735)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-04-13 15:41:40 UTC (rev 182735)
@@ -543,6 +543,7 @@
static NSString* undoNameForEditAction(EditAction editAction)
{
+ // FIXME: This is identical to code in WebKit2's WebEditCommandProxy class; would be nice to share the strings instead of having two copies.
switch (editAction) {
case EditActionUnspecified: return nil;
case EditActionSetColor: return UI_STRING_KEY_INTERNAL("Set Color", "Set Color (Undo action name)", "Undo action name");
@@ -583,8 +584,8 @@
case EditActionOutdent: return UI_STRING_KEY_INTERNAL("Outdent", "Outdent (Undo action name)", "Undo action name");
case EditActionBold: return UI_STRING_KEY_INTERNAL("Bold", "Bold (Undo action name)", "Undo action name");
case EditActionItalics: return UI_STRING_KEY_INTERNAL("Italics", "Italics (Undo action name)", "Undo action name");
- case EditActionDelete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name (Used only by PLATFORM(IOS) code)");
- case EditActionDictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name (Used only by PLATFORM(IOS) code)");
+ case EditActionDelete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name");
+ case EditActionDictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name");
}
return nil;
}
Modified: trunk/Source/WebKit2/ChangeLog (182734 => 182735)
--- trunk/Source/WebKit2/ChangeLog 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-13 15:41:40 UTC (rev 182735)
@@ -1,3 +1,14 @@
+2015-04-12 Darin Adler <[email protected]>
+
+ [Cocoa] Localizable strings are inconsistent and need to be regenerated
+ https://bugs.webkit.org/show_bug.cgi?id=143661
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebEditCommandProxy.cpp:
+ (WebKit::WebEditCommandProxy::nameForEditAction): Also added a comment
+ about the fact that we have two copies of all the localizable strings.
+
2015-04-12 Sungmann Cho <[email protected]>
Fix trival typos related to the word "coordinate".
Modified: trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp (182734 => 182735)
--- trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2015-04-13 15:41:40 UTC (rev 182735)
@@ -70,6 +70,7 @@
String WebEditCommandProxy::nameForEditAction(EditAction editAction)
{
+ // FIXME: This is identical to code in WebKit's WebEditorClient class; would be nice to share the strings instead of having two copies.
switch (editAction) {
case EditActionUnspecified:
return String();
