Bug 642969 - "I have lost my other device" link doesn't do anything at all, unless you've typed username and password. r=philikon

browser/base/content/syncSetup.js

@@ -92,9 +92,9 @@ var gSyncSetup = {
   init: function () {
     let obs = [
       ["weave:service:changepph:finish", "onResetPassphrase"],
-      ["weave:service:verify-login:start",  "onLoginStart"],
-      ["weave:service:verify-login:error",  "onLoginEnd"],
-      ["weave:service:verify-login:finish", "onLoginEnd"]];
+      ["weave:service:login:start",  "onLoginStart"],
+      ["weave:service:login:error",  "onLoginEnd"],
+      ["weave:service:login:finish", "onLoginEnd"]];
 
     // Add the observers now and remove them on unload
     let self = this;
@@ -216,6 +216,8 @@ var gSyncSetup = {
         feedback = server;
         break;
       case Weave.LOGIN_FAILED_LOGIN_REJECTED:
+      case Weave.LOGIN_FAILED_NO_USERNAME:
+      case Weave.LOGIN_FAILED_NO_PASSWORD:
         feedback = password;
         break;
       case Weave.LOGIN_FAILED_INVALID_PASSPHRASE:

services/sync/locales/en-US/errors.properties

@@ -1,9 +1,10 @@
-error.login.reason.network    = Failed to connect to the server
-error.login.reason.synckey    = Wrong Sync Key
-error.login.reason.account    = Incorrect account name or password
-error.login.reason.no_password= No saved password to use
-error.login.reason.no_synckey = No saved Sync Key to use
-error.login.reason.server     = Server incorrectly configured
+error.login.reason.network      = Failed to connect to the server
+error.login.reason.synckey      = Wrong Sync Key
+error.login.reason.account      = Incorrect account name or password
+error.login.reason.no_username  = Missing account name
+error.login.reason.no_password2 = Missing password
+error.login.reason.no_synckey   = No saved Sync Key to use
+error.login.reason.server       = Server incorrectly configured
 
 error.sync.failed_partial     = One or more data types could not be synced
 

services/sync/modules/constants.js

@@ -149,7 +149,7 @@ ENGINE_SUCCEEDED:                      "success.engine",
 
 // login failure status codes:
 LOGIN_FAILED_NO_USERNAME:              "error.login.reason.no_username",
-LOGIN_FAILED_NO_PASSWORD:              "error.login.reason.no_password",
+LOGIN_FAILED_NO_PASSWORD:              "error.login.reason.no_password2",
 LOGIN_FAILED_NO_PASSPHRASE:            "error.login.reason.no_synckey",
 LOGIN_FAILED_NETWORK_ERROR:            "error.login.reason.network",
 LOGIN_FAILED_SERVER_ERROR:             "error.login.reason.server",