Merge branch 'i18n-refactor' into i18n-emails

client/coral-embed-stream/src/components/CountdownSeconds.js

@@ -36,7 +36,7 @@ export class CountdownSeconds extends React.Component {
     const secRemaining = msRemaining / 1000;
     const wholeSecRemaining = Math.floor(secRemaining);
     const plural = secRemaining !== 1;
-    const units = t(plural ? 'editComment.secondsPlural' : 'editComment.second');
+    const units = t(plural ? 'edit_comment.secondsPlural' : 'edit_comment.second');
     let classFromProp;
     if (typeof classNameForMsRemaining === 'function') {
       classFromProp = classNameForMsRemaining(msRemaining);

client/coral-embed-stream/src/components/NewCount.js

@@ -21,8 +21,8 @@ const NewCount = (props) => {
       props.commentCountCache && newComments > 0 ?
       <button onClick={onLoadMoreClick(props)}>
         {newComments === 1
-          ? t('framework.new_count', newComments, t('comment'))
-          : t('framework.new_count', newComments, t('comments'))}
+          ? t('framework.new_count', newComments, t('framework.comment'))
+          : t('framework.new_count', newComments, t('framework.comments'))}
       </button>
       : null
     }

client/coral-embed-stream/src/components/Stream.js

@@ -80,7 +80,7 @@ class Stream extends React.Component {
               {!banned && temporarilySuspended &&
                 <RestrictedMessageBox>
                   {
-                    t('sign_in.temporaly_suspended',
+                    t('sign_in.temporarily_suspended',
                       this.props.root.settings.organizationName,
                       timeago(user.suspension.until),
                     )

client/coral-settings/containers/ProfileContainer.js

@@ -61,7 +61,7 @@ class ProfileContainer extends Component {
 
         {me.ignoredUsers && me.ignoredUsers.length
           ? <div>
-              <h3>t('framework.ignored_users')</h3>
+              <h3>{t('framework.ignored_users')}</h3>
               <IgnoredUsers
                 users={me.ignoredUsers}
                 stopIgnoring={stopIgnoringUser}

locales/en.yml

@@ -150,7 +150,7 @@ en:
     no_flags: "There have been no flags in the last 5 minutes! Hooray!"
     no_likes: "There have been no likes in the last 5 minutes. All quiet."
   done: Done
-  editComment:
+  edit_comment:
     bodyInputLabel: "Edit this comment"
     save_button: "Save changes"
     editWindowExpired: "You can no longer edit this comment. The time window to do so has expired. Why not post another one?"

locales/es.yml

@@ -184,7 +184,7 @@ es:
     no_flags: "¡No ha habido ningún reporte en los últimos 5 minutos! Bravo!"
     no_likes: "¡No ha habido ningún 'me gusta' en los últimos 5 minutos. Todo tranquilo."
   done: Hecho
-  editComment:
+  edit_comment:
     bodyInputLabel: "Editar este comentario"
     save_button: "Guardar cambios"
     editWindowExpired: "No se puede editar este comentario. El periodo de edición\