Squash merge https://github.com/vector-im/riot-web/pull/3636

2017-05-23 14:12:53 +01:00
parent 7d59742a22
commit 6b6fa59f3e
36 changed files with 7547 additions and 186 deletions
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';

 var React = require('react');
+import _t from 'counterpart-riot';
 var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
@@ -134,7 +135,7 @@ module.exports = React.createClass({
                        className="mx_SearchBox_search"
                        value={ this.state.searchTerm }
                        onChange={ this.onChange }
-                        placeholder="Filter room names"
+                        placeholder={ _t('Filter room names') }
                    />
                ];
        }