Changeset 238503 in webkit


Ignore:
Timestamp:
Nov 26, 2018 11:15:11 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Use Full Screen consistently in localizable strings.
​https://bugs.webkit.org/show_bug.cgi?id=190363
rdar://problem/43882333

Patch by Jeremy Jones <​jeremyj@apple.com> on 2018-11-26
Reviewed by Jon Lee.

Source/WebCore:

No new tests because only change is to localizable strings.

Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.

  • English.lproj/Localizable.strings:
  • platform/LocalizedStrings.cpp:

(WebCore::contextMenuItemTagEnterVideoFullscreen):
(WebCore::contextMenuItemTagExitVideoFullscreen):
(WebCore::localizedMediaControlElementHelpText):

Source/WebKit:

Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.

  • UIProcess/ios/fullscreen/WKFullScreenViewController.mm:

(-[WKFullScreenViewController _showPhishingAlert]):

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r238501 r238503  
     12018-11-26  Jeremy Jones  <jeremyj@apple.com>
     2
     3        Use Full Screen consistently in localizable strings.
     4        https://bugs.webkit.org/show_bug.cgi?id=190363
     5        rdar://problem/43882333
     6
     7        Reviewed by Jon Lee.
     8
     9        No new tests because only change is to localizable strings.
     10
     11        Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.
     12
     13        * English.lproj/Localizable.strings:
     14        * platform/LocalizedStrings.cpp:
     15        (WebCore::contextMenuItemTagEnterVideoFullscreen):
     16        (WebCore::contextMenuItemTagExitVideoFullscreen):
     17        (WebCore::localizedMediaControlElementHelpText):
     18
    1192018-11-26  Brent Fulgham  <bfulgham@apple.com>
    220

  • trunk/Source/WebCore/en.lproj/Localizable.strings

    r238475 r238503  
    260260"Drag (Undo action name)" = "Drag";
    261261
    262 /* Video Enter Fullscreen context menu item */
     262/* Video Enter Full Screen context menu item */
    263263"Enter Full Screen" = "Enter Full Screen";
    264264
    … …  
    284284"Exit Full Screen" = "Exit Full Screen";
    285285
    286 /* Fullscreen Deceptive Website Exit Action */
    287 "Exit Full Screen (Element Fullscreen)" = "Exit Full Screen";
    288 
    289 /* Video Exit Fullscreen context menu item */
     286/* Full Screen Deceptive Website Exit Action */
     287"Exit Full Screen (Element Full Screen)" = "Exit Full Screen";
     288
     289/* Video Exit Full Screen context menu item */
    290290"Exit Full Screen (context menu)" = "Exit Full Screen";
    291291
    … …  
    368368"Invalid value" = "Invalid value";
    369369
    370 /* Fullscreen Deceptive Website Warning Sheet Title */
     370/* Full Screen Deceptive Website Warning Sheet Title */
    371371"It looks like you are typing while in full screen" = "It looks like you are typing while in full screen";
    372372
    … …  
    554554"Play" = "Play";
    555555
    556 /* accessibility help text for enter fullscreen button */
    557 "Play movie in fullscreen mode" = "Play movie in fullscreen mode";
     556/* accessibility help text for enter full screen button */
     557"Play movie in full screen mode" = "Play movie in full screen mode";
    558558
    559559/* Label text to be used if plugin host process has crashed */
    … …  
    692692"Start Speaking" = "Start Speaking";
    693693
    694 /* Fullscreen Deceptive Website Stay Action */
    695 "Stay in Full Screen (Element Fullscreen)" = "Stay in Full Screen";
     694/* Full Screen Deceptive Website Stay Action */
     695"Stay in Full Screen (Element Full Screen)" = "Stay in Full Screen";
    696696
    697697/* Stop context menu item */
    … …  
    818818"Typing (Undo action name)" = "Typing";
    819819
    820 /* Fullscreen Deceptive Website Warning Sheet Content Text */
     820/* Full Screen Deceptive Website Warning Sheet Content Text */
    821821"Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information." = "Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.";
    822822

  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r238406 r238503  
    385385String contextMenuItemTagEnterVideoFullscreen()
    386386{
    387     return WEB_UI_STRING("Enter Full Screen", "Video Enter Fullscreen context menu item");
     387    return WEB_UI_STRING("Enter Full Screen", "Video Enter Full Screen context menu item");
    388388}
    389389
    390390String contextMenuItemTagExitVideoFullscreen()
    391391{
    392     return WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (context menu)", "Video Exit Fullscreen context menu item");
     392    return WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (context menu)", "Video Exit Full Screen context menu item");
    393393}
    394394#endif
    … …  
    799799        return WEB_UI_STRING("seek quickly forward", "accessibility help text for fast forward button");
    800800    if (name == "FullscreenButton")
    801         return WEB_UI_STRING("Play movie in fullscreen mode", "accessibility help text for enter fullscreen button");
     801        return WEB_UI_STRING("Play movie in full screen mode", "accessibility help text for enter full screen button");
    802802    if (name == "ShowClosedCaptionsButton")
    803803        return WEB_UI_STRING("start displaying closed captions", "accessibility help text for show closed captions button");

  • trunk/Source/WebKit/ChangeLog

    r238498 r238503  
     12018-11-26  Jeremy Jones  <jeremyj@apple.com>
     2
     3        Use Full Screen consistently in localizable strings.
     4        https://bugs.webkit.org/show_bug.cgi?id=190363
     5        rdar://problem/43882333
     6
     7        Reviewed by Jon Lee.
     8
     9        Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.
     10
     11        * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
     12        (-[WKFullScreenViewController _showPhishingAlert]):
     13
    1142018-11-26  Daniel Bates  <dabates@apple.com>
    215

  • trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm

    r237266 r238503  
    556556- (void)_showPhishingAlert
    557557{
    558     NSString *alertTitle = WEB_UI_STRING("It looks like you are typing while in full screen", "Fullscreen Deceptive Website Warning Sheet Title");
    559     NSString *alertMessage = [NSString stringWithFormat:WEB_UI_STRING("Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Fullscreen Deceptive Website Warning Sheet Content Text"), (NSString *)self.location];
     558    NSString *alertTitle = WEB_UI_STRING("It looks like you are typing while in full screen", "Full Screen Deceptive Website Warning Sheet Title");
     559    NSString *alertMessage = [NSString stringWithFormat:WEB_UI_STRING("Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Full Screen Deceptive Website Warning Sheet Content Text"), (NSString *)self.location];
    560560    UIAlertController* alert = [UIAlertController alertControllerWithTitle:alertTitle message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
    561561
    … …  
    563563        page->suspendActiveDOMObjectsAndAnimations();
    564564
    565     UIAlertAction* exitAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (Element Fullscreen)", "Fullscreen Deceptive Website Exit Action") style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
     565    UIAlertAction* exitAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (Element Full Screen)", "Full Screen Deceptive Website Exit Action") style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
    566566        [self _cancelAction:action];
    567567        if (auto* page = [self._webView _page])
    … …  
    569569    }];
    570570
    571     UIAlertAction* stayAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Stay in Full Screen", "Stay in Full Screen (Element Fullscreen)", "Fullscreen Deceptive Website Stay Action") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
     571    UIAlertAction* stayAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Stay in Full Screen", "Stay in Full Screen (Element Full Screen)", "Full Screen Deceptive Website Stay Action") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
    572572        if (auto* page = [self._webView _page])
    573573            page->resumeActiveDOMObjectsAndAnimations();
Note: See TracChangeset for help on using the changeset viewer.