From 3cff8c12304102a20f8cfdc22196fd5e792c7435 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 23 Sep 2017 13:46:51 +0200 Subject: [PATCH] Mark some strings as translatable Signed-off-by: Stefan Parviainen --- .../views/context_menus/RoomTileContextMenu.js | 4 ++-- src/notifications/VectorPushRulesDefinitions.js | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js index c9ded5f46c..1518bb22b4 100644 --- a/src/components/views/context_menus/RoomTileContextMenu.js +++ b/src/components/views/context_menus/RoomTileContextMenu.js @@ -21,7 +21,7 @@ import Promise from 'bluebird'; import React from 'react'; import classNames from 'classnames'; import sdk from 'matrix-react-sdk'; -import { _t } from 'matrix-react-sdk/lib/languageHandler'; +import { _t, _td } from 'matrix-react-sdk/lib/languageHandler'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import dis from 'matrix-react-sdk/lib/dispatcher'; import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap'; @@ -185,7 +185,7 @@ module.exports = React.createClass({ MatrixClientPeg.get().forget(this.props.room.roomId).done(function() { dis.dispatch({ action: 'view_next_room' }); }, function(err) { - var errCode = err.errcode || "unknown error code"; + var errCode = err.errcode || _td("unknown error code"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); Modal.createTrackedDialog('Failed to forget room', '', ErrorDialog, { title: _t('Failed to forget room %(errCode)s', {errCode: errCode}), diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.js index df6db6c354..6f72164265 100644 --- a/src/notifications/VectorPushRulesDefinitions.js +++ b/src/notifications/VectorPushRulesDefinitions.js @@ -16,6 +16,8 @@ limitations under the License. 'use strict'; +import { _td } from 'matrix-react-sdk/lib/languageHandler'; + var StandardActions = require('./StandardActions'); var PushRuleVectorState = require('./PushRuleVectorState'); @@ -65,7 +67,7 @@ module.exports = { // Messages containing user's display name ".m.rule.contains_display_name": new VectorPushRuleDefinition({ kind: "override", - description: "Messages containing my display name", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("Messages containing my display name"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { // The actions for each vector state, or null to disable the rule. on: StandardActions.ACTION_NOTIFY, loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND, @@ -76,7 +78,7 @@ module.exports = { // Messages containing user's username (localpart/MXID) ".m.rule.contains_user_name": new VectorPushRuleDefinition({ kind: "override", - description: "Messages containing my user name", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("Messages containing my user name"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { // The actions for each vector state, or null to disable the rule. on: StandardActions.ACTION_NOTIFY, loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND, @@ -87,7 +89,7 @@ module.exports = { // Messages just sent to the user in a 1:1 room ".m.rule.room_one_to_one": new VectorPushRuleDefinition({ kind: "underride", - description: "Messages in one-to-one chats", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("Messages in one-to-one chats"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { on: StandardActions.ACTION_NOTIFY, loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND, @@ -100,7 +102,7 @@ module.exports = { // By opposition, all other room messages are from group chat rooms. ".m.rule.message": new VectorPushRuleDefinition({ kind: "underride", - description: "Messages in group chats", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("Messages in group chats"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { on: StandardActions.ACTION_NOTIFY, loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND, @@ -111,7 +113,7 @@ module.exports = { // Invitation for the user ".m.rule.invite_for_me": new VectorPushRuleDefinition({ kind: "underride", - description: "When I'm invited to a room", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("When I'm invited to a room"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { on: StandardActions.ACTION_NOTIFY, loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND, @@ -122,7 +124,7 @@ module.exports = { // Incoming call ".m.rule.call": new VectorPushRuleDefinition({ kind: "underride", - description: "Call invitation", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("Call invitation"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { on: StandardActions.ACTION_NOTIFY, loud: StandardActions.ACTION_NOTIFY_RING_SOUND, @@ -133,7 +135,7 @@ module.exports = { // Notifications from bots ".m.rule.suppress_notices": new VectorPushRuleDefinition({ kind: "override", - description: "Messages sent by bot", // passed through _t() translation in src/components/views/settings/Notifications.js + description: _td("Messages sent by bot"), // passed through _t() translation in src/components/views/settings/Notifications.js vectorStateToActions: { // .m.rule.suppress_notices is a "negative" rule, we have to invert its enabled value for vector UI on: StandardActions.ACTION_DISABLED,