8000 fix: ws schedule as 12-hour format by greyscaled · Pull Request #2209 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

fix: ws schedule as 12-hour format #2209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 9, 2022
Merged

fix: ws schedule as 12-hour format #2209

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38ee675
fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
618f13d
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
de183b7
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
51c92a6
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
ccb543c
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
7bfc0b8
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
af27a3a
Merge origin/main
greyscaled Jun 9, 2022
c92bbb5
Merge origin/main
greyscaled Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! fix: ws schedule as 12-hour format
  • Loading branch information
@greyscaled
greyscaled committed Jun 9, 2022
commit ccb543c6cd178214c9b64ccb496cb79fcb820e1b
3 changes: 1 addition & 2 deletions site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ export const Language = {
if (now.isAfter(deadline)) {
return "Workspace is shutting down"
} else {
const browserTZ = dayjs.tz.guess()
return deadline.tz(browserTZ).format("hh:mm A")
return deadline.tz(dayjs.tz.guess()).format("hh:mm A")
}
} else if (!ttl || ttl < 1) {
// If the workspace is not on, and the ttl is 0 or undefined, then the
Expand Down
0