[Chromoting] Improve the text on the buttons in the connection-failed dialog.

remoting/webapp/client_screen.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Functions related to the 'client screen' for Chromoting.
  */
 
 'use strict';
@@ skipping 194 matching lines @@
 
   } else if (newState == remoting.ClientSession.State.CONNECTING) {
     console.log('Connecting as ' + remoting.oauth2.getCachedEmail());
 
   } else if (newState == remoting.ClientSession.State.INITIALIZING) {
     console.log('Initializing connection');
 
   } else if (newState == remoting.ClientSession.State.CONNECTED) {
     if (remoting.clientSession) {
       clearPin = true;
+      setConnectionFailedButtonsText_(true);
       remoting.setMode(remoting.AppMode.IN_SESSION);
       remoting.toolbar.center();
       remoting.toolbar.preview();
       updateStatistics_();
     }
 
   } else if (newState == remoting.ClientSession.State.CLOSED) {
     if (oldState == remoting.ClientSession.State.CONNECTED) {
       remoting.clientSession.removePlugin();
       remoting.clientSession = null;
@@ skipping 115 matching lines @@
     remoting.clientSession = null;
   }
   if (remoting.currentConnectionType == remoting.ConnectionType.It2Me) {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
   }
 }
 
 /**
+ * Set the text on the buttons shown under the error message if connection
+ * fails.
+ *
+ * @param {boolean} haveConnected Whether the connection is currently
+ *     successful.
+ * @return {void} Nothing.
+ */
+function setConnectionFailedButtonsText_(haveConnected) {
+  if (haveConnected) {
+    var button1 = document.getElementById('client-finished-me2me-button');
+    l10n.localizeElementFromTag(button1, 'OK');
+    button1.setAttribute('autofocus', 'autofocus');
+    var button2 = document.getElementById('client-reconnect-button');
+    l10n.localizeElementFromTag(button2, 'RECONNECT');
+    button2.removeAttribute('autofocus');
+  } else {
+    var button1 = document.getElementById('client-finished-me2me-button');
+    l10n.localizeElementFromTag(button1, 'CANCEL');
+    button1.removeAttribute('autofocus');
+    var button2 = document.getElementById('client-reconnect-button');
+    l10n.localizeElementFromTag(button2, 'OK');
+    button2.setAttribute('autofocus', 'autofocus');
+  }
+}
+
+/**
  * Parse the response from the server to a request to resolve a support id.
  *
  * @param {XMLHttpRequest} xhr The XMLHttpRequest object.
  * @return {void} Nothing.
  */
 function parseServerResponse_(xhr) {
   remoting.supportHostsXhr_ = null;
   console.log('parseServerResponse: xhr = ' + xhr);
   if (xhr.status == 200) {
     var host = /** @type {{data: {jabberId: string, publicKey: string}}} */
@@ skipping 109 matching lines @@
 };
 
 /**
  * Start a connection to the specified host, using the cached details
  * and the PIN entered by the user.
  *
  * @return {void} Nothing.
  */
 remoting.connectMe2MeWithPin = function() {
   console.log('Connecting to host...');
+  setConnectionFailedButtonsText_(false);

[Jamie, 2012/03/21 22:52:13]

This isn't strictly necessary because the HTML has already been localized with
the correct values. I think I'd prefer to rely on that than to pass a Boolean to
setConnectionFailedButtonText.

[simonmorris, 2012/03/22 00:02:42]

Done.

   remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
 
   var host = remoting.hostList.getHostForId(remoting.hostId);
   if (!host) {
     retryConnectOrReportOffline_();
     return;
   }
   remoting.hostJid = host.jabberId;
   remoting.hostPublicKey = host.publicKey;
   document.getElementById('connected-to').innerText = host.hostName;
@@ skipping 20 matching lines @@
             /** @type {string} */ (remoting.oauth2.getCachedEmail()),
             remoting.ClientSession.Mode.ME2ME, onClientStateChange_);
     remoting.clientSession.createPluginAndConnect(
         document.getElementById('session-mode'),
         token);
     remoting.setScaleToFit(remoting.clientSession.getScaleToFit());
   } else {
     showConnectError_(remoting.Error.AUTHENTICATION_FAILED);
   }
 }