Changeset 85551 in webkit

Timestamp:

May 2, 2011 4:43:37 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-02 Jia Pu <​jpu@apple.com>

Reviewed by Alexey Proskuryakov.

[Mac] Need to truncate the string sent to "Look Up … " menu item, if it's too long.
​https://bugs.webkit.org/show_bug.cgi?id=59836
<rdar://problem/9275983>

• platform/DefaultLocalizationStrategy.cpp: (WebCore::truncatedStringForLookupMenuItem): (WebCore::DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/DefaultLocalizationStrategy.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        [Mac] Need to truncate the string sent to "Look Up … " menu item, if it's too long.
+        https://bugs.webkit.org/show_bug.cgi?id=59836
+        <rdar://problem/9275983>
+
+        * platform/DefaultLocalizationStrategy.cpp:
+        (WebCore::truncatedStringForLookupMenuItem):
+        (WebCore::DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary):
+
 2011-05-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp

@@ -32 +32 @@
 #include "LocalizedStrings.h"
 #include "NotImplemented.h"
+#include "PlatformString.h"
 #include <wtf/MathExtras.h>
 #include <wtf/text/CString.h>
+#include <wtf/unicode/CharacterNames.h>
 #include <wtf/UnusedParam.h>
 
@@ -69 +71 @@
 }
 
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+static String truncatedStringForLookupMenuItem(const String& original)
+{
+    if (original.isEmpty())
+        return original;
+    
+    // Truncate the string if it's too long. This is in consistency with AppKit.
+    unsigned maxNumberOfGraphemeClustersInLookupMenuItem = 24;
+    DEFINE_STATIC_LOCAL(String, ellipsis, (&horizontalEllipsis, 1));
+    
+    String trimmed = original.stripWhiteSpace();
+    unsigned numberOfCharacters = numCharactersInGraphemeClusters(trimmed, maxNumberOfGraphemeClustersInLookupMenuItem);
+    return numberOfCharacters == trimmed.length() ? trimmed : trimmed.left(numberOfCharacters) + ellipsis;
+}
+#endif
+
 DefaultLocalizationStrategy::DefaultLocalizationStrategy()
 {
@@ -304 +322 @@
 #else
 #if USE(CF)
-    RetainPtr<CFStringRef> selectedCFString(AdoptCF, selectedString.createCFString());
+    RetainPtr<CFStringRef> selectedCFString(AdoptCF, truncatedStringForLookupMenuItem(selectedString).createCFString());
     return formatLocalizedString(WEB_UI_STRING("Look Up “%@”", "Look Up context menu item with selected word"), selectedCFString.get());
 #else
-    return WEB_UI_STRING("Look Up “<selection>”", "Look Up context menu item with selected word").replace("<selection>", selectedString);
+    return WEB_UI_STRING("Look Up “<selection>”", "Look Up context menu item with selected word").replace("<selection>", truncatedStringForLookupMenuItem(selectedString));
 #endif
 #endif