From ccc6c5c59b6b39616b3c99e73b2e7664fe5506b4 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 3 Oct 2021 18:58:07 +0300 Subject: [PATCH] Correct actiivty labels --- lib/data/models/entities.dart | 7 +++++-- lib/ui/app/lists/activity_list_tile.dart | 1 + lib/utils/i18n.dart | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index f374097a9..c52db087a 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -673,6 +673,7 @@ abstract class ActivityEntity kActivityEmailReminder2, kActivityEmailReminder3, kActivityEmailReminderEndless, + kActivityEmailInvoiceFailed, ].contains(activityTypeId)) { return EntityType.invoice; } else if ([ @@ -763,7 +764,8 @@ abstract class ActivityEntity } String getDescription( - String activity, { + String activity, + String systemString, { UserEntity user, ClientEntity client, InvoiceEntity invoice, @@ -781,7 +783,8 @@ abstract class ActivityEntity .firstWhere((contact) => contact.id == contactId, orElse: () => null); } - activity = activity.replaceFirst(':user', user?.listDisplayName ?? ''); + activity = + activity.replaceFirst(':user', user?.listDisplayName ?? systemString); activity = activity.replaceFirst(':client', client?.displayName ?? ''); activity = activity.replaceFirst(':invoice', invoice?.number ?? ''); activity = diff --git a/lib/ui/app/lists/activity_list_tile.dart b/lib/ui/app/lists/activity_list_tile.dart index 7801bebb9..68f6fdc2d 100644 --- a/lib/ui/app/lists/activity_list_tile.dart +++ b/lib/ui/app/lists/activity_list_tile.dart @@ -39,6 +39,7 @@ class ActivityListTile extends StatelessWidget { String title = localization.lookup('activity_${activity.activityTypeId}'); title = activity.getDescription( title, + localization.system, user: user, client: client, invoice: invoice, diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index a7b397169..9e2e93088 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -15,6 +15,7 @@ mixin LocalizationsProvider on LocaleCodeAware { static final Map> _localizedValues = { 'en': { // STARTER: lang key - do not remove comment + 'system': 'System', 'set_default_company': 'Set Default Company', 'updated_company': 'Successfully updated company', 'kbc': 'KBC', @@ -62660,6 +62661,10 @@ mixin LocalizationsProvider on LocaleCodeAware { _localizedValues[localeCode]['set_default_company'] ?? _localizedValues['en']['set_default_company']; + String get system => + _localizedValues[localeCode]['system'] ?? + _localizedValues['en']['system']; + // STARTER: lang field - do not remove comment String lookup(String key) {