mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 23:47:32 +02:00
Code Issues Releases Wiki Activity

Add Translator#transChoice method that extracts text

Browse Source 
Fixes #1200
This commit is contained in:
David Sevilla Martin
2019-10-22 17:40:08 -04:00
parent 9a5063c083
commit 46eab64f41
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/common/Translator.ts
View File

@@ -1,5 +1,6 @@
import extract from './utils/extract'; import extract from './utils/extract';
import username from './helpers/username'; import username from './helpers/username';
import extractText from "./utils/extractText";
type Translations = { [key: string]: string }; type Translations = { [key: string]: string };
@@ -33,6 +34,10 @@ export default class Translator {
return id; return id;
} }
transText(id: string, parameters = null) {
return extractText(this.trans(id, parameters));
}
apply(translation: string, input: any) { apply(translation: string, input: any) {
if ('user' in input) { if ('user' in input) {
const user = extract(input, 'user'); const user = extract(input, 'user');

3
js/src/forum/components/Search.tsx
View File

@@ -1,7 +1,6 @@
import Component from '../../common/Component'; import Component from '../../common/Component';
import LoadingIndicator from '../../common/components/LoadingIndicator'; import LoadingIndicator from '../../common/components/LoadingIndicator';
import ItemList from '../../common/utils/ItemList'; import ItemList from '../../common/utils/ItemList';
import extractText from '../../common/utils/extractText';
import KeyboardNavigatable from '../utils/KeyboardNavigatable'; import KeyboardNavigatable from '../utils/KeyboardNavigatable';
import icon from '../../common/helpers/icon'; import icon from '../../common/helpers/icon';
import DiscussionsSearchSource from './DiscussionsSearchSource'; import DiscussionsSearchSource from './DiscussionsSearchSource';
@@ -85,7 +84,7 @@ export default class Search extends Component {
<div className="Search-input"> <div className="Search-input">
<input className="FormControl" <input className="FormControl"
type="search" type="search"
placeholder={extractText(app.translator.trans('core.forum.header.search_placeholder'))} placeholder={app.translator.transText('core.forum.header.search_placeholder')}
value={this.value()} value={this.value()}
oninput={m.withAttr('value', this.value)} oninput={m.withAttr('value', this.value)}
onfocus={() => this.hasFocus = true} onfocus={() => this.hasFocus = true}