recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Respect 12 hour vs 24 hour time formats in Calendar day views

Summary: Fixes T9202.

Test Plan:
- Viewed day in 12-hour, saw "8:00 PM".
- Viewed day in 24-hour, saw "16:00".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9202, T10932

Differential Revision: https://secure.phabricator.com/D16290

epriestley 80624232 872bcd44

+5 -5
+2 -2
resources/celerity/map.php
··· 362 362 'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761', 363 363 'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => 'edd1ba66', 364 364 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 365 - 'rsrc/js/application/calendar/behavior-day-view.js' => '5c46cff2', 365 + 'rsrc/js/application/calendar/behavior-day-view.js' => '1a5bb063', 366 366 'rsrc/js/application/calendar/behavior-event-all-day.js' => '38dcf3c8', 367 367 'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f', 368 368 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408', ··· 603 603 'javelin-behavior-dashboard-move-panels' => '019f36c4', 604 604 'javelin-behavior-dashboard-query-panel-select' => '453c5375', 605 605 'javelin-behavior-dashboard-tab-panel' => 'd4eecc63', 606 - 'javelin-behavior-day-view' => '5c46cff2', 606 + 'javelin-behavior-day-view' => '1a5bb063', 607 607 'javelin-behavior-desktop-notifications-control' => 'edd1ba66', 608 608 'javelin-behavior-detect-timezone' => '4c193c96', 609 609 'javelin-behavior-device' => 'bb1dd507',
+1 -1
src/view/phui/calendar/PHUICalendarDayView.php
··· 61 61 foreach ($hours as $hour) { 62 62 $js_hours[] = array( 63 63 'hour' => $hour->format('G'), 64 - 'hour_meridian' => $hour->format('g A'), 64 + 'displayTime' => phabricator_time($hour->format('U'), $viewer), 65 65 ); 66 66 } 67 67
+2 -2
webroot/rsrc/js/application/calendar/behavior-day-view.js
··· 169 169 var cell_time = JX.$N( 170 170 'td', 171 171 {className: 'phui-calendar-day-hour'}, 172 - hours[i]['hour_meridian']); 172 + hours[i].displayTime); 173 173 174 174 var cell_event = JX.$N( 175 175 'td', 176 176 { 177 177 meta: { 178 - time: hours[i]['hour_meridian'] 178 + time: hours[i].displayTime 179 179 }, 180 180 className: 'phui-calendar-day-events', 181 181 sigil: 'phui-calendar-day-event-cell'