Skip to content

Commit 288e4ef

Browse files
committed
Don't add device name prefix to custom messages
New custom error messages should be self-contained - Custom blueprint messages should be written appropriately - Prefix Old TSR default messages earlier in the process for backwards compatibility
1 parent eb21826 commit 288e4ef

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/corelib/src/ErrorMessageResolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ export class ErrorMessageResolver {
107107
// undefined or not found - fall through to default
108108
}
109109

110-
// Use default message from TSR
110+
// Use default message from TSR with device name prefix
111111
return {
112-
key: defaultMessage,
112+
key: `{{deviceName}}: ${defaultMessage}`,
113113
args: context,
114114
}
115115
}

packages/webui/src/client/ui/RundownView/RundownNotifier.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ class RundownViewNotifier extends WithManagedTracker {
813813
if (!device.connected) {
814814
return t('Device {{deviceName}} is disconnected', { deviceName: device.name })
815815
}
816-
return `${device.name}: ` + (device.status.messages || ['']).join(', ')
816+
return (device.status.messages || ['']).join(', ')
817817
}
818818
}
819819

0 commit comments

Comments
 (0)