From fceccfc503393a198440a88ae29e0f532ef0c471 Mon Sep 17 00:00:00 2001 From: MTRNord Date: Wed, 16 Aug 2017 23:54:36 +0200 Subject: [PATCH 1/2] Add missing Robot string to translation --- src/components/views/login/CaptchaForm.js | 6 +++++- src/i18n/strings/en_EN.json | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/views/login/CaptchaForm.js b/src/components/views/login/CaptchaForm.js index f154cc4f1d..367b1ea590 100644 --- a/src/components/views/login/CaptchaForm.js +++ b/src/components/views/login/CaptchaForm.js @@ -66,7 +66,11 @@ module.exports = React.createClass({ // * jumping straight to a hosted captcha page (but we don't support that yet) // * embedding the captcha in an iframe (if that works) // * using a better captcha lib - warning.innerHTML = "Robot check is currently unavailable on desktop - please use a web browser."; + warning.innerHTML = _tJsx( + "Robot check is currently unavailable on desktop - please use a web browser", + /(.*?)<\/a>/, + (sub) => { return "{ sub }"; } + ); this.refs.recaptchaContainer.appendChild(warning); } else { diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 83be31de4b..bacac0ebca 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -969,5 +969,6 @@ "Automatically replace plain text Emoji": "Automatically replace plain text Emoji", "Failed to upload image": "Failed to upload image", "Failed to update group": "Failed to update group", - "Hide avatars in user and room mentions": "Hide avatars in user and room mentions" + "Hide avatars in user and room mentions": "Hide avatars in user and room mentions", + "Robot check is currently unavailable on desktop - please use a web browser": "Robot check is currently unavailable on desktop - please use a web browser" } From 59815359f8331840f86a417b2ed8b5ac63c9ac99 Mon Sep 17 00:00:00 2001 From: MTRNord Date: Wed, 16 Aug 2017 23:55:43 +0200 Subject: [PATCH 2/2] Add misiing _tJsx import --- src/components/views/login/CaptchaForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/login/CaptchaForm.js b/src/components/views/login/CaptchaForm.js index 367b1ea590..8f9c0391ae 100644 --- a/src/components/views/login/CaptchaForm.js +++ b/src/components/views/login/CaptchaForm.js @@ -17,7 +17,7 @@ limitations under the License. 'use strict'; import React from 'react'; -import { _t } from '../../../languageHandler'; +import { _t, _tJsx } from '../../../languageHandler'; var DIV_ID = 'mx_recaptcha';