Attachment 368457 Details for Bug 197370 – Patch

[patch] Patch

bug-197370-20190429085838.patch (text/plain), 8.20 KB, created by Chris Dumez on 2019-04-29 08:58:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-04-29 08:58:39 PDT

Size: 8.20 KB

patch

obsolete

>Subversion Revision: 244685
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d0c4ffcf8620c658e56282ba0e4c9c815e5e1b0c..bd219a550e5b39656d101fa58b8b9cda45b5d04b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-04-29  Chris Dumez  <cdumez@apple.com>
>+
>+        User-facing strings should use curly quotes instead of straight
>+        https://bugs.webkit.org/show_bug.cgi?id=197370
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update localizable strings.
>+
>+        * en.lproj/Localizable.strings:
>+
> 2019-04-26  Takashi Komori  <Takashi.Komori@sony.com>
> 
>         [Curl] Fix Curl Request Scheduler not to release wrong Curl handle when request is cancelled.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 2ab7eef649a0bea083ffd92a010e90c59c4c88f4..a306e2a87c61409a2d331cce2a1a3b634cd4817a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-04-29  Chris Dumez  <cdumez@apple.com>
>+
>+        User-facing strings should use curly quotes instead of straight
>+        https://bugs.webkit.org/show_bug.cgi?id=197370
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update localizable alert text that was recently added to use curly quotes instead of
>+        straight ones, as per our guidelines.
>+
>+        * UIProcess/Cocoa/WKOrientationAccessAlert.mm:
>+        (WebKit::presentOrientationAccessAlert):
>+        * UIProcess/Cocoa/WKStorageAccessAlert.mm:
>+        (WebKit::presentStorageAccessAlert):
>+
> 2019-04-26  Chris Dumez  <cdumez@apple.com>
> 
>         Improve safety of MachMessage class
>diff --git a/Source/WebCore/en.lproj/Localizable.strings b/Source/WebCore/en.lproj/Localizable.strings
>index ef37959769b01bba9c8265c95de647a1e29f4304..f3597a38fca34c81cde6758e1364368f5757af91 100644
>--- a/Source/WebCore/en.lproj/Localizable.strings
>+++ b/Source/WebCore/en.lproj/Localizable.strings
>@@ -113,7 +113,7 @@
> "Allow (device motion and orientation access)" = "Allow";
> 
> /* Message for requesting cross-site cookie and website data access. */
>-"Allow \"%@\" to use cookies and website data while browsing \"%@\"?" = "Allow \"%@\" to use cookies and website data while browsing \"%@\"?";
>+"Allow â%@â to use cookies and website data while browsing â%@â?" = "Allow â%@â to use cookies and website data while browsing â%@â?";
> 
> /* WKErrorUnknown description */
> "An unknown error occurred" = "An unknown error occurred";
>@@ -275,7 +275,7 @@
> "Dictation (Undo action name)" = "Dictation";
> 
> /* Message for requesting cross-site cookie and website data access. */
>-"Do you want to allow \"%@\" to use cookies and website data while browsing \"%@\"?" = "Do you want to allow \"%@\" to use cookies and website data while browsing \"%@\"?";
>+"Do you want to allow â%@â to use cookies and website data while browsing â%@â?" = "Do you want to allow â%@â to use cookies and website data while browsing â%@â?";
> 
> /* Button title in Storage Access API prompt */
> "Don't Allow (cross-site cookie and website data access)" = "Don't Allow";
>@@ -842,7 +842,7 @@
> "This website may try to trick you into installing software that harms your browsing experience, like changing your settings without your permission or showing you unwanted ads. Once installed, it may be difficult to remove." = "This website may try to trick you into installing software that harms your browsing experience, like changing your settings without your permission or showing you unwanted ads. Once installed, it may be difficult to remove.";
> 
> /* Informative text for requesting cross-site cookie and website data access. */
>-"This will allow \"%@\" to track your activity." = "This will allow \"%@\" to track your activity.";
>+"This will allow â%@â to track your activity." = "This will allow â%@â to track your activity.";
> 
> /* Undo action name */
> "Tighten Kerning (Undo action name)" = "Tighten Kerning";
>@@ -973,9 +973,6 @@
> /* message in authentication panel */
> "Your password will be sent unencrypted." = "Your password will be sent unencrypted.";
> 
>-/* Message for requesting access to the device motion and orientation */
>-"\"%@\" Would Like to Access Motion and Orientation" = "\"%@\" Would Like to Access Motion and Orientation";
>-
> /* HTTP result code string */
> "accepted" = "accepted";
> 
>@@ -1438,6 +1435,9 @@
> /* accessibility role description for a time field. */
> "week and year field" = "week and year field";
> 
>+/* Message for requesting access to the device motion and orientation */
>+"â%@â Would Like to Access Motion and Orientation" = "â%@â Would Like to Access Motion and Orientation";
>+
> /* Option in segmented control for choosing list type in text editing */
> "â¢" = "â¢";
> 
>diff --git a/Source/WebKit/UIProcess/Cocoa/WKOrientationAccessAlert.mm b/Source/WebKit/UIProcess/Cocoa/WKOrientationAccessAlert.mm
>index ea40a14ddb510fc8487291a1c4120e861f464935..b945ff8714a4d99b9d8ae1e00a0b9878212364a7 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WKOrientationAccessAlert.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WKOrientationAccessAlert.mm
>@@ -36,7 +36,7 @@ namespace WebKit {
> 
> void presentOrientationAccessAlert(WKWebView *view, const String& host, CompletionHandler<void(bool)>&& completionHandler)
> {
>-    NSString *alertText = [NSString stringWithFormat:WEB_UI_NSSTRING(@"\"%@\" Would Like to Access Motion and Orientation", @"Message for requesting access to the device motion and orientation"), (NSString *)host];
>+    NSString *alertText = [NSString stringWithFormat:WEB_UI_NSSTRING(@"â%@â Would Like to Access Motion and Orientation", @"Message for requesting access to the device motion and orientation"), (NSString *)host];
>     UIAlertController* alert = [UIAlertController alertControllerWithTitle:alertText message:nil preferredStyle:UIAlertControllerStyleAlert];
> 
>     auto completionBlock = makeBlockPtr([completionHandler = WTFMove(completionHandler)](bool shouldAllow) mutable {
>diff --git a/Source/WebKit/UIProcess/Cocoa/WKStorageAccessAlert.mm b/Source/WebKit/UIProcess/Cocoa/WKStorageAccessAlert.mm
>index c72eeaf9d625b5368b52baa620ea374bed28a554..81a0e56fee997fd27591b5fc9eb5fa5c4b5cab30 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WKStorageAccessAlert.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WKStorageAccessAlert.mm
>@@ -45,12 +45,12 @@ void presentStorageAccessAlert(WKWebView *webView, const WebCore::RegistrableDom
>     auto currentDomain = current.string().createCFString();
> 
> #if PLATFORM(MAC)
>-    NSString *alertTitle = [NSString stringWithFormat:WEB_UI_NSSTRING(@"Do you want to allow \"%@\" to use cookies and website data while browsing \"%@\"?", @"Message for requesting cross-site cookie and website data access."), requestingDomain.get(), currentDomain.get()];
>+    NSString *alertTitle = [NSString stringWithFormat:WEB_UI_NSSTRING(@"Do you want to allow â%@â to use cookies and website data while browsing â%@â?", @"Message for requesting cross-site cookie and website data access."), requestingDomain.get(), currentDomain.get()];
> #else
>-    NSString *alertTitle = [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow \"%@\" to use cookies and website data while browsing \"%@\"?", @"Message for requesting cross-site cookie and website data access."), requestingDomain.get(), currentDomain.get()];
>+    NSString *alertTitle = [NSString stringWithFormat:WEB_UI_NSSTRING(@"Allow â%@â to use cookies and website data while browsing â%@â?", @"Message for requesting cross-site cookie and website data access."), requestingDomain.get(), currentDomain.get()];
> #endif
> 
>-    NSString *informativeText = [NSString stringWithFormat:WEB_UI_NSSTRING(@"This will allow \"%@\" to track your activity.", @"Informative text for requesting cross-site cookie and website data access."), requestingDomain.get()];
>+    NSString *informativeText = [NSString stringWithFormat:WEB_UI_NSSTRING(@"This will allow â%@â to track your activity.", @"Informative text for requesting cross-site cookie and website data access."), requestingDomain.get()];
>     NSString *allowButtonString = WEB_UI_STRING_KEY(@"Allow", "Allow (cross-site cookie and website data access)", @"Button title in Storage Access API prompt");
>     NSString *doNotAllowButtonString = WEB_UI_STRING_KEY(@"Don't Allow", "Don't Allow (cross-site cookie and website data access)", @"Button title in Storage Access API prompt");
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197370: 368457