Merge pull request #12533 from no-stack-dub-sack/fix/chore-common-cam…

…elCase chore(common): updated common to freeCodeCamp
freeCodeCamp · Jan 15, 2017 · 95abe8a · 95abe8a
2 parents d6c76bd + 3ed485b
commit 95abe8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/common/app/redux/reducer.js b/common/app/redux/reducer.js
@@ -2,7 +2,7 @@ import { handleActions } from 'redux-actions';
 import types from './types';
 
 const initialState = {
-  title: 'Learn To Code | Free Code Camp',
+  title: 'Learn To Code | freeCodeCamp',
   isSignInAttempted: false,
   user: '',
   lang: '',
@@ -16,7 +16,7 @@ export default handleActions(
   {
     [types.updateTitle]: (state, { payload = 'Learn To Code' }) => ({
       ...state,
-      title: payload + ' | Free Code Camp'
+      title: payload + ' | freeCodeCamp'
     }),
 
     [types.updateThisUser]: (state, { payload: user }) => ({

diff --git a/common/app/routes/settings/components/Settings.jsx b/common/app/routes/settings/components/Settings.jsx
@@ -150,7 +150,7 @@ export class Settings extends React.Component {
               className='btn-link-social'
               href={ '/signout' }
               >
-              Sign me out of Free Code Camp
+              Sign me out of freeCodeCamp
             </Button>
             <Button
               block={ true }
@@ -269,7 +269,7 @@ export class Settings extends React.Component {
               className='btn-link-social'
               href='/delete-my-account'
               >
-              Delete my Free Code Camp account
+              Delete my freeCodeCamp account
             </Button>
             <Button
               block={ true }

diff --git a/common/models/user.js b/common/models/user.js
@@ -212,7 +212,7 @@ module.exports = function(User) {
       text: `
         Hello,\n\n
         This email is confirming that you requested to
-        reset your password for your Free Code Camp account.
+        reset your password for your freeCodeCamp account.
         This is your email: ${ info.email }.
         Go to ${ url } to reset your password.
         \n
@@ -441,7 +441,7 @@ module.exports = function(User) {
           type: 'email',
           to: email,
           from: 'Team@freecodecamp.com',
-          subject: 'Welcome to Free Code Camp!',
+          subject: 'Welcome to freeCodeCamp!',
           protocol: isDev ? null : 'https',
           host: isDev ? 'localhost' : 'freecodecamp.com',
           port: isDev ? null : 443,