Merge branch 'devel' into next

This commit is contained in:
or-else
2021-01-28 17:18:40 -08:00
34 changed files with 2095 additions and 1868 deletions
+6 -1
View File
@@ -57,6 +57,11 @@ const messages = defineMessages({
id: 'code_doesnot_match',
defaultMessage: 'Code does not match',
description: 'Error message when the credential validation code is incorrect.'
},
menu_item_info: {
id: 'menu_item_info',
defaultMessage: 'Info',
description: 'Show extended topic information'
}
});
@@ -1271,7 +1276,7 @@ class TinodeWeb extends React.Component {
return [
subscribed ? {
title: this.props.intl.formatMessage({id: 'menu_item_info'}),
title: this.props.intl.formatMessage(messages.menu_item_info),
handler: this.handleShowInfoView
} : null,
subscribed ? 'messages_clear' : null,