imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

text4event widget modified, used to show widget added each time.

Browse source
This commit is contained in:
Michael Telatynski 2017-08-28 08:19:39 +01:00
parent 6077693829
commit 6127727267
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/TextForEvent.js
View file

@ -244,15 +244,16 @@ function textForPowerEvent(event) {
} }
return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', { return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
senderName: senderName, senderName: senderName,
powerLevelDiffText: diff.join(", ") powerLevelDiffText: diff.join(", "),
}); });
} }
function textForWidgetEvent(event) { function textForWidgetEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender(); const senderName = event.getSender();
const previousContent = event.getPrevContent() || {}; const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
const {name, type, url} = event.getContent() || {}; const {name, type, url} = event.getContent() || {};
let widgetName = name || previousContent.name || type || previousContent.type || '';
let widgetName = name || prevName || type || prevType || '';
// Apply sentence case to widget name // Apply sentence case to widget name
if (widgetName && widgetName.length > 0) { if (widgetName && widgetName.length > 0) {
widgetName = widgetName[0].toUpperCase() + widgetName.slice(1) + ' '; widgetName = widgetName[0].toUpperCase() + widgetName.slice(1) + ' ';
@ -261,9 +262,15 @@ function textForWidgetEvent(event) {
// If the widget was removed, its content should be {}, but this is sufficiently // If the widget was removed, its content should be {}, but this is sufficiently
// equivalent to that condition. // equivalent to that condition.
if (url) { if (url) {
return _t('%(widgetName)s widget added by %(senderName)s', { if (prevUrl) {
widgetName, senderName, return _t('%(widgetName)s widget modified by %(senderName)s', {
}); widgetName, senderName,
});
} else {
return _t('%(widgetName)s widget added by %(senderName)s', {
widgetName, senderName,
});
}
} else { } else {
return _t('%(widgetName)s widget removed by %(senderName)s', { return _t('%(widgetName)s widget removed by %(senderName)s', {
widgetName, senderName, widgetName, senderName,

1
src/i18n/strings/en_EN.json
View file

@ -977,5 +977,6 @@
"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",
"%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s", "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
"%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s", "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
"%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>" "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>"
} }