[epiphany] Improve reload buttons on error pages
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Improve reload buttons on error pages
- Date: Sun, 28 Feb 2016 17:39:58 +0000 (UTC)
commit c0d9dd344230bb4c9f784b59c82630cbe7d35e0a
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Feb 28 11:37:42 2016 -0600
Improve reload buttons on error pages
* Fix translation of the access keys
* Get rid of "Anyway" as Jakub doesn't like it
* Use "opinionated design" for the TLS error page bypass
https://bugzilla.gnome.org/show_bug.cgi?id=747973
embed/ephy-web-view.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 06d7911..a37a992 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1773,10 +1773,10 @@ ephy_web_view_load_error_page (EphyWebView *view,
"address. You may wish to verify that your "
"internet connection is working correctly.</p>"),
uri, reason);
- button_label = g_strdup (_("Try Again"));
+ button_label = g_strdup (_("Reload"));
custom_class = "network-error";
- /* Access key for the "Try Again" button on the network error page. */
- accesskey = dgettext ("accesskey", "A");
+ /* Access key for the "Reload" button on the network error page. */
+ accesskey = C_("reload-access-key", "R");
break;
case EPHY_WEB_VIEW_ERROR_PAGE_CRASH:
page_title = g_strdup_printf (_("Problem loading ā%sā"), hostname);
@@ -1787,19 +1787,19 @@ ephy_web_view_load_error_page (EphyWebView *view,
"please report the problem to the "
"<strong>%s</strong> developers.</p>"),
LSB_DISTRIBUTOR);
- button_label = g_strdup (_("Reload Anyway"));
+ button_label = g_strdup (_("Reload"));
custom_class = "page-crash";
- /* Access key for the "Reload Anyway" button on the crash error page. */
- accesskey = dgettext ("accesskey", "A");
+ /* Access key for the "Reload" button on the crash error page. */
+ accesskey = C_("reload-access-key", "R");
break;
case EPHY_WEB_VIEW_ERROR_PROCESS_CRASH:
page_title = g_strdup_printf (_("Problem displaying ā%sā"), hostname);
msg_title = g_strdup (_("Oops!"));
msg = g_strdup (_("Something went wrong while displaying this page. Please reload or visit a different
page to continue."));
- button_label = g_strdup (_("Reload Anyway"));
+ button_label = g_strdup (_("Reload"));
custom_class = "process-crash";
- /* Access key for the "Reload Anyway" button on the crash error page. */
- accesskey = dgettext ("accesskey", "A");
+ /* Access key for the "Reload" button on the crash error page. */
+ accesskey = C_("reload-access-key", "R");
break;
case EPHY_WEB_VIEW_ERROR_INVALID_TLS_CERTIFICATE:
/* Page title when a site cannot be loaded. %s is the site's hostname. */
@@ -1808,10 +1808,10 @@ ephy_web_view_load_error_page (EphyWebView *view,
msg_title = g_strdup (_("Look out!"));
msg = get_tls_error_page_message (view, hostname);
/* Button on error page when a website's TLS certificate is invalid. */
- button_label = g_strdup (_("Load Anyway"));
+ button_label = g_strdup (_("Accept Risk"));
custom_class = "tls-error";
- /* Access key for the "Load Anyway" button on the TLS error page. */
- accesskey = dgettext ("accesskey", "A");
+ /* Access key for the "Accept Risk" button on the TLS error page. */
+ accesskey = C_("accept-risk-access-key", "R");
load_anyway_js = g_strdup_printf
("window.webkit.messageHandlers.tlsErrorPage.postMessage(%"G_GUINT64_FORMAT");",
webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (view)));
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]