From ca4b71b6e2e112d45d896235c6ff461d70f47e86 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Tue, 14 Nov 2017 21:54:00 +0100
Subject: [PATCH] Update to use newer _t()
---
.../structures/CompatibilityPage.js | 34 ++++++++-----------
.../views/globals/PasswordNagBar.js | 8 ++---
.../views/settings/Notifications.js | 9 ++---
3 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
index 88b01cb2..ac5a2476 100644
--- a/src/components/structures/CompatibilityPage.js
+++ b/src/components/structures/CompatibilityPage.js
@@ -17,7 +17,7 @@ limitations under the License.
'use strict';
var React = require('react');
-import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
module.exports = React.createClass({
displayName: 'CompatibilityPage',
@@ -40,30 +40,24 @@ module.exports = React.createClass({
return (
<div className="mx_CompatibilityPage">
<div className="mx_CompatibilityPage_box">
- <p>{ _tJsx("Sorry, your browser is <b>not</b> able to run Riot.", /<b>(.*?)<\/b>/, (sub) => <b>{sub}</b>) } </p>
+ <p>{ _t("Sorry, your browser is <b>not</b> able to run Riot.", {}, { 'b': (sub) => <b>{sub}</b> }) } </p>
<p>
{ _t("Riot uses many advanced browser features, some of which are not available or experimental in your current browser.") }
</p>
<p>
- { _tJsx('Please install <a href="https://www.google.com/chrome">Chrome</a> or <a href="https://getfirefox.com">Firefox</a> for the best experience.',
- [
- /<a href="https:\/\/www.google.com\/chrome">(.*?)<\/a>/,
- /<a href="https:\/\/getfirefox.com">(.*?)<\/a>/,
- ],
- [
- (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
- (sub) => <a href="https://getfirefox.com">{sub}</a>,
- ]
+ { _t('Please install <chromeLink>Chrome</chromeLink> or <firefoxLink>Firefox</firefoxLink> for the best experience.',
+ {},
+ {
+ 'chromeLink': (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
+ 'firefoxLink': (sub) => <a href="https://getfirefox.com">{sub}</a>,
+ },
)}
- { _tJsx('<a href="http://apple.com/safari">Safari</a> and <a href="http://opera.com">Opera</a> work too.',
- [
- /<a href="http:\/\/apple\.com\/safari">(.*?)<\/a>/,
- /<a href="http:\/\/opera\.com">(.*?)<\/a>/,
- ],
- [
- (sub) => <a href="http://apple.com/safari">{sub}</a>,
- (sub) => <a href="http://opera.com">{sub}</a>,
- ]
+ { _t('< safariLink>Safari</safariLink> and <operaLink>Opera</operaLink> work too.',
+ {},
+ {
+ 'safariLink': (sub) => <a href="http://apple.com/safari">{sub}</a>,
+ 'operaLink': (sub) => <a href="http://opera.com">{sub}</a>,
+ },
)}
</p>
<p>
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
index bf71fa2c..a04d48e0 100644
--- a/src/components/views/globals/PasswordNagBar.js
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -20,7 +20,7 @@ import React from 'react';
import sdk from 'matrix-react-sdk';
import Modal from 'matrix-react-sdk/lib/Modal';
import dis from 'matrix-react-sdk/lib/dispatcher';
-import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
export default React.createClass({
onUpdateClicked: function() {
@@ -49,10 +49,10 @@ export default React.createClass({
alt="Warning"
/>
<div className="mx_MatrixToolbar_content">
- { _tJsx(
+ { _t(
"To return to your account in future you need to <u>set a password</u>",
- /<u>(.*?)<\/u>/,
- (sub) => { return <u>{ sub }</u>; },
+ {},
+ { 'u': (sub) => <u>{ sub }</u> },
) }
</div>
<button className="mx_MatrixToolbar_action">
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index fa3f48c1..dd988403 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -17,7 +17,7 @@ limitations under the License.
import React from 'react';
import Promise from 'bluebird';
import sdk from 'matrix-react-sdk';
-import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
import Modal from 'matrix-react-sdk/lib/Modal';
@@ -542,10 +542,11 @@ module.exports = React.createClass({
"vectorRuleId": "_keywords",
"description" : (
<span>
- { _tJsx('Messages containing <span>keywords</span>',
- /<span>(.*?)<\/span>/,
- (sub) =>
+ { _t('Messages containing <span>keywords</span>',
+ {},
+ { 'span': (sub) =>
<span className="mx_UserNotifSettings_keywords" onClick={ self.onKeywordsClicked }>{sub}</span>
+ },
)}
</span>
),