Merge lp:~evfool/midori/lp699944 into lp:midori

[Robert Roth]

Show different messages based on network connectivity.

Show different messages based on network connectivity.
* The messages are the ones proposed by Daniel Fore at https://docs.google.com/document/d/1ToyM9GFw7ULJS7DX-DKYbx1Q1F1oqrsChDf0xNFBzWM/edit
* network availability is checked using the glib functions g_network_monitor_get_network_available for checking if the computer is connected to a wired/wireless network and g_network_monitor_can_reach to check for internet connection settings by checking if www.midori-browser.org is reachable.

[Cris Dywan (kalikiana)]

I feel it's not good to leave out the destination hostname/ URI - whatever the reason a website can't load I get very uneasy if the tab turns into a nameless error tab.

Slight concern on the wording of "there isn't anything located at" - what if the site is temporarily down due to an attack, power outage or whatever?

review: Needs Fixing

[Danielle Foré (danrabbit)]

Hey Christian and Robert,

I've reworded the messages (on the doc) so that they all contain a reference to the web address.

I've also reworded the "there isn't anything located at" message to a "cannot be found". This is in line with our current messaging.

I'm not sure I feel the bullet points are necessary since this branch reduces the suggestions to one line per message and other alerts seem to include the suggestion as part of the secondary text without bullets.

Christian, can you review the doc so we can give direction to Robert on how you'd like to proceed?

[Robert Roth (evfool)]

@Christian Dywan (kalikiana) : could you please review the doc again with Daniel's latest changes?

[Cris Dywan (kalikiana)]

Sorry, I was kinda assuming you would be updating the branch but didn't leave a comment in the doc. I think the updated wording in the docs is much better!

[lp:~evfool/midori/lp699944]

6596. By Robert Roth on 2014-04-28

Merged from trunk

6597. By Robert Roth on 2014-04-28

Updated wording based on latest suggestions

6598. By Robert Roth on 2014-04-28

Do not use suggestions with single bullet point

[Robert Roth (evfool)]

Updated the branch:
* merged from the current trunk
* updated wording based on the current suggestions from DanRabbit
* use the single suggestions without bulletpoints, as suggested by DanRabbit in the translation document comments

[Cris Dywan (kalikiana)]

Very nice stuff!

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-04-16 23:19:21 +0000
+++ midori/midori-view.c	2014-04-28 22:02:09 +0000
@@ -1203,7 +1203,6 @@
     #endif
     gchar* title;
     gchar* message;
-    GString* suggestions;
     gboolean result;
 
     /* The unholy trinity; also ignored in Webkit's default error handler */
@@ -1218,17 +1217,33 @@
         return FALSE;
     }
 
-    title = g_strdup_printf (_("'%s' can't be found"), midori_uri_parse_hostname(uri, NULL));
-    message = g_strdup_printf (_("The page '%s' couldn't be loaded:"), midori_uri_parse_hostname(uri, NULL));
-
-    suggestions = g_string_new ("<ul id=\"suggestions\"><li>");
-    g_string_append_printf (suggestions, "%s</li><li>%s</li><li>%s</li></ul>",
-        _("Check the address for typos"),
-        _("Make sure that an ethernet cable is plugged in or the wireless card is activated"),
-        _("Verify that your network settings are correct"));
+    if (!g_network_monitor_get_network_available (g_network_monitor_get_default ()))
+    {
+        title = g_strdup_printf (_("You are not connected to a network"));
+        message = g_strdup_printf (_("Your computer must be connected to a network to reach “%s”. "
+                                     "Connect to a wireless access point or attach a network cable and try again."), 
+                                     midori_uri_parse_hostname(uri, NULL));
+    } 
+    else if (!g_network_monitor_can_reach (g_network_monitor_get_default (), 
+                                           g_network_address_parse_uri ("http://midori-browser.org/", 80, NULL), 
+                                           NULL, 
+                                           NULL))
+    {
+        title = g_strdup_printf (_("You are not connected to the Internet"));
+        message = g_strdup_printf (_("Your computer appears to be connected to a network, but can't reach “%s”. "
+                                     "Check your network settings and try again."), 
+                                     midori_uri_parse_hostname(uri, NULL));
+    } 
+    else
+    {
+        title = g_strdup_printf (_("Midori can't find the page you're looking for"));
+        message = g_strdup_printf (_("The page located at “%s” cannot be found. "
+                                     "Check the web address for misspelled words and try again."), 
+                                     midori_uri_parse_hostname(uri, NULL));
+    }
 
     result = midori_view_display_error (view, uri, "stock://dialog/network-error", title,
-                                        message, error->message, g_string_free (suggestions, FALSE),
+                                        message, error->message, NULL,
                                         _("Try Again"), web_frame);
     g_free (message);
     g_free (title);