Changeset 84118 in webkit


Ignore:
Timestamp:
Apr 17, 2011 5:10:15 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-04-17 Sam Weinig <​sam@webkit.org>

Reviewed by Geoffrey Garen.

Make more strings in WebKit2 localizable
​https://bugs.webkit.org/show_bug.cgi?id=58757

  • UIProcess/API/mac/PDFViewController.mm: (-[WKPDFView menuForEvent:]):
  • UIProcess/API/mac/PageClientImpl.mm: (WebKit::PageClientImpl::setViewportArguments): (WebKit::PageClientImpl::registerEditCommand):
  • UIProcess/WebEditCommandProxy.cpp: (WebKit::WebEditCommandProxy::nameForEditAction):
  • UIProcess/WebEditCommandProxy.h: Use WebCore's localization macro to make more strings localizable.
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r84104 r84118  
     12011-04-17  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Geoffrey Garen.
     4
     5        Make more strings in WebKit2 localizable
     6        https://bugs.webkit.org/show_bug.cgi?id=58757
     7
     8        * UIProcess/API/mac/PDFViewController.mm:
     9        (-[WKPDFView menuForEvent:]):
     10        * UIProcess/API/mac/PageClientImpl.mm:
     11        (WebKit::PageClientImpl::setViewportArguments):
     12        (WebKit::PageClientImpl::registerEditCommand):
     13        * UIProcess/WebEditCommandProxy.cpp:
     14        (WebKit::WebEditCommandProxy::nameForEditAction):
     15        * UIProcess/WebEditCommandProxy.h:
     16        Use WebCore's localization macro to make more strings localizable.
     17
    1182011-04-17  Patrick Gansterer  <paroga@webkit.org>
    219

  • trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm

    r83454 r84118  
    3636#import "WebPreferences.h"
    3737#import <PDFKit/PDFKit.h>
     38#import <WebCore/LocalizedStrings.h>
    3839#import <wtf/text/WTFString.h>
    3940
    … …  
    314315
    315316        _applicationInfoForMIMEType(@"application/pdf", &appName, &appIcon);
    316         if (!appName) {
    317             // FIXME: Localize this.
    318             appName = @"Finder";
    319         }
     317        if (!appName)
     318            appName = WEB_UI_STRING("Finder", "Default application name for Open With context menu");
    320319
    321320        // To match the PDFKit style, we'll add Open with Preview even when there's no document yet to view, and
    322321        // disable it using validateUserInterfaceItem.
    323         // FIXME: Localize this.
    324         NSString *title = [NSString stringWithFormat:@"Open with %@", appName];
     322        NSString *title = [NSString stringWithFormat:WEB_UI_STRING("Open with %@", "context menu item for PDF"), appName];
     323
    325324        item = [[NSMenuItem alloc] initWithTitle:title action:@selector(_openWithFinder:) keyEquivalent:@""];
    326325        if (appIcon)

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

    r84064 r84118  
    210210void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&)
    211211{
    212 
    213 }
    214 
    215 static NSString* nameForEditAction(EditAction editAction)
    216 {
    217     // FIXME: Use localized strings.
    218     // FIXME: Move this to a platform independent location.
    219 
    220     switch (editAction) {
    221     case EditActionUnspecified: return nil;
    222     case EditActionSetColor: return @"Set Color";
    223     case EditActionSetBackgroundColor: return @"Set Background Color";
    224     case EditActionTurnOffKerning: return @"Turn Off Kerning";
    225     case EditActionTightenKerning: return @"Tighten Kerning";
    226     case EditActionLoosenKerning: return @"Loosen Kerning";
    227     case EditActionUseStandardKerning: return @"Use Standard Kerning";
    228     case EditActionTurnOffLigatures: return @"Turn Off Ligatures";
    229     case EditActionUseStandardLigatures: return @"Use Standard Ligatures";
    230     case EditActionUseAllLigatures: return @"Use All Ligatures";
    231     case EditActionRaiseBaseline: return @"Raise Baseline";
    232     case EditActionLowerBaseline: return @"Lower Baseline";
    233     case EditActionSetTraditionalCharacterShape: return @"Set Traditional Character Shape";
    234     case EditActionSetFont: return @"Set Font";
    235     case EditActionChangeAttributes: return @"Change Attributes";
    236     case EditActionAlignLeft: return @"Align Left";
    237     case EditActionAlignRight: return @"Align Right";
    238     case EditActionCenter: return @"Center";
    239     case EditActionJustify: return @"Justify";
    240     case EditActionSetWritingDirection: return @"Set Writing Direction";
    241     case EditActionSubscript: return @"Subscript";
    242     case EditActionSuperscript: return @"Superscript";
    243     case EditActionUnderline: return @"Underline";
    244     case EditActionOutline: return @"Outline";
    245     case EditActionUnscript: return @"Unscript";
    246     case EditActionDrag: return @"Drag";
    247     case EditActionCut: return @"Cut";
    248     case EditActionPaste: return @"Paste";
    249     case EditActionPasteFont: return @"Paste Font";
    250     case EditActionPasteRuler: return @"Paste Ruler";
    251     case EditActionTyping: return @"Typing";
    252     case EditActionCreateLink: return @"Create Link";
    253     case EditActionUnlink: return @"Unlink";
    254     case EditActionInsertList: return @"Insert List";
    255     case EditActionFormatBlock: return @"Formatting";
    256     case EditActionIndent: return @"Indent";
    257     case EditActionOutdent: return @"Outdent";
    258     }
    259     return nil;
    260212}
    261213
    … …  
    265217
    266218    RetainPtr<WKEditCommandObjC> commandObjC(AdoptNS, [[WKEditCommandObjC alloc] initWithWebEditCommandProxy:command]);
    267     NSString *actionName = nameForEditAction(command->editAction());
     219    String actionName = WebEditCommandProxy::nameForEditAction(command->editAction());
    268220
    269221    NSUndoManager *undoManager = [m_wkView undoManager];
    270222    [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == WebPageProxy::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
    271     if (actionName)
    272         [undoManager setActionName:actionName];
     223    if (!actionName.isEmpty())
     224        [undoManager setActionName:(NSString *)actionName];
    273225}
    274226

  • trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp

    r83194 r84118  
    3030#include "WebPageProxy.h"
    3131#include "WebProcessProxy.h"
     32#include <WebCore/LocalizedStrings.h>
     33#include <wtf/text/WTFString.h>
    3234
    3335using namespace WebCore;
    … …  
    6769}
    6870
     71String WebEditCommandProxy::nameForEditAction(EditAction editAction)
     72{
     73    switch (editAction) {
     74    case EditActionUnspecified:
     75        return String();
     76    case EditActionSetColor:
     77        return WEB_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name");
     78    case EditActionSetBackgroundColor:
     79        return WEB_UI_STRING_KEY("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
     80    case EditActionTurnOffKerning:
     81        return WEB_UI_STRING_KEY("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
     82    case EditActionTightenKerning:
     83        return WEB_UI_STRING_KEY("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name");
     84    case EditActionLoosenKerning:
     85        return WEB_UI_STRING_KEY("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name");
     86    case EditActionUseStandardKerning:
     87        return WEB_UI_STRING_KEY("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name");
     88    case EditActionTurnOffLigatures:
     89        return WEB_UI_STRING_KEY("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name");
     90    case EditActionUseStandardLigatures:
     91        return WEB_UI_STRING_KEY("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name");
     92    case EditActionUseAllLigatures:
     93        return WEB_UI_STRING_KEY("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name");
     94    case EditActionRaiseBaseline:
     95        return WEB_UI_STRING_KEY("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name");
     96    case EditActionLowerBaseline:
     97        return WEB_UI_STRING_KEY("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name");
     98    case EditActionSetTraditionalCharacterShape:
     99        return WEB_UI_STRING_KEY("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name");
     100    case EditActionSetFont:
     101        return WEB_UI_STRING_KEY("Set Font", "Set Font (Undo action name)", "Undo action name");
     102    case EditActionChangeAttributes:
     103        return WEB_UI_STRING_KEY("Change Attributes", "Change Attributes (Undo action name)", "Undo action name");
     104    case EditActionAlignLeft:
     105        return WEB_UI_STRING_KEY("Align Left", "Align Left (Undo action name)", "Undo action name");
     106    case EditActionAlignRight:
     107        return WEB_UI_STRING_KEY("Align Right", "Align Right (Undo action name)", "Undo action name");
     108    case EditActionCenter:
     109        return WEB_UI_STRING_KEY("Center", "Center (Undo action name)", "Undo action name");
     110    case EditActionJustify:
     111        return WEB_UI_STRING_KEY("Justify", "Justify (Undo action name)", "Undo action name");
     112    case EditActionSetWritingDirection:
     113        return WEB_UI_STRING_KEY("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name");
     114    case EditActionSubscript:
     115        return WEB_UI_STRING_KEY("Subscript", "Subscript (Undo action name)", "Undo action name");
     116    case EditActionSuperscript:
     117        return WEB_UI_STRING_KEY("Superscript", "Superscript (Undo action name)", "Undo action name");
     118    case EditActionUnderline:
     119        return WEB_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name");
     120    case EditActionOutline:
     121        return WEB_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name");
     122    case EditActionUnscript:
     123        return WEB_UI_STRING_KEY("Unscript", "Unscript (Undo action name)", "Undo action name");
     124    case EditActionDrag:
     125        return WEB_UI_STRING_KEY("Drag", "Drag (Undo action name)", "Undo action name");
     126    case EditActionCut:
     127        return WEB_UI_STRING_KEY("Cut", "Cut (Undo action name)", "Undo action name");
     128    case EditActionPaste:
     129        return WEB_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name");
     130    case EditActionPasteFont:
     131        return WEB_UI_STRING_KEY("Paste Font", "Paste Font (Undo action name)", "Undo action name");
     132    case EditActionPasteRuler:
     133        return WEB_UI_STRING_KEY("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name");
     134    case EditActionTyping:
     135        return WEB_UI_STRING_KEY("Typing", "Typing (Undo action name)", "Undo action name");
     136    case EditActionCreateLink:
     137        return WEB_UI_STRING_KEY("Create Link", "Create Link (Undo action name)", "Undo action name");
     138    case EditActionUnlink:
     139        return WEB_UI_STRING_KEY("Unlink", "Unlink (Undo action name)", "Undo action name");
     140    case EditActionInsertList:
     141        return WEB_UI_STRING_KEY("Insert List", "Insert List (Undo action name)", "Undo action name");
     142    case EditActionFormatBlock:
     143        return WEB_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name");
     144    case EditActionIndent:
     145        return WEB_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name");
     146    case EditActionOutdent:
     147        return WEB_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name");
     148    }
     149    return String();
     150}
     151
    69152} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.h

    r80605 r84118  
    2929#include "APIObject.h"
    3030#include <WebCore/EditAction.h>
     31#include <wtf/Forward.h>
    3132#include <wtf/PassRefPtr.h>
    3233#include <wtf/RefCounted.h>
    … …  
    5253    void reapply();
    5354
     55    static String nameForEditAction(WebCore::EditAction);
     56
    5457private:
    5558    WebEditCommandProxy(uint64_t commandID, WebCore::EditAction, WebPageProxy*);
Note: See TracChangeset for help on using the changeset viewer.