OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5236 from matrix-org/t3chguy/fix/15237 

Rename apps back to widgets
pull/21833/head
Michael Telatynski 2020-09-18 19:04:34 +01:00 committed by GitHub
parent 4ef4e67642 949b8d9afe
commit 2492041ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/elements/AppTile.js
View File

@ -863,13 +863,13 @@ export default class AppTile extends React.Component {
{ /* Minimise widget */ } { /* Minimise widget */ }
{ showMinimiseButton && <AccessibleButton { showMinimiseButton && <AccessibleButton
className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_minimise" className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_minimise"
title={_t('Minimize apps')} title={_t('Minimize widget')}
onClick={this._onMinimiseClick} onClick={this._onMinimiseClick}
/> } /> }
{ /* Maximise widget */ } { /* Maximise widget */ }
{ showMaximiseButton && <AccessibleButton { showMaximiseButton && <AccessibleButton
className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_maximise" className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_maximise"
title={_t('Maximize apps')} title={_t('Maximize widget')}
onClick={this._onMinimiseClick} onClick={this._onMinimiseClick}
/> } /> }
{ /* Title */ } { /* Title */ }

4
src/components/views/right_panel/RoomSummaryCard.tsx
View File

@ -99,7 +99,7 @@ const AppsSection: React.FC<IAppsSectionProps> = ({ room }) => {
} }
}; };
return <Group className="mx_RoomSummaryCard_appsGroup" title={_t("Apps")}> return <Group className="mx_RoomSummaryCard_appsGroup" title={_t("Widgets")}>
{ apps.map(app => { { apps.map(app => {
const name = WidgetUtils.getWidgetName(app); const name = WidgetUtils.getWidgetName(app);
const dataTitle = WidgetUtils.getWidgetDataTitle(app); const dataTitle = WidgetUtils.getWidgetDataTitle(app);
@ -161,7 +161,7 @@ const AppsSection: React.FC<IAppsSectionProps> = ({ room }) => {
}) } }) }
<AccessibleButton kind="link" onClick={onManageIntegrations}> <AccessibleButton kind="link" onClick={onManageIntegrations}>
{ apps.length > 0 ? _t("Edit apps, bridges & bots") : _t("Add apps, bridges & bots") } { apps.length > 0 ? _t("Edit widgets, bridges & bots") : _t("Add widgets, bridges & bots") }
</AccessibleButton> </AccessibleButton>
</Group>; </Group>;
}; };

2
src/components/views/right_panel/WidgetCard.tsx
View File

@ -152,7 +152,7 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
</AccessibleButton>; </AccessibleButton>;
} else { } else {
pinButton = <AccessibleTooltipButton pinButton = <AccessibleTooltipButton
title={_t("You can only pin 2 apps at a time")} title={_t("You can only pin 2 widgets at a time")}
tooltipClassName="mx_WidgetCard_maxPinnedTooltip" tooltipClassName="mx_WidgetCard_maxPinnedTooltip"
kind="secondary" kind="secondary"
className={pinButtonClasses} className={pinButtonClasses}

12
src/i18n/strings/en_EN.json
View File

@ -1280,10 +1280,10 @@
"Yours, or the other users’ session": "Yours, or the other users’ session", "Yours, or the other users’ session": "Yours, or the other users’ session",
"Members": "Members", "Members": "Members",
"Room Info": "Room Info", "Room Info": "Room Info",
"Apps": "Apps", "Widgets": "Widgets",
"Unpin app": "Unpin app", "Unpin app": "Unpin app",
"Edit apps, bridges & bots": "Edit apps, bridges & bots", "Edit widgets, bridges & bots": "Edit widgets, bridges & bots",
"Add apps, bridges & bots": "Add apps, bridges & bots", "Add widgets, bridges & bots": "Add widgets, bridges & bots",
"Not encrypted": "Not encrypted", "Not encrypted": "Not encrypted",
"About": "About", "About": "About",
"%(count)s people|other": "%(count)s people", "%(count)s people|other": "%(count)s people",
@ -1373,7 +1373,7 @@
"Remove for me": "Remove for me", "Remove for me": "Remove for me",
"Edit": "Edit", "Edit": "Edit",
"Pin to room": "Pin to room", "Pin to room": "Pin to room",
"You can only pin 2 apps at a time": "You can only pin 2 apps at a time", "You can only pin 2 widgets at a time": "You can only pin 2 widgets at a time",
"Sunday": "Sunday", "Sunday": "Sunday",
"Monday": "Monday", "Monday": "Monday",
"Tuesday": "Tuesday", "Tuesday": "Tuesday",
@ -1483,8 +1483,8 @@
"Delete widget": "Delete widget", "Delete widget": "Delete widget",
"Failed to remove widget": "Failed to remove widget", "Failed to remove widget": "Failed to remove widget",
"An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room", "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
"Minimize apps": "Minimize apps", "Minimize widget": "Minimize widget",
"Maximize apps": "Maximize apps", "Maximize widget": "Maximize widget",
"Popout widget": "Popout widget", "Popout widget": "Popout widget",
"More options": "More options", "More options": "More options",
"Join": "Join", "Join": "Join",