github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 01:36:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #577 from dcsjapan/leftover-string-extraction

Browse Source 
Extract leftover core strings
This commit is contained in:
Toby Zerner 2015-10-14 14:48:02 +10:30
commit 68a7886cec
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/forum/src/components/DiscussionList.js
View File

@ -53,7 +53,7 @@ export default class DiscussionList extends Component {
} }
if (this.discussions.length === 0 && !this.loading) { if (this.discussions.length === 0 && !this.loading) {
const text = 'Looks like there are no discussions here. Why don\'t you create a new one?'; const text = app.trans('core.forum.discussion_list_empty_text');
return ( return (
<div className="DiscussionList"> <div className="DiscussionList">
{Placeholder.component({text})} {Placeholder.component({text})}

3
js/forum/src/components/LogInModal.js
View File

@ -78,8 +78,7 @@ export default class LogInModal extends Modal {
{app.forum.attribute('allowSignUp') ? ( {app.forum.attribute('allowSignUp') ? (
<p className="LogInModal-signUp"> <p className="LogInModal-signUp">
{app.trans('core.forum.log_in_no_account_text')} {app.trans('core.forum.log_in_sign_up_text', {a: <a onclick={this.signUp.bind(this)}/>})}
<a onclick={this.signUp.bind(this)}>{app.trans('core.forum.log_in_sign_up_link')}</a>
</p> </p>
) : ''} ) : ''}
</div> </div>

3
js/forum/src/components/SignUpModal.js
View File

@ -140,8 +140,7 @@ export default class SignUpModal extends Modal {
footer() { footer() {
return [ return [
<p className="SignUpModal-logIn"> <p className="SignUpModal-logIn">
{app.trans('core.forum.sign_up_already_have_account_text')} {app.trans('core.forum.sign_up_log_in_text', {a: <a onclick={this.logIn.bind(this)}/>})}
<a onclick={this.logIn.bind(this)}>{app.trans('core.forum.sign_up_log_in_link')}</a>
</p> </p>
]; ];
} }

2
js/forum/src/utils/UserControls.js
View File

@ -95,7 +95,7 @@ export default {
* Delete the user. * Delete the user.
*/ */
deleteAction() { deleteAction() {
if (confirm('Are you sure you want to delete this user? All of the user\'s posts will be deleted.')) { if (confirm(app.trans('core.forum.user_controls_delete_confirmation'))) {
this.delete().then(() => { this.delete().then(() => {
if (app.current instanceof UserPage && app.current.user === this) { if (app.current instanceof UserPage && app.current.user === this) {
app.history.back(); app.history.back();