From 633086cfa3ed96dd22ad74a996192600e3b49697 Mon Sep 17 00:00:00 2001 From: gaba Date: Mon, 15 May 2017 07:11:11 -0700 Subject: [PATCH] Fix a few more strings and translations. --- client/coral-admin/src/actions/auth.js | 2 +- .../src/components/CountdownTimer.js | 2 +- .../coral-admin/src/components/ui/Header.js | 2 +- .../src/containers/Configure/Configure.js | 16 +- .../src/containers/Configure/Domainlist.js | 4 +- .../src/containers/Configure/EmbedLink.js | 2 +- .../Configure/ModerationSettings.js | 12 +- .../containers/Configure/StreamSettings.js | 20 +- .../src/containers/Configure/TechSettings.js | 4 +- .../src/containers/Configure/Wordlist.js | 8 +- .../components/Steps/CreateYourAccount.js | 2 +- .../src/containers/Stories/Stories.js | 2 +- .../src/containers/Streams/Stories.js | 2 +- .../components/CloseCommentsInfo.js | 8 +- .../components/ConfigureCommentStream.js | 14 +- .../src/components/Embed.js | 2 +- .../src/components/IgnoredCommentTombstone.js | 2 +- .../src/components/LoadMore.js | 8 +- .../src/components/NewCount.js | 4 +- client/coral-framework/actions/asset.js | 4 +- client/coral-framework/actions/auth.js | 4 +- client/coral-framework/actions/user.js | 2 +- .../components/RestrictedContent.js | 2 +- .../components/SuspendedAccount.js | 12 +- client/coral-framework/helpers/error.js | 4 +- client/coral-i18n/locales/en.yml | 341 +++++++++++++++--- client/coral-i18n/locales/es.yml | 337 ++++++++++++++--- client/coral-plugin-best/BestButton.js | 2 +- .../CommentCount.js | 2 +- client/coral-plugin-commentbox/CommentBox.js | 10 +- client/coral-plugin-flags/FlagButton.js | 2 +- client/coral-plugin-flags/FlagComment.js | 6 +- .../coral-plugin-moderation/ModerationLink.js | 2 +- .../components/CreateUsernameDialog.js | 10 +- .../containers/ChangeUsernameContainer.js | 4 +- errors.js | 8 +- 36 files changed, 664 insertions(+), 204 deletions(-) diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js index 89b56d4dc..cb7467e1a 100644 --- a/client/coral-admin/src/actions/auth.js +++ b/client/coral-admin/src/actions/auth.js @@ -19,7 +19,7 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => { }) .catch(error => { - if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') { + if (error.translation_key === 'login_maximum_exceeded') { dispatch({type: actions.LOGIN_MAXIMUM_EXCEEDED, message: error.translation_key}); } else { dispatch({type: actions.LOGIN_FAILURE, message: error.translation_key}); diff --git a/client/coral-admin/src/components/CountdownTimer.js b/client/coral-admin/src/components/CountdownTimer.js index 5e15bb03e..07195910d 100644 --- a/client/coral-admin/src/components/CountdownTimer.js +++ b/client/coral-admin/src/components/CountdownTimer.js @@ -73,7 +73,7 @@ class CountdownTimer extends React.Component { className={styles.autoUpdate} onClick={this.dismissNote}> × - {lang.t('dashboard.next-update', this.formatTime())} {lang.t('dashboard.auto-update')} + {lang.t('dashboard.next_update', this.formatTime())} {lang.t('dashboard.auto_update')}

); } diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js index d57b9cbb3..e001fbfa3 100644 --- a/client/coral-admin/src/components/ui/Header.js +++ b/client/coral-admin/src/components/ui/Header.js @@ -55,7 +55,7 @@ const CoralHeader = ({handleLogout, showShortcuts = () => {}, restricted = false showShortcuts(true)}>{lang.t('configure.shortcuts')} - {lang.t('configure.sign-out')} + {lang.t('configure.sign_out')} diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js index 4a2509e57..b7f4eb602 100644 --- a/client/coral-admin/src/containers/Configure/Configure.js +++ b/client/coral-admin/src/containers/Configure/Configure.js @@ -104,11 +104,11 @@ class Configure extends Component { getPageTitle (section) { switch(section) { case 'stream': - return lang.t('configure.stream-settings'); + return lang.t('configure.stream_settings'); case 'moderation': - return lang.t('configure.moderation-settings'); + return lang.t('configure.moderation_settings'); case 'tech': - return lang.t('configure.tech-settings'); + return lang.t('configure.tech_settings'); default: return ''; } @@ -126,13 +126,13 @@ class Configure extends Component {
- {lang.t('configure.stream-settings')} + {lang.t('configure.stream_settings')} - {lang.t('configure.moderation-settings')} + {lang.t('configure.moderation_settings')} - {lang.t('configure.tech-settings')} + {lang.t('configure.tech_settings')}
@@ -145,7 +145,7 @@ class Configure extends Component { icon='check' full > - {lang.t('configure.save-changes')} + {lang.t('configure.save_changes')} : }
diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js index 1723bf66c..719a7f88d 100644 --- a/client/coral-admin/src/containers/Configure/Domainlist.js +++ b/client/coral-admin/src/containers/Configure/Domainlist.js @@ -10,8 +10,8 @@ const Domainlist = ({domains, onChangeDomainlist}) => { return (
-
{lang.t('configure.domain-list-title')}
-

{lang.t('configure.domain-list-text')}

+
{lang.t('configure.domain_list_title')}
+

{lang.t('configure.domain_list_text')}

Embed Comment Stream
-

{lang.t('configure.copy-and-paste')}

+

{lang.t('configure.copy_and_paste')}