Merge branch 'issue-53/ambiguous-time-tokens' into deploys/test-20220127

webapp/src/test.js

@@ -108,3 +108,13 @@ test('ignoreHyperlinks', () => {
     const input = 'https://example.com/directory/test-2022-0900 is not a timestamp';
     expect(convertTimesToLocal(input, 1563387832493, 'Asia/Tokyo', 'en')).toEqual(input);
 });
+
+test('avoidTimezoneTokenAmbiguity', () => {
+    const testCases = [
+        'People visiting Buñol towards the end of August get a good chance to participate in La Tomatina (under normal circumstances)',
+    ];
+
+    testCases.forEach((input) => {
+        expect(convertTimesToLocal(input, 1642761512000, 'America/Vancouver', 'en')).toEqual(input);
+    });
+});

webapp/src/time.js

@@ -35,6 +35,10 @@ export function convertTimesToLocal(message, messageCreationTime, localTimezone,
             return message;
         }
 
+        if (parsedTime.start.isCertain('month') && !parsedTime.start.isCertain('day')) {
+            return message;
+        }
+
         let renderingFormat = DATE_AND_TIME_FORMAT;
         let formattedDisplayDate;