Correct keys and translations

client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js

@@ -8,18 +8,18 @@ const AddOrganizationName = (props) => {
   const {handleSettingsChange, handleSettingsSubmit, install} = props;
   return (
     <div className={styles.step}>
-      <p>{t('ADD_ORGANIZATION.DESCRIPTION')}</p>
+      <p>{t('install.add_organization.description')}</p>
       <div className={styles.form}>
         <form onSubmit={handleSettingsSubmit}>
           <TextField
             className={styles.TextField}
             id="organizationName"
             type="text"
-            label={t('ADD_ORGANIZATION.LABEL')}
+            label={t('install.add_organization.label')}
             onChange={handleSettingsChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName} />
-          <Button type="submit" cStyle='black' full>{t('ADD_ORGANIZATION.SAVE')}</Button>
+          <Button type="submit" cStyle='black' full>{t('install.add_organization.save')}</Button>
         </form>
       </div>
     </div>

client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js

@@ -14,7 +14,7 @@ const InitialStep = (props) => {
             className={styles.textField}
             id="email"
             type="email"
-            label={t('CREATE.EMAIL')}
+            label={t('install.create.email')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.email}
@@ -25,7 +25,7 @@ const InitialStep = (props) => {
             className={styles.textField}
             id="username"
             type="text"
-            label={t('CREATE.USERNAME')}
+            label={t('install.create.username')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.username}
@@ -35,7 +35,7 @@ const InitialStep = (props) => {
             className={styles.textField}
             id="password"
             type="password"
-            label={t('CREATE.PASSWORD')}
+            label={t('install.create.password')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.password}
@@ -45,7 +45,7 @@ const InitialStep = (props) => {
             className={styles.textField}
             id="confirmPassword"
             type="password"
-            label={t('CREATE.CONFIRM_PASSWORD')}
+            label={t('install.create.confirm_password')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.confirm_password}
@@ -53,7 +53,7 @@ const InitialStep = (props) => {
 
           {
             !props.install.isLoading ?
-            <Button cStyle='black' type="submit" full>{t('CREATE.SAVE')}</Button>
+            <Button cStyle='black' type="submit" full>{t('install.create.save')}</Button>
             :
             <Spinner />
           }

client/coral-admin/src/containers/Install/components/Steps/FinalStep.js

@@ -8,9 +8,9 @@ import t from 'coral-framework/services/i18n';
 const InitialStep = () => {
   return (
     <div className={`${styles.step} ${styles.finalStep}`}>
-      <p>{t('FINAL.DESCRIPTION')}</p>
-      <Button raised><Link to='/admin'>{t('FINAL.LAUNCH')}</Link></Button>
-      <Button cStyle='black' raised><a href="http://coralproject.net">{t('FINAL.CLOSE')}</a></Button>
+      <p>{t('install.final.description')}</p>
+      <Button raised><Link to='/admin'>{t('install.final.launch')}</Link></Button>
+      <Button cStyle='black' raised><a href="http://coralproject.net">{t('install.final.close')}</a></Button>
     </div>
   );
 };

client/coral-admin/src/containers/Install/components/Steps/InitialStep.js

@@ -8,8 +8,8 @@ const InitialStep = (props) => {
   const {nextStep} = props;
   return (
     <div className={styles.step}>
-      <p>{t('INITIAL.DESCRIPTION')}</p>
-      <Button cStyle='green' onClick={nextStep} raised>{t('INITIAL.SUBMIT')}</Button>
+      <p>{t('install.initial.description')}</p>
+      <Button cStyle='green' onClick={nextStep} raised>{t('install.initial.submit')}</Button>
     </div>
   );
 };

client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js

@@ -10,9 +10,9 @@ const PermittedDomainsStep = (props) => {
   const domains = install.data.settings.domains.whitelist;
   return (
     <div className={styles.step}>
-      <h3>{t('PERMITTED_DOMAINS.TITLE')}</h3>
+      <h3>{t('install.permitted_domains.title')}</h3>
       <Card className={styles.card}>
-        <p>{t('PERMITTED_DOMAINS.DESCRIPTION')}</p>
+        <p>{t('install.permitted_domains.description')}</p>
         <TagsInput
           value={domains}
           inputProps={{placeholder: 'URL'}}
@@ -21,7 +21,7 @@ const PermittedDomainsStep = (props) => {
           onChange={(tags) => handleDomainsChange(tags)}
         />
       </Card>
-      <Button cStyle='green' onClick={finishInstall} raised>{t('PERMITTED_DOMAINS.SUBMIT')}</Button>
+      <Button cStyle='green' onClick={finishInstall} raised>{t('install.permitted_domains.submit')}</Button>
     </div>
   );
 };

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

@@ -33,7 +33,7 @@ class LoadMore extends React.Component {
     }
 
     if (this.initialState) {
-      return t('framework.view_all_repliesInitial', count);
+      return t('framework.view_all_replies_initial', count);
     } else {
       return t('framework.view_all_replies', count);
     }

locales/en.yml

@@ -119,7 +119,7 @@ en:
     sign_out: "Sign Out"
     stories: Stories
     stream_settings: "Stream Settings"
-    suspect_word_title: "Suspect wåords list"
+    suspect_word_title: "Suspect words list"
     suspect_word_text: "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list."
     tech_settings: "Tech Settings"
     title: "Configure Comment Stream"
@@ -202,14 +202,14 @@ en:
     ignored_users: "Ignored users"
     my_comments: "My Comments"
     my_profile: "My profile"
-    new_count: "View 0 new 1"
+    new_count: "View {0} new {1}"
     profile: Profile
     show_all_comments: "Show all comments"
     success_bio_update: "Your biography has been updated"
     success_name_update: "Your username has been updated"
     success_update_settings: "The changes you have made have been applied to the comment stream on this article"
-    view_all_replies: "view 0 replies"
-    view_all_replies_initial: "view all 0 replies"
+    view_all_replies: "view {0} replies"
+    view_all_replies_initial: "view all {0} replies"
     view_more_comments: "view more comments"
     view_reply: "view reply"
   from_settings_page: "From the Profile Page you can see your comment history."
@@ -372,24 +372,24 @@ en:
   username_offensive: "This username is offensive"
   view_conversation: "View Conversation"
   install:
-    INITIAL:
-      DESCRIPTION: "Let's set up your Talk community in just a few short steps."
-      SUBMIT: "Get Started"
-    ADD_ORGANIZATION:
-      DESCRIPTION: "Please tell us the name of your organization. This will appear in emails when inviting new team members."
-      LABEL: "Organization Name"
-      SAVE: "Save"
-    CREATE:
-      EMAIL: "Email address"
-      USERNAME: "Username"
-      PASSWORD: "Password"
-      CONFIRM_PASSWORD: "Confirm Password"
-      SAVE: "Save"
-    PERMITTED_DOMAINS:
-      TITLE: "Permitted domains"
-      DESCRIPTION: "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)."
-      SUBMIT: "Finish install"
-    FINAL:
-      DESCRIPTION: "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now."
-      LAUNCH: "Launch Talk"
-      CLOSE: "Close this Installer"
+    initial:
+      description: "Let's set up your Talk community in just a few short steps."
+      submit: "Get Started"
+    add_organization:
+      description: "Please tell us the name of your organization. This will appear in emails when inviting new team members."
+      label: "Organization Name"
+      save: "Save"
+    create:
+      email: "Email address"
+      username: "Username"
+      password: "Password"
+      confirm_password: "Confirm Password"
+      save: "Save"
+    permitted_domains:
+      title: "Permitted domains"
+      description: "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)."
+      submit: "Finish install"
+    final:
+      description: "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now."
+      launch: "Launch Talk"
+      close: "Close this Installer"

locales/es.yml

@@ -244,14 +244,14 @@ es:
     ignored_users: "Usuarios ignorados"
     my_comments: "Mis Comentarios"
     my_profile: "Mi perfil"
-    new_count: "Ver 0 1 nuevo"
+    new_count: "Ver {0} {1} nuevo"
     profile: Perfil
     show_all_comments: "Mostrar todos los comentarios"
     success_bio_update: "Tu biografia fue actualizada"
     success_name_update: "Tu nombre de usuario ha sido actualizado"
     success_update_settings: "La configuración de este articulo fue actualizada"
-    view_all_replies: "ver 0 respuestas"
-    view_all_replies_initial: "ver todas las 0 respuestas"
+    view_all_replies: "ver {0} respuestas"
+    view_all_replies_initial: "ver todas las {0} respuestas"
     view_more_comments: "Ver más comentarios"
     view_reply: "ver respuesta"
   from_settings_page: "Desde la página de configuración puedes ver tu historia de\
@@ -437,29 +437,29 @@ es:
   username_offensive: "Este nombre de usuario es ofensivo"
   view_conversation: "Ver Conversación"
   install:
-    INITIAL:
-      DESCRIPTION: "Vamos a crear su comunidad Talk en unos pocos pasos."
-      SUBMIT: "Empecemos"
-    ADD_ORGANIZATION:
-      DESCRIPTION: "Por favor díganos el nombre de su organización. Esta aparecerá\
+    initial:
+      description: "Vamos a crear su comunidad Talk en unos pocos pasos."
+      submit: "Empecemos"
+    add_organization:
+      description: "Por favor díganos el nombre de su organización. Esta aparecerá\
         \ en correos cuando se inviten a nuevos miembros del equipo."
-      LABEL: "Nombre de la Organización"
-      SAVE: "Guardar"
-    CREATE:
-      EMAIL: "Dirección de correo"
-      USERNAME: "Nombre de Usuario"
-      PASSWORD: "Contraseña"
-      CONFIRM_PASSWORD: "Confirmar Contraseña"
-      SAVE: "Guardar"
-    PERMITTED_DOMAINS:
-      TITLE: "Dominios permitidos"
-      DESCRIPTION: "Ingresar los dominios en donde estará Talk, por ejemplo sus ambientes\
+      label: "Nombre de la Organización"
+      save: "Guardar"
+    create:
+      email: "Dirección de correo"
+      username: "Nombre de Usuario"
+      password: "Contraseña"
+      confirm_password: "Confirmar Contraseña"
+      save: "Guardar"
+    permitted_domains:
+      title: "Dominios permitidos"
+      description: "Ingresar los dominios en donde estará Talk, por ejemplo sus ambientes\
         \ locales, de staging y producción (ej. localhost:3000, staging.domain.com,\
         \ domain.com)."
-      SUBMIT: "Terminar la Instalación"
-    FINAL:
-      DESCRIPTION: "¡Gracias por instalar Talk! Enviamos un correo para verificar\
+      submit: "Terminar la Instalación"
+    final:
+      description: "¡Gracias por instalar Talk! Enviamos un correo para verificar\
         \ su dirección de correo. Mientras esta terminando de configurar su cuenta,\
         \ ya puede comenzar a involucrarse con sus lectores."
-      LAUNCH: "Iniciar Talk"
-      CLOSE: "Cerrar este instalador"
+      launch: "Iniciar Talk"
+      close: "Cerrar este instalador"