Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
User-facing strings should use curly quotes instead of straight
https://bugs.webkit.org/show_bug.cgi?id=197370

Reviewed by Geoffrey Garen.

Source/WebCore:

Update localizable strings.

* en.lproj/Localizable.strings:

Source/WebKit:

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):


Canonical link: https://commits.webkit.org/211571@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244742 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Apr 29, 2019
1 parent 51d59a0 commit 71ffd96
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 10 deletions.
11 changes: 11 additions & 0 deletions 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 Geoffrey Garen.

Update localizable strings.

* en.lproj/Localizable.strings:

2019-04-29 Ross Kirsling <ross.kirsling@sony.com>

Unreviewed fix for non-unified build after r244687.
Expand Down
12 changes: 6 additions & 6 deletions Source/WebCore/en.lproj/Localizable.strings
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";

Expand Down Expand Up @@ -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 */
"•" = "•";

15 changes: 15 additions & 0 deletions 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 Geoffrey Garen.

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-29 Alex Christensen <achristensen@webkit.org>

Build fix.
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/UIProcess/Cocoa/WKOrientationAccessAlert.mm
Expand Up @@ -36,7 +36,7 @@

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 {
Expand Down
6 changes: 3 additions & 3 deletions Source/WebKit/UIProcess/Cocoa/WKStorageAccessAlert.mm
Expand Up @@ -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");

Expand Down

0 comments on commit 71ffd96

Please sign in to comment.