Merge branch 'master' into nav-gh-215

MissionBit · Dec 10, 2020 · 789ac0b · 789ac0b
2 parents d4c1a38 + e8ebd7b
commit 789ac0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/components/programs/ClassInstanceData.tsx b/components/programs/ClassInstanceData.tsx
@@ -605,7 +605,7 @@ const FALL_CLASS_SCHEDULE = {
       <>
         Monday, Wednesday{" "}
         <Box component="span" display="inline-block">
-          4:00pm - 6:30pm
+          4:00pm - 6:30pm PST
         </Box>
       </>
     ),
@@ -617,7 +617,7 @@ const FALL_CLASS_SCHEDULE = {
       <>
         Tuesday, Thursday{" "}
         <Box component="span" display="inline-block">
-          4:00pm - 6:30pm
+          4:00pm - 6:30pm PST
         </Box>
       </>
     ),
@@ -658,7 +658,7 @@ function SDRClass(
       <>
         Tuesday, Wednesday, Thursday{" "}
         <Box component="span" display="inline-block">
-          6:00pm - 9:00pm
+          6:00pm - 9:00pm PST
         </Box>
       </>
     ),

diff --git a/src/dates.ts b/src/dates.ts
@@ -39,6 +39,7 @@ export const CourseDateTimeFormat = new Intl.DateTimeFormat("en-US", {
   day: "numeric",
   hour: "numeric",
   minute: "numeric",
+  timeZoneName: "short",
 });
 
 function dropWhile<T>(collection: T[], predicate: (x: T) => boolean): T[] {