Bug 726015 - Fennec display Offline mode message when suppose to display connectionFailure. r=mfinkle
authorBruce Wu <brucewu@csupomona.edu>
Mon, 13 May 2013 17:24:40 -0400
changeset 138941 3a2756741ff0fd258037f1d691f33222154408d8
parent 138940 b30764ad410fec4896bafbd11257c0f96069c4cf
child 138942 92a9b801e5d0b4d9b9b720720fb8ec917e92f57e
push id3911
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 20:17:26 +0000
treeherdermozilla-aurora@7e26ca8db92b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs726015
milestone24.0a1
Bug 726015 - Fennec display Offline mode message when suppose to display connectionFailure. r=mfinkle When there are no active connection (no wifi or cellular data), Fennec display: netError = Firefox is currently in offline mode and can't browse the Web. when it is suppose to use connectionFailure = Firefox can't establish a connection to the server at %S.
mobile/android/chrome/content/netError.xhtml
--- a/mobile/android/chrome/content/netError.xhtml
+++ b/mobile/android/chrome/content/netError.xhtml
@@ -277,17 +277,21 @@
         <h1 id="et_malformedURI">&malformedURI.title;</h1>
         <h1 id="et_protocolNotFound">&protocolNotFound.title;</h1>
         <h1 id="et_connectionFailure">&connectionFailure.title;</h1>
         <h1 id="et_netTimeout">&netTimeout.title;</h1>
         <h1 id="et_redirectLoop">&redirectLoop.title;</h1>
         <h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
         <h1 id="et_netReset">&netReset.title;</h1>
         <h1 id="et_notCached">&notCached.title;</h1>
-        <h1 id="et_netOffline">&netOffline.title;</h1>
+       
+        <!-- Since Fennec not yet have offline mode, change the title to 
+        connectionFailure to prevent confusion -->
+        <h1 id="et_netOffline">&connectionFailure.title;</h1>
+        
         <h1 id="et_netInterrupt">&netInterrupt.title;</h1>
         <h1 id="et_deniedPortAccess">&deniedPortAccess.title;</h1>
         <h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
         <h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
         <h1 id="et_contentEncodingError">&contentEncodingError.title;</h1>
         <h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
@@ -302,17 +306,21 @@
         <div id="ed_malformedURI">&malformedURI.longDesc;</div>
         <div id="ed_protocolNotFound">&protocolNotFound.longDesc;</div>
         <div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
         <div id="ed_netTimeout">&netTimeout.longDesc;</div>
         <div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
         <div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
         <div id="ed_netReset">&netReset.longDesc;</div>
         <div id="ed_notCached">&notCached.longDesc;</div>
-        <div id="ed_netOffline">&netOffline.longDesc2;</div>
+        
+        <!-- Change longDesc from netOffline to connectionFailure,
+        suggesting user to check their wifi/cell_data connection -->
+        <div id="ed_netOffline">&connectionFailure.longDesc;</div>
+        
         <div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
         <div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
         <div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc2;</div>
         <div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
         <div id="ed_contentEncodingError">&contentEncodingError.longDesc;</div>
         <div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
         <div id="ed_nssFailure2">&nssFailure2.longDesc;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>