Merge remote-tracking branch 'origin/main' into feat/semantics

hpi-swa-lab · Aug 27, 2023 · 43badc9 · 43badc9
2 parents 5d6466c + 395904c
commit 43badc9
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 45 deletions.
diff --git a/packages/SqueakInboxTalk.package/TalkMessage.class/instance/explainTimezone.st b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/explainTimezone.st
@@ -16,8 +16,10 @@ explainTimezone
 					ifEmpty: [{TextColor red}])
 			from: our size - 5 to: our size].
 	Project uiManager
-		inform: ('<b>In their timezone ({1})</b>: {2}<br><b>In our timezone ({3}):</b> {4}' asTextFromHtml format:
-			{((TimeZone talkAllForOffset: self date offset) collect: #abbreviation) joinSeparatedBy: '/'.
+		inform: ('<b>In their timezone{1}</b>: {2}<br><b>In our timezone ({3}):</b> {4}' asTextFromHtml format:
+			{((TimeZone allForOffset: self date offset) collect: #abbreviation)
+				ifNotEmpty: [:abbrevs | ' ({1})' format: {abbrevs joinSeparatedBy: '/'}]
+				ifEmpty: [''].
 			their.
 			TimeZone local abbreviation.
 			our})

diff --git a/packages/SqueakInboxTalk.package/TalkMessage.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkMessage.class/methodProperties.json
@@ -13,7 +13,7 @@
 		"conversation" : "ct 5/20/2021 18:54",
 		"dataKey" : "ct 5/7/2021 17:36",
 		"date" : "ct 5/7/2021 15:08",
-		"explainTimezone" : "ct 6/4/2023 01:04",
+		"explainTimezone" : "ct 8/17/2023 09:34",
 		"hyperkittyUrl" : "ct 5/18/2023 19:04",
 		"hyperkittyUrlForThread" : "ct 6/1/2023 18:24",
 		"inbox" : "ct 5/20/2021 18:54",

diff --git a/packages/SqueakInboxTalk.package/TimeZone.extension/class/talkAllForOffset..st b/packages/SqueakInboxTalk.package/TimeZone.extension/class/talkAllForOffset..st
diff --git a/packages/SqueakInboxTalk.package/TimeZone.extension/methodProperties.json b/packages/SqueakInboxTalk.package/TimeZone.extension/methodProperties.json
diff --git a/packages/SqueakInboxTalk.package/TimeZone.extension/properties.json b/packages/SqueakInboxTalk.package/TimeZone.extension/properties.json
diff --git a/packages/SqueakInboxTalkTests.package/TalkMessageTest.class/instance/testExplainTimezone.st b/packages/SqueakInboxTalkTests.package/TalkMessageTest.class/instance/testExplainTimezone.st
@@ -6,7 +6,7 @@ testExplainTimezone
 
 	self
 		patch: message at: #date withValue: (DateAndTime fromString: '2023-06-04T00:53:27-07:00');
-		patch: TimeZone at: #local with: [TimeZone timeZones detect: [:tz | tz abbreviation = 'EST']];
+		patch: TimeZone at: #local with: [TimeZone allTimeZones detect: [:tz | tz abbreviation = 'EST']];
 		patch: DateAndTime at: #localOffset withValue: -5 hours.
 
 	text := [message explainTimezone]

diff --git a/packages/SqueakInboxTalkTests.package/TalkMessageTest.class/methodProperties.json b/packages/SqueakInboxTalkTests.package/TalkMessageTest.class/methodProperties.json
@@ -4,6 +4,6 @@
 	"instance" : {
 		"classUnderTest" : "ct 5/20/2021 18:59",
 		"testAuthorTimestamp" : "ct 6/22/2023 23:25",
-		"testExplainTimezone" : "ct 6/4/2023 01:06",
+		"testExplainTimezone" : "ct 8/27/2023 21:01",
 		"testPrintString" : "ct 5/20/2021 16:14",
 		"testSubject" : "ct 7/1/2023 18:15" } }
diff --git a/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/README.md b/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/README.md
diff --git a/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/instance/classToBeTested.st b/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/instance/classToBeTested.st
diff --git a/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/instance/testAllForOffset.st b/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/instance/testAllForOffset.st
diff --git a/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/methodProperties.json b/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/methodProperties.json
diff --git a/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/properties.json b/packages/SqueakInboxTalkTests.package/TalkTimeZoneTest.class/properties.json