i18n support for PR #78. The main error checking happens when we call…

… Accounts.createUser since that’s where errors are most likely to happen. Error from Meteor.loginWithPassword is very unlikely since we’re logging them in with the account they just created.
Differential · Feb 11, 2014 · 0fb75a4 · 0fb75a4 · softwarerero · Feb 14, 2014
1 parent 6fba28d
commit 0fb75a4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/client/i18n/english.coffee b/client/i18n/english.coffee
@@ -35,6 +35,9 @@ en =
     emailRequired: "Email is required"
     signupCodeRequired: "Signup code is required"
     signupCodeIncorrect: "Signup code is incorrect"
+    userValidationFailed: "User validation failed"
+    emailAlreadyExists: "Email already exists."
+    usernameAlreadyExists: "Username already exists."
     unknown: "Unknown error"
 
 i18n.map "en", en
diff --git a/client/i18n/german.coffee b/client/i18n/german.coffee
@@ -36,6 +36,9 @@ de =
     emailRequired: "E-Mail benötigt"
     signupCodeRequired: "Registrierungscode benötigt"
     signupCodeIncorrect: "Registrierungscode ungültig"
+    userValidationFailed: "[DE] User validation failed"
+    emailAlreadyExists: "[DE] Email already exists."
+    usernameAlreadyExists: "[DE] Username already exists."
     unknown: "Unbekannter Fehler"
 
 i18n.map "de", de
diff --git a/client/i18n/spanish.coffee b/client/i18n/spanish.coffee
@@ -34,6 +34,9 @@ es =
     emailRequired: "Email es necesario"
     signupCodeRequired: "Código para suscribir es necesario"
     signupCodeIncorrect: "Código para suscribir no coincide"
+    userValidationFailed: "[SP] User validation failed"
+    emailAlreadyExists: "[SP] Email already exists."
+    usernameAlreadyExists: "[SP] Username already exists."
     unknown: "Error desconocido"
 
 i18n.map "es", es
diff --git a/client/views/signUp/signUp.coffee b/client/views/signUp/signUp.coffee
@@ -1,3 +1,9 @@
+signUpErrorMap = {
+  'User validation failed': 'error.userValidationFailed',
+  'Email already exists.': 'error.emailAlreadyExists',
+  'Username already exists.': 'error.usernameAlreadyExists'
+}
+
 Template.entrySignUp.helpers
   showEmail: ->
     fields = AccountsEntry.settings.passwordSignupFields
@@ -121,22 +127,24 @@ Template.entrySignUp.events
           data.username = username
         Accounts.createUser newUserData, (err, data) ->
           if err
-            Session.set('entryError', err.reason)
+            errorMsg = signUpErrorMap[err.reason]
+            errorMsg = 'error.unknown' if errorMsg is undefined
+            Session.set('entryError', i18n(errorMsg))
             return
           #login on client
           if  _.contains([
             'USERNAME_AND_EMAIL',
             'EMAIL_ONLY'], AccountsEntry.settings.passwordSignupFields)
             Meteor.loginWithPassword(email, password, (error) ->
               if error
-                Session.set('entryError', error.reason)
+                Session.set('entryError', i18n("error.unknown"))
               else
                 Router.go AccountsEntry.settings.dashboardRoute
             )
           else
             Meteor.loginWithPassword(username, password, (error) ->
               if error
-                Session.set('entryError', error.reason)
+                Session.set('entryError', i18n("error.unknown"))
               else
                 Router.go AccountsEntry.settings.dashboardRoute
             )