fix: naming scheme for messages in translation files (#40642)

Co-authored-by: Nicholas Carrigan (he/him) <nhcarrigan@gmail.com>

api-server/server/boot/authentication.js

@@ -180,10 +180,7 @@ function createGetPasswordlessAuth(app) {
         // update user and log them in
         .map(user => user.loginByRequest(req, res))
         .do(() => {
-          req.flash(
-            'success',
-            'Success! You have signed in to your account. Happy Coding!'
-          );
+          req.flash('success', 'flash.signin-success');
           return res.redirectWithFlash(`${origin}/learn`);
         })
         .subscribe(() => {}, next)

api-server/server/boot/certificate.js

@@ -283,7 +283,7 @@ function createVerifyCert(certTypeIds, app) {
         if (user[certType]) {
           return Observable.just({
             type: 'info',
-            message: 'flash.msg-27',
+            message: 'flash.already-claimed',
             variables: { name: certName }
           });
         }
@@ -294,7 +294,7 @@ function createVerifyCert(certTypeIds, app) {
           reportError(`Error claiming ${certName}`);
           return Observable.just({
             type: 'danger',
-            message: 'flash.msg-29',
+            message: 'flash.wrong-name',
             variables: { name: certName }
           });
         }
@@ -303,7 +303,7 @@ function createVerifyCert(certTypeIds, app) {
         if (!canClaim(tests, user.completedChallenges)) {
           return Observable.just({
             type: 'info',
-            message: 'flash.msg-26',
+            message: 'flash.incomplete-steps',
             variables: { name: certName }
           });
         }
@@ -323,7 +323,7 @@ function createVerifyCert(certTypeIds, app) {
         if (!user.name) {
           return Observable.just({
             type: 'info',
-            message: 'flash.msg-25'
+            message: 'flash.name-needed'
           });
         }
         // set here so sendCertifiedEmail works properly
@@ -351,7 +351,7 @@ function createVerifyCert(certTypeIds, app) {
           log('Certificates updated');
           return {
             type: 'success',
-            message: 'flash.msg-28',
+            message: 'flash.cert-claim-success',
             variables: {
               username: user.username,
               name: certName
@@ -417,7 +417,7 @@ function createShowCert(app) {
           messages: [
             {
               type: 'info',
-              message: 'flash.msg-31',
+              message: 'flash.username-not-found',
               variables: { username: username }
             }
           ]
@@ -430,7 +430,7 @@ function createShowCert(app) {
           messages: [
             {
               type: 'info',
-              message: 'flash.msg-32'
+              message: 'flash.add-name'
             }
           ]
         });
@@ -441,7 +441,7 @@ function createShowCert(app) {
           messages: [
             {
               type: 'info',
-              message: 'flash.msg-33'
+              message: 'flash.not-eligible'
             }
           ]
         });
@@ -452,7 +452,7 @@ function createShowCert(app) {
           messages: [
             {
               type: 'info',
-              message: 'flash.msg-34',
+              message: 'flash.profile-private',
               variables: { username: username }
             }
           ]
@@ -464,7 +464,7 @@ function createShowCert(app) {
           messages: [
             {
               type: 'info',
-              message: 'flash.msg-35',
+              message: 'flash.certs-private',
               variables: { username: username }
             }
           ]
@@ -476,7 +476,7 @@ function createShowCert(app) {
           messages: [
             {
               type: 'info',
-              message: 'flash.msg-36',
+              message: 'flash.not-honest',
               variables: { username: username }
             }
           ]
@@ -524,7 +524,7 @@ function createShowCert(app) {
         messages: [
           {
             type: 'info',
-            message: 'flash.msg-37',
+            message: 'flash.user-not-certified',
             variables: { username: username, cert: certText[certType] }
           }
         ]

api-server/server/boot/settings.js

@@ -53,12 +53,12 @@ export default function settingsController(app) {
 
 const standardErrorMessage = {
   type: 'danger',
-  message: 'flash.msg-9'
+  message: 'flash.wrong-updating'
 };
 
 const standardSuccessMessage = {
   type: 'success',
-  message: 'flash.msg-10'
+  message: 'flash.updated-preferences'
 };
 
 const createStandardHandler = (req, res, next) => err => {
@@ -195,7 +195,7 @@ function createUpdateMyUsername(app) {
     if (username === user.username) {
       return res.json({
         type: 'info',
-        message: 'flash.msg-16'
+        message: 'flash.username-used'
       });
     }
     const validation = isValidUsername(username);
@@ -212,7 +212,7 @@ function createUpdateMyUsername(app) {
     if (exists) {
       return res.json({
         type: 'info',
-        message: 'flash.msg-17'
+        message: 'flash.username-taken'
       });
     }
 
@@ -224,7 +224,7 @@ function createUpdateMyUsername(app) {
 
       return res.status(200).json({
         type: 'success',
-        message: `flash.msg-18`,
+        message: `flash.username-updated`,
         variables: { username: username }
       });
     });

api-server/server/boot/user.js

@@ -216,7 +216,7 @@ function createPostReportUserProfile(app) {
     if (!username || !report || report === '') {
       return res.json({
         type: 'danger',
-        message: 'flash.msg-44'
+        message: 'flash.provide-username'
       });
     }
     return Email.send$(
@@ -247,7 +247,7 @@ function createPostReportUserProfile(app) {
 
         return res.json({
           type: 'info',
-          message: 'flash.msg-45',
+          message: 'flash.report-sent',
           variables: { email: user.email }
         });
       }

api-server/server/component-passport.js

@@ -118,12 +118,7 @@ export const createPassportCallbackAuthenticator = (strategy, config) => (
       const { provider } = config;
       if (accessToken && accessToken.id) {
         if (provider === 'auth0') {
-          req.flash(
-            'success',
-            dedent`
-              Success! You have signed in to your account. Happy Coding!
-            `
-          );
+          req.flash('success', 'flash.signin-success');
         } else if (user.email) {
           req.flash(
             'info',