[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;
+      setConnectionInterruptedButtonsText_();
       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 so that they are
+ * easy to understand in the case where a successful connection failed, as
+ * opposed to the case where a connection never succeeded.
+ */
+function setConnectionInterruptedButtonsText_() {
+  var button1 = document.getElementById('client-reconnect-button');
+  l10n.localizeElementFromTag(button1, 'RECONNECT');

[Jamie, 2012/03/22 04:24:05]

Please add /*i18n-content*/ to this so that the script will pick it up correctly
(you might also need to modify remoting.gyp to make sure that this file is
included in the checked set. The script is not very smart about spacing--look
elsewhere in JS files to see what it expects.

[simonmorris, 2012/03/22 17:08:25]

Done.

+  button1.removeAttribute('autofocus');
+  var button2 = document.getElementById('client-finished-me2me-button');
+  l10n.localizeElementFromTag(button2, 'OK');

[Jamie, 2012/03/22 04:24:05]

Ditto

[simonmorris, 2012/03/22 17:08:25]

Done.

+  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 149 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);
   }
 }