wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-20 12:40:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change a few translations that had wrong key.

Browse Source
This commit is contained in:
gaba
2017-05-15 13:44:46 -07:00
parent 0ead2cb610
commit 54e103b55a
8 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-configure/components/ConfigureCommentStream.js
+2 -2
View File
@@ -10,7 +10,7 @@ export default ({handleChange, handleApply, changed, ...props}) => (
<form onSubmit={handleApply}>
<div className={styles.wrapper}>
<div className={styles.container}>
<h3>{lang.t('configureCommentStream.title')}</h3>
<h3>{lang.t('configure.title')}</h3>
<Button
type="submit"
className={styles.apply}
@@ -18,7 +18,7 @@ export default ({handleChange, handleApply, changed, ...props}) => (
cStyle={changed ? 'green' : 'darkGrey'} >
{lang.t('configure.apply')}
</Button>
<p>{lang.t('configureCommentStream.description')}</p>
<p>{lang.t('configure.description')}</p>
</div>
<ul>
<li>
client/coral-embed-stream/src/components/Embed.js
+1 -1
View File
@@ -47,7 +47,7 @@ export default class Embed extends React.Component {
<div className="commentStream">
<TabBar onChange={this.changeTab} activeTab={activeTab}>
<Tab><Count count={totalCommentCount}/></Tab>
<Tab>{lang.t('myProfile')}</Tab>
<Tab>{lang.t('framework.my_profile')}</Tab>
<Tab restricted={!isAdmin}>Configure Stream</Tab>
</TabBar>
{
client/coral-i18n/locales/en.yml
+2 -1
View File
@@ -247,7 +247,8 @@ sign_in:
facebook_sign_in: "Sign in with Facebook"
facebook_sign_up: "Sign up with Facebook"
logout: "Logout"
sign_in: "Sign in to join the conversation"
sign_in: "Sign in"
sign_in_to_join: "Sign in to join the conversation"
or: "Or"
email: "E-mail Address"
password: "Password"
client/coral-i18n/locales/es.yml
+2 -1
View File
@@ -247,7 +247,8 @@ sign_in:
facebook_sign_in: "Acceder con Facebook"
facebook_sign_up: "Registrarse con Facebook"
logout: "Salir"
sign_in: "Entrar para unirte a la conversación"
sign_in: "Entrar"
sign_in_to_join: "Entrar para unirte a la conversación"
or: "O"
email: "Correo"
password: "Contraseña"
client/coral-sign-in/components/ForgotContent.js
+5 -5
View File
@@ -23,11 +23,11 @@ class ForgotContent extends React.Component {
return (
<div>
<div className={styles.header}>
<h1>{lang.t('signIn.recover_password')}</h1>
<h1>{lang.t('sign_in.recover_password')}</h1>
</div>
<form onSubmit={this.handleSubmit}>
<div className={styles.textField}>
<label htmlFor="email">{lang.t('signIn.email')}</label>
<label htmlFor="email">{lang.t('sign_in.email')}</label>
<input
ref={input => this.emailInput = input}
type="text"
@@ -36,7 +36,7 @@ class ForgotContent extends React.Component {
name="email" />
</div>
<Button type="submit" cStyle="black" className={styles.signInButton} full>
{lang.t('signIn.recover_password')}
{lang.t('sign_in.recover_password')}
</Button>
{
passwordRequestSuccess
@@ -50,8 +50,8 @@ class ForgotContent extends React.Component {
}
</form>
<div className={styles.footer}>
<span>{lang.t('signIn.need_an_account')} <a onClick={() => changeView('SIGNUP')}>{lang.t('signIn.register')}</a></span>
<span>{lang.t('signIn.already_have_an_account')} <a onClick={() => changeView('SIGNIN')}>{lang.t('signIn.signIn')}</a></span>
<span>{lang.t('sign_in.need_an_account')} <a onClick={() => changeView('SIGNUP')}>{lang.t('sign_in.register')}</a></span>
<span>{lang.t('sign_in.already_have_an_account')} <a onClick={() => changeView('SIGNIN')}>{lang.t('sign_in.sign_in')}</a></span>
</div>
</div>
);
client/coral-sign-in/components/SignInContent.js
+11 -11
View File
@@ -23,18 +23,18 @@ const SignInContent = ({
<div className="coral-sign-in">
<div className={`${styles.header} header`}>
<h1>
{auth.emailVerificationFailure ? lang.t('signIn.email_verify_cta') : lang.t('signIn.signIn')}
{auth.emailVerificationFailure ? lang.t('sign_in.email_verify_cta') : lang.t('sign_in.sign_in_to_join')}
</h1>
</div>
{ auth.error && <Alert>{auth.error}</Alert> }
{
auth.emailVerificationFailure
? <form onSubmit={handleResendVerification}>
<p>{lang.t('signIn.request_new_verify_email')}</p>
<p>{lang.t('sign_in.request_new_verify_email')}</p>
<TextField
id="confirm-email"
type="email"
label={lang.t('signIn.email')}
label={lang.t('sign_in.email')}
value={emailToBeResent}
onChange={handleChangeEmail} />
<Button id='resendConfirmEmail' type='submit' cStyle='black' full>Send Email</Button>
@@ -44,19 +44,19 @@ const SignInContent = ({
: <div>
<div className={`${styles.socialConnections} social-connections`}>
<Button cStyle="facebook" onClick={fetchSignInFacebook} full>
{lang.t('signIn.facebook_sign_in')}
{lang.t('sign_in.facebook_sign_in')}
</Button>
</div>
<div className={styles.separator}>
<h1>
{lang.t('signIn.or')}
{lang.t('sign_in.or')}
</h1>
</div>
<form onSubmit={handleSignIn}>
<TextField
id="email"
type="email"
label={lang.t('signIn.email')}
label={lang.t('sign_in.email')}
value={formData.email}
style={{fontSize: 16}}
onChange={handleChange}
@@ -64,7 +64,7 @@ const SignInContent = ({
<TextField
id="password"
type="password"
label={lang.t('signIn.password')}
label={lang.t('sign_in.password')}
value={formData.password}
style={{fontSize: 16}}
onChange={handleChange}
@@ -73,7 +73,7 @@ const SignInContent = ({
{
!auth.isLoading ?
<Button id='coralLogInButton' type="submit" cStyle="black" className={styles.signInButton} full>
{lang.t('signIn.signIn')}
{lang.t('sign_in.sign_in')}
</Button>
:
<Spinner />
@@ -83,11 +83,11 @@ const SignInContent = ({
</div>
}
<div className={`${styles.footer} footer`}>
<span><a onClick={() => changeView('FORGOT')}>{lang.t('signIn.forgot_your_pass')}</a></span>
<span><a onClick={() => changeView('FORGOT')}>{lang.t('sign_in.forgot_your_pass')}</a></span>
<span>
{lang.t('signIn.need_an_account')}
{lang.t('sign_in.need_an_account')}
<a onClick={() => changeView('SIGNUP')} id='coralRegister'>
{lang.t('signIn.register')}
{lang.t('sign_in.register')}
</a>
</span>
</div>
client/coral-sign-in/components/SignUpContent.js
+11 -11
View File
@@ -60,7 +60,7 @@ class SignUpContent extends React.Component {
<div>
<div className={styles.header}>
<h1>
{lang.t('signIn.sign_up')}
{lang.t('sign_in.sign_up')}
</h1>
</div>
@@ -69,19 +69,19 @@ class SignUpContent extends React.Component {
<div>
<div className={styles.socialConnections}>
<Button cStyle="facebook" onClick={fetchSignUpFacebook} full>
{lang.t('signIn.facebook_sign_up')}
{lang.t('sign_in.facebook_sign_up')}
</Button>
</div>
<div className={styles.separator}>
<h1>
{lang.t('signIn.or')}
{lang.t('sign_in.or')}
</h1>
</div>
<form onSubmit={handleSignUp}>
<TextField
id="email"
type="email"
label={lang.t('signIn.email')}
label={lang.t('sign_in.email')}
value={formData.email}
style={{fontSize: 16}}
showErrors={showErrors}
@@ -91,7 +91,7 @@ class SignUpContent extends React.Component {
<TextField
id="username"
type="text"
label={lang.t('signIn.username')}
label={lang.t('sign_in.username')}
value={formData.username}
showErrors={showErrors}
style={{fontSize: 16}}
@@ -101,7 +101,7 @@ class SignUpContent extends React.Component {
<TextField
id="password"
type="password"
label={lang.t('signIn.password')}
label={lang.t('sign_in.password')}
value={formData.password}
showErrors={showErrors}
style={{fontSize: 16}}
@@ -113,7 +113,7 @@ class SignUpContent extends React.Component {
<TextField
id="confirmPassword"
type="password"
label={lang.t('signIn.confirm_password')}
label={lang.t('sign_in.confirm_password')}
value={formData.confirmPassword}
style={{fontSize: 16}}
showErrors={showErrors}
@@ -123,7 +123,7 @@ class SignUpContent extends React.Component {
/>
<div className={styles.action}>
<Button type="submit" cStyle="black" id='coralSignUpButton' className={styles.signInButton} full>
{lang.t('signIn.sign_up')}
{lang.t('sign_in.sign_up')}
</Button>
{ auth.isLoading && <Spinner /> }
</div>
@@ -136,13 +136,13 @@ class SignUpContent extends React.Component {
<Success />
{
emailVerificationEnabled &&
<p>{lang.t('signIn.verify_email')}<br /><br />{lang.t('signIn.verify_email2')}</p>
<p>{lang.t('sign_in.verify_email')}<br /><br />{lang.t('sign_in.verify_email2')}</p>
}
</div>
}
<div className={styles.footer}>
{lang.t('signIn.already_have_an_account')} <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
{lang.t('signIn.signIn')}
{lang.t('sign_in.already_have_an_account')} <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
{lang.t('sign_in.sign_in')}
</a>
</div>
</div>
client/coral-sign-in/containers/SignInContainer.js
+4 -4
View File
@@ -59,7 +59,7 @@ class SignInContainer extends Component {
window.authCallback = this.props.facebookCallback;
const {formData} = this.state;
const errors = Object.keys(formData).reduce((map, prop) => {
map[prop] = lang.t('signIn.required_field');
map[prop] = lang.t('sign_in.required_field');
return map;
}, {});
this.setState({errors});
@@ -109,9 +109,9 @@ class SignInContainer extends Component {
const {formData} = this.state;
if (!value.length) {
addError(name, lang.t('signIn.required_field'));
addError(name, lang.t('sign_in.required_field'));
} else if (name === 'confirmPassword' && formData.confirmPassword !== formData.password) {
addError('confirmPassword', lang.t('signIn.passwords_dont_match'));
addError('confirmPassword', lang.t('sign_in.passwords_dont_match'));
} else if (!validate[name](value)) {
addError(name, errorMsj[name]);
} else {
@@ -139,7 +139,7 @@ class SignInContainer extends Component {
fetchSignUp(this.state.formData, pym.parentUrl || location.href);
validForm();
} else {
invalidForm(lang.t('signIn.check_the_form'));
invalidForm(lang.t('sign_in.check_the_form'));
}
}