<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177161] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177161">177161</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-11 11:23:30 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] String changes for the HTTP authentication dialog
https://bugs.webkit.org/show_bug.cgi?id=136782
Patch by Michael Catanzaro <mcatanzaro@igalia.com> on 2014-12-11
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
(webkitAuthenticationDialogInitialize): Add a title to the dialog, add
some missing mnemonics, and tweak a few strings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitAuthenticationDialogcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177160 => 177161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-11 18:30:24 UTC (rev 177160)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-11 19:23:30 UTC (rev 177161)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-11 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] String changes for the HTTP authentication dialog
+ https://bugs.webkit.org/show_bug.cgi?id=136782
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
+ (webkitAuthenticationDialogInitialize): Add a title to the dialog, add
+ some missing mnemonics, and tweak a few strings.
+
</ins><span class="cx"> 2014-12-09 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Restore interface state when stopping optimized fullscreen.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitAuthenticationDialogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp (177160 => 177161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2014-12-11 18:30:24 UTC (rev 177160)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2014-12-11 19:23:30 UTC (rev 177161)
</span><span class="lines">@@ -88,18 +88,26 @@
</span><span class="cx"> GtkWidget* vBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
</span><span class="cx"> gtk_container_set_border_width(GTK_CONTAINER(vBox), 12);
</span><span class="cx">
</span><ins>+ GtkWidget* label = gtk_label_new(nullptr);
+ // Title of the HTTP authentication dialog.
+ GUniquePtr<char> title(g_strdup_printf("<b>%s</b>", _("Authentication Required")));
+ gtk_label_set_markup(GTK_LABEL(label), title.get());
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vBox), label, FALSE, FALSE, 0);
+
</ins><span class="cx"> GtkWidget* buttonBox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
</span><span class="cx"> gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonBox), GTK_BUTTONBOX_END);
</span><span class="cx"> gtk_container_set_border_width(GTK_CONTAINER(buttonBox), 5);
</span><span class="cx"> gtk_box_set_spacing(GTK_BOX(buttonBox), 6);
</span><span class="cx">
</span><del>- GtkWidget* button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
</del><ins>+ GtkWidget* button = gtk_button_new_with_mnemonic(_("_Cancel"));
</ins><span class="cx"> g_signal_connect(button, "clicked", G_CALLBACK(cancelButtonClicked), authDialog);
</span><span class="cx"> gtk_box_pack_end(GTK_BOX(buttonBox), button, FALSE, TRUE, 0);
</span><span class="cx"> gtk_widget_show(button);
</span><span class="cx">
</span><span class="cx"> WebKitAuthenticationDialogPrivate* priv = authDialog->priv;
</span><del>- button = gtk_button_new_from_stock(GTK_STOCK_OK);
</del><ins>+ button = gtk_button_new_with_mnemonic(_("_Authenticate"));
</ins><span class="cx"> priv->defaultButton = button;
</span><span class="cx"> g_signal_connect(button, "clicked", G_CALLBACK(okButtonClicked), authDialog);
</span><span class="cx"> gtk_widget_set_can_default(button, TRUE);
</span><span class="lines">@@ -111,15 +119,16 @@
</span><span class="cx">
</span><span class="cx"> const WebCore::AuthenticationChallenge& challenge = webkitAuthenticationRequestGetAuthenticationChallenge(priv->request.get())->core();
</span><span class="cx"> // Prompt on the HTTP authentication dialog.
</span><del>- GUniquePtr<char> prompt(g_strdup_printf(_("The site %s:%i requests a username and password"),
</del><ins>+ GUniquePtr<char> prompt(g_strdup_printf(_("Authentication required by %s:%i"),
</ins><span class="cx"> challenge.protectionSpace().host().utf8().data(), challenge.protectionSpace().port()));
</span><del>- GtkWidget* label = createLabelWithLineWrap(prompt.get());
</del><ins>+ label = createLabelWithLineWrap(prompt.get());
</ins><span class="cx"> gtk_widget_show(label);
</span><span class="cx"> gtk_box_pack_start(GTK_BOX(authBox), label, FALSE, FALSE, 0);
</span><span class="cx">
</span><span class="cx"> String realm = challenge.protectionSpace().realm();
</span><span class="cx"> if (!realm.isEmpty()) {
</span><del>- GUniquePtr<char> message(g_strdup_printf("%s “%s”", _("Server message:"), realm.utf8().data()));
</del><ins>+ // Label on the HTTP authentication dialog. %s is a (probably English) message from the website.
+ GUniquePtr<char> message(g_strdup_printf(_("The site says: “%s”"), realm.utf8().data()));
</ins><span class="cx"> label = createLabelWithLineWrap(message.get());
</span><span class="cx"> gtk_widget_show(label);
</span><span class="cx"> gtk_box_pack_start(GTK_BOX(authBox), label, FALSE, FALSE, 0);
</span><span class="lines">@@ -129,28 +138,30 @@
</span><span class="cx"> priv->rememberCheckButton = gtk_check_button_new_with_mnemonic(_("_Remember password"));
</span><span class="cx"> gtk_label_set_line_wrap(GTK_LABEL(gtk_bin_get_child(GTK_BIN(priv->rememberCheckButton))), TRUE);
</span><span class="cx">
</span><del>- // Entry on the HTTP authentication dialog.
- GtkWidget* loginLabel = gtk_label_new(_("Username:"));
- gtk_widget_set_halign(loginLabel, GTK_ALIGN_END);
- gtk_style_context_add_class(gtk_widget_get_style_context(loginLabel), GTK_STYLE_CLASS_DIM_LABEL);
- gtk_widget_show(loginLabel);
-
</del><span class="cx"> priv->loginEntry = gtk_entry_new();
</span><span class="cx"> gtk_widget_set_hexpand(priv->loginEntry, TRUE);
</span><span class="cx"> gtk_entry_set_activates_default(GTK_ENTRY(priv->loginEntry), TRUE);
</span><span class="cx"> gtk_widget_show(priv->loginEntry);
</span><span class="cx">
</span><span class="cx"> // Entry on the HTTP authentication dialog.
</span><del>- GtkWidget* passwordLabel = gtk_label_new(_("Password:"));
- gtk_widget_set_halign(passwordLabel, GTK_ALIGN_END);
- gtk_style_context_add_class(gtk_widget_get_style_context(passwordLabel), GTK_STYLE_CLASS_DIM_LABEL);
- gtk_widget_show(passwordLabel);
</del><ins>+ GtkWidget* loginLabel = gtk_label_new_with_mnemonic(_("_Username"));
+ gtk_label_set_mnemonic_widget(GTK_LABEL(loginLabel), priv->loginEntry);
+ gtk_widget_set_halign(loginLabel, GTK_ALIGN_END);
+ gtk_style_context_add_class(gtk_widget_get_style_context(loginLabel), GTK_STYLE_CLASS_DIM_LABEL);
+ gtk_widget_show(loginLabel);
</ins><span class="cx">
</span><span class="cx"> priv->passwordEntry = gtk_entry_new();
</span><span class="cx"> gtk_widget_set_hexpand(priv->passwordEntry, TRUE);
</span><span class="cx"> gtk_entry_set_activates_default(GTK_ENTRY(priv->passwordEntry), TRUE);
</span><span class="cx"> gtk_widget_show(priv->passwordEntry);
</span><span class="cx">
</span><ins>+ // Entry on the HTTP authentication dialog.
+ GtkWidget* passwordLabel = gtk_label_new_with_mnemonic(_("_Password"));
+ gtk_label_set_mnemonic_widget(GTK_LABEL(passwordLabel), priv->passwordEntry);
+ gtk_widget_set_halign(passwordLabel, GTK_ALIGN_END);
+ gtk_style_context_add_class(gtk_widget_get_style_context(passwordLabel), GTK_STYLE_CLASS_DIM_LABEL);
+ gtk_widget_show(passwordLabel);
+
</ins><span class="cx"> GtkWidget* grid = gtk_grid_new();
</span><span class="cx"> gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
</span><span class="cx"> gtk_grid_set_row_spacing(GTK_GRID(grid), 6);
</span></span></pre>
</div>
</div>
</body>
</html>