diff --git a/js/forum/src/components/DiscussionComposer.js b/js/forum/src/components/DiscussionComposer.js index e0dd08808..eab961ea4 100644 --- a/js/forum/src/components/DiscussionComposer.js +++ b/js/forum/src/components/DiscussionComposer.js @@ -1,4 +1,5 @@ import ComposerBody from 'flarum/components/ComposerBody'; +import extractText from 'flarum/utils/extractText'; /** * The `DiscussionComposer` component displays the composer content for starting @@ -26,10 +27,10 @@ export default class DiscussionComposer extends ComposerBody { static initProps(props) { super.initProps(props); - props.placeholder = props.placeholder || app.trans('core.composer_discussion_body_placeholder'); + props.placeholder = props.placeholder || extractText(app.trans('core.composer_discussion_body_placeholder')); props.submitLabel = props.submitLabel || app.trans('core.composer_discussion_submit_button'); - props.confirmExit = props.confirmExit || app.trans('core.composer_discussion_discard_confirmation'); - props.titlePlaceholder = props.titlePlaceholder || app.trans('core.composer_discussion_title_placeholder'); + props.confirmExit = props.confirmExit || extractText(app.trans('core.composer_discussion_discard_confirmation')); + props.titlePlaceholder = props.titlePlaceholder || extractText(app.trans('core.composer_discussion_title_placeholder')); } headerItems() { diff --git a/js/forum/src/components/EditUserModal.js b/js/forum/src/components/EditUserModal.js index be808d497..50238d1b2 100644 --- a/js/forum/src/components/EditUserModal.js +++ b/js/forum/src/components/EditUserModal.js @@ -2,6 +2,7 @@ import Modal from 'flarum/components/Modal'; import Button from 'flarum/components/Button'; import GroupBadge from 'flarum/components/GroupBadge'; import Group from 'flarum/models/Group'; +import extractText from 'flarum/utils/extractText'; /** * The `EditUserModal` component displays a modal dialog with a login form. @@ -37,7 +38,7 @@ export default class EditUserModal extends Modal {
-
@@ -45,7 +46,7 @@ export default class EditUserModal extends Modal {
-
@@ -64,7 +65,7 @@ export default class EditUserModal extends Modal { Set new password {this.setPassword() ? ( - ) : ''} diff --git a/js/forum/src/components/ForgotPasswordModal.js b/js/forum/src/components/ForgotPasswordModal.js index 3bc297507..e3a5b06ec 100644 --- a/js/forum/src/components/ForgotPasswordModal.js +++ b/js/forum/src/components/ForgotPasswordModal.js @@ -1,6 +1,7 @@ import Modal from 'flarum/components/Modal'; import Alert from 'flarum/components/Alert'; import Button from 'flarum/components/Button'; +import extractText from 'flarum/utils/extractText'; /** * The `ForgotPasswordModal` component displays a modal which allows the user to @@ -60,7 +61,7 @@ export default class ForgotPasswordModal extends Modal {

{app.trans('core.forgot_password_text')}

- diff --git a/js/forum/src/components/LogInModal.js b/js/forum/src/components/LogInModal.js index c1a70b05f..2878f9a50 100644 --- a/js/forum/src/components/LogInModal.js +++ b/js/forum/src/components/LogInModal.js @@ -4,6 +4,7 @@ import SignUpModal from 'flarum/components/SignUpModal'; import Alert from 'flarum/components/Alert'; import Button from 'flarum/components/Button'; import LogInButtons from 'flarum/components/LogInButtons'; +import extractText from 'flarum/utils/extractText'; /** * The `LogInModal` component displays a modal dialog with a login form. @@ -47,14 +48,14 @@ export default class LogInModal extends Modal {
-
- diff --git a/js/forum/src/components/ReplyComposer.js b/js/forum/src/components/ReplyComposer.js index 247467272..7f5d06d1e 100644 --- a/js/forum/src/components/ReplyComposer.js +++ b/js/forum/src/components/ReplyComposer.js @@ -2,6 +2,7 @@ import ComposerBody from 'flarum/components/ComposerBody'; import Alert from 'flarum/components/Alert'; import Button from 'flarum/components/Button'; import icon from 'flarum/helpers/icon'; +import extractText from 'flarum/utils/extractText'; /** * The `ReplyComposer` component displays the composer content for replying to a @@ -24,9 +25,9 @@ export default class ReplyComposer extends ComposerBody { static initProps(props) { super.initProps(props); - props.placeholder = props.placeholder || app.trans('core.composer_reply_body_placeholder'); + props.placeholder = props.placeholder || extractText(app.trans('core.composer_reply_body_placeholder')); props.submitLabel = props.submitLabel || app.trans('core.composer_reply_submit_button'); - props.confirmExit = props.confirmExit || app.trans('core.composer_reply_discard_confirmation'); + props.confirmExit = props.confirmExit || extractText(app.trans('core.composer_reply_discard_confirmation')); } headerItems() { diff --git a/js/forum/src/components/Search.js b/js/forum/src/components/Search.js index 4b836a1bd..0b3135bc5 100644 --- a/js/forum/src/components/Search.js +++ b/js/forum/src/components/Search.js @@ -2,6 +2,7 @@ import Component from 'flarum/Component'; import LoadingIndicator from 'flarum/components/LoadingIndicator'; import ItemList from 'flarum/utils/ItemList'; import classList from 'flarum/utils/classList'; +import extractText from 'flarum/utils/extractText'; import icon from 'flarum/helpers/icon'; import DiscussionsSearchSource from 'flarum/components/DiscussionsSearchSource'; import UsersSearchSource from 'flarum/components/UsersSearchSource'; @@ -83,7 +84,7 @@ export default class Search extends Component { })}>
this.hasFocus = true} diff --git a/js/forum/src/components/SignUpModal.js b/js/forum/src/components/SignUpModal.js index 8b91fb73a..ceffc9a67 100644 --- a/js/forum/src/components/SignUpModal.js +++ b/js/forum/src/components/SignUpModal.js @@ -3,6 +3,7 @@ import LogInModal from 'flarum/components/LogInModal'; import avatar from 'flarum/helpers/avatar'; import Button from 'flarum/components/Button'; import LogInButtons from 'flarum/components/LogInButtons'; +import extractText from 'flarum/utils/extractText'; /** * The `SignUpModal` component displays a modal dialog with a singup form. @@ -72,14 +73,14 @@ export default class SignUpModal extends Modal {
-
- @@ -87,7 +88,7 @@ export default class SignUpModal extends Modal { {this.props.token ? '' : (
- diff --git a/js/forum/src/components/UserBio.js b/js/forum/src/components/UserBio.js index cba926f23..b267587bf 100644 --- a/js/forum/src/components/UserBio.js +++ b/js/forum/src/components/UserBio.js @@ -1,6 +1,7 @@ import Component from 'flarum/Component'; import LoadingIndicator from 'flarum/components/LoadingIndicator'; import classList from 'flarum/utils/classList'; +import extractText from 'flarum/utils/extractText'; /** * The `UserBio` component displays a user's bio, optionally letting the user @@ -30,7 +31,7 @@ export default class UserBio extends Component { let content; if (this.editing) { - content =