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

Rearrange timeline update wording for better internationalisation. Fix widget name values.

Browse source
This commit is contained in:
Richard Lewis 2017-08-18 18:02:50 +01:00
parent b678c2cf0f
commit 7395f96b77
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/TextForEvent.js
View file

@ -252,18 +252,21 @@ function textForWidgetEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender();
const previousContent = event.getPrevContent() || {};
const {name, type, url} = event.getContent() || {};
let widgetName = widgetName || name || type || previousContent.type;
widgetName = widgetName ? widgetName + ' ' : '';
let widgetName = name || previousContent.name || type || previousContent.type || '';
// Apply sentence case to widget name
if (widgetName && widgetName.length > 0) {
widgetName = widgetName[0].toUpperCase() + widgetName.slice(1) + ' ';
}
// If the widget was removed, its content should be {}, but this is sufficiently
// equivalent to that condition.
if (url) {
return _t('%(senderName)s added a %(widgetName)swidget', {
senderName, widgetName,
return _t('%(widgetName)s widget added by %(senderName)s', {
widgetName, senderName,
});
} else {
return _t('%(senderName)s removed a %(widgetName)swidget', {
senderName, widgetName,
return _t('%(widgetName)s widget removed by %(senderName)s', {
widgetName, senderName,
});
}
}