diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php --- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php +++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php @@ -316,7 +316,7 @@ case 'monthly': return 'month'; case 'yearly': - return 'yearly'; + return 'year'; default: return 'day'; } diff --git a/src/applications/settings/panel/PhabricatorDateTimeSettingsPanel.php b/src/applications/settings/panel/PhabricatorDateTimeSettingsPanel.php --- a/src/applications/settings/panel/PhabricatorDateTimeSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorDateTimeSettingsPanel.php @@ -71,6 +71,17 @@ "\n\n". "You can find a [[%s | full reference in the PHP manual]].", 'http://www.php.net/manual/en/function.date.php')) + // ->appendChild( + // id(new AphrontFormSelectControl()) + // ->setLabel(pht('Time-of-Day Format')) + // ->setName($pref_time) + // ->setOptions(array( + // 'g:i A' => pht('12-hour (2:34 PM)'), + // 'H:i' => pht('24-hour (14:34)'), + // )) + // ->setCaption( + // pht('Format used when rendering a time of day.')) + // ->setValue($preferences->getPreference($pref_time))) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Time-of-Day Format'))