diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index adf0800d..494ad65d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1,4 +1,5 @@ { + "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s", "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.", "Add an email address above to configure email notifications": "Add an email address above to configure email notifications", "Advanced notification settings": "Advanced notification settings", @@ -88,6 +89,7 @@ "remove %(name)s from the directory": "remove %(name)s from the directory", "Remove from Directory": "Remove from Directory", "Resend": "Resend", + "Riot Desktop on %(platformName)": "Riot Desktop on %(platformName)", "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network", "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.", "Room directory": "Room directory", @@ -106,6 +108,7 @@ "Unable to join network": "Unable to join network", "Unable to look up room ID from server": "Unable to look up room ID from server", "Unhide Preview": "Unhide Preview", + "Unknown device": "Unknown device", "unknown error code": "unknown error code", "Unnamed room": "Unnamed room", "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s", @@ -126,6 +129,7 @@ "Saturday": "Saturday", "Today": "Today", "Yesterday": "Yesterday", + "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.", "Welcome page": "Welcome page", "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!" } diff --git a/src/vector/index.js b/src/vector/index.js index 432710fb..716e9c53 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -278,7 +278,6 @@ async function loadApp() { </div>, document.getElementById('matrixchat')); } else if (validBrowser) { UpdateChecker.start(); - const MatrixChat = sdk.getComponent('structures.MatrixChat'); window.matrixChat = ReactDOM.render( <MatrixChat diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 06ea2136..6bc04730 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -19,6 +19,7 @@ limitations under the License. import VectorBasePlatform from './VectorBasePlatform'; import dis from 'matrix-react-sdk/lib/dispatcher'; +import _t from 'matrix-react-sdk/lib/languageHandler'; import q from 'q'; import electron, {remote, ipcRenderer} from 'electron'; @@ -68,7 +69,7 @@ export default class ElectronPlatform extends VectorBasePlatform { } getHumanReadableName(): string { - return 'Electron Platform'; + return 'Electron Platform'; // no translation required: only used for analytics } setNotificationCount(count: number) { @@ -146,7 +147,7 @@ export default class ElectronPlatform extends VectorBasePlatform { } getDefaultDeviceDisplayName(): string { - return 'Riot Desktop on ' + platformFriendlyName(); + return _t('Riot Desktop on %(platformName)s', { platformName: platformFriendlyName() }); } screenCaptureErrorString(): ?string { diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 04caecdc..bf15e6cf 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -18,6 +18,8 @@ limitations under the License. */ import BasePlatform from 'matrix-react-sdk/lib/BasePlatform'; +import _t from 'matrix-react-sdk/lib/languageHandler'; + import Favico from 'favico.js'; /** @@ -36,7 +38,7 @@ export default class VectorBasePlatform extends BasePlatform { } getHumanReadableName(): string { - return 'Vector Base Platform'; + return 'Vector Base Platform'; // no translation required: only used for analytics } _updateFavicon() { @@ -94,6 +96,6 @@ export default class VectorBasePlatform extends BasePlatform { * device Vector is running on */ getDefaultDeviceDisplayName(): string { - return "Unknown device"; + return _t("Unknown device"); } } diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js index 1a3c46fb..8397a7f7 100644 --- a/src/vector/platform/WebPlatform.js +++ b/src/vector/platform/WebPlatform.js @@ -20,6 +20,7 @@ limitations under the License. import VectorBasePlatform from './VectorBasePlatform'; import request from 'browser-request'; import dis from 'matrix-react-sdk/lib/dispatcher.js'; +import { _t } from 'matrix-react-sdk/lib/languageHandler'; import q from 'q'; import url from 'url'; @@ -32,7 +33,7 @@ export default class WebPlatform extends VectorBasePlatform { } getHumanReadableName(): string { - return 'Web Platform'; + return 'Web Platform'; // no translation required: only used for analytics } /** @@ -159,13 +160,15 @@ export default class WebPlatform extends VectorBasePlatform { const appName = u.format(); const ua = new UAParser(); - return `${appName} via ${ua.getBrowser().name} on ${ua.getOS().name}`; + const browserName = ua.getBrowser().name; + const osName = ua.getOS().name; + return _t('%(appName)s via %(browserName)s on %(osName)s', {appName: appName, browserName: browserName, osName: osName}); } screenCaptureErrorString(): ?string { // it won't work at all if you're not on HTTPS so whine whine whine if (!global.window || global.window.location.protocol !== "https:") { - return "You need to be using HTTPS to place a screen-sharing call."; + return _t("You need to be using HTTPS to place a screen-sharing call."); } return null; }