aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/DateTimeFormatter.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/DateTimeFormatter.php')
-rw-r--r--lib/private/DateTimeFormatter.php128
1 files changed, 64 insertions, 64 deletions
diff --git a/lib/private/DateTimeFormatter.php b/lib/private/DateTimeFormatter.php
index cd765a2a14b..2882a7d8cd7 100644
--- a/lib/private/DateTimeFormatter.php
+++ b/lib/private/DateTimeFormatter.php
@@ -28,8 +28,8 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Get TimeZone to use
*
- * @param \DateTimeZone $timeZone The timezone to use
- * @return \DateTimeZone The timezone to use, falling back to the current user's timezone
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @return \DateTimeZone The timezone to use, falling back to the current user's timezone
*/
protected function getTimeZone($timeZone = null) {
if ($timeZone === null) {
@@ -42,8 +42,8 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Get \OCP\IL10N to use
*
- * @param \OCP\IL10N $l The locale to use
- * @return \OCP\IL10N The locale to use, falling back to the current user's locale
+ * @param \OCP\IL10N $l The locale to use
+ * @return \OCP\IL10N The locale to use, falling back to the current user's locale
*/
protected function getLocale($l = null) {
if ($l === null) {
@@ -57,7 +57,7 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
* Generates a DateTime object with the given timestamp and TimeZone
*
* @param mixed $timestamp
- * @param \DateTimeZone $timeZone The timezone to use
+ * @param \DateTimeZone $timeZone The timezone to use
* @return \DateTime
*/
protected function getDateTime($timestamp, ?\DateTimeZone $timeZone = null) {
@@ -77,15 +77,15 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $format Either 'full', 'long', 'medium' or 'short'
- * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
- * long: e.g. 'MMMM d, y' => 'August 20, 2014'
- * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
- * short: e.g. 'M/d/yy' => '8/20/14'
- * The exact format is dependent on the language
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $format Either 'full', 'long', 'medium' or 'short'
+ * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
+ * long: e.g. 'MMMM d, y' => 'August 20, 2014'
+ * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
+ * short: e.g. 'M/d/yy' => '8/20/14'
+ * The exact format is dependent on the language
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date string
*/
public function formatDate($timestamp, $format = 'long', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
@@ -95,16 +95,16 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $format Either 'full', 'long', 'medium' or 'short'
- * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
- * long: e.g. 'MMMM d, y' => 'August 20, 2014'
- * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
- * short: e.g. 'M/d/yy' => '8/20/14'
- * The exact format is dependent on the language
- * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $format Either 'full', 'long', 'medium' or 'short'
+ * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
+ * long: e.g. 'MMMM d, y' => 'August 20, 2014'
+ * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
+ * short: e.g. 'M/d/yy' => '8/20/14'
+ * The exact format is dependent on the language
+ * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted relative date string
*/
public function formatDateRelativeDay($timestamp, $format = 'long', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
@@ -119,13 +119,13 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
* Gives the relative date of the timestamp
* Only works for past dates
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date span. Dates returned are:
- * < 1 month => Today, Yesterday, n days ago
- * < 13 month => last month, n months ago
- * >= 13 month => last year, n years ago
+ * < 1 month => Today, Yesterday, n days ago
+ * < 13 month => last month, n months ago
+ * >= 13 month => last year, n years ago
*/
public function formatDateSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) {
$l = $this->getLocale($l);
@@ -182,15 +182,15 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $format Either 'full', 'long', 'medium' or 'short'
- * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00'
- * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT'
- * medium: e.g. 'h:mm:ss a' => '11:42:13 AM'
- * short: e.g. 'h:mm a' => '11:42 AM'
- * The exact format is dependent on the language
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $format Either 'full', 'long', 'medium' or 'short'
+ * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00'
+ * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT'
+ * medium: e.g. 'h:mm:ss a' => '11:42:13 AM'
+ * short: e.g. 'h:mm a' => '11:42 AM'
+ * The exact format is dependent on the language
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted time string
*/
public function formatTime($timestamp, $format = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
@@ -200,16 +200,16 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Gives the relative past time of the timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted time span. Dates returned are:
- * < 60 sec => seconds ago
- * < 1 hour => n minutes ago
- * < 1 day => n hours ago
- * < 1 month => Yesterday, n days ago
- * < 13 month => last month, n months ago
- * >= 13 month => last year, n years ago
+ * < 60 sec => seconds ago
+ * < 1 hour => n minutes ago
+ * < 1 day => n hours ago
+ * < 1 month => Yesterday, n days ago
+ * < 13 month => last month, n months ago
+ * >= 13 month => last year, n years ago
*/
public function formatTimeSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) {
$l = $this->getLocale($l);
@@ -247,11 +247,11 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date and time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $formatDate See formatDate() for description
- * @param string $formatTime See formatTime() for description
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $formatDate See formatDate() for description
+ * @param string $formatTime See formatTime() for description
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date and time string
*/
public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
@@ -261,12 +261,12 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date and time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $formatDate See formatDate() for description
- * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
- * @param string $formatTime See formatTime() for description
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $formatDate See formatDate() for description
+ * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+ * @param string $formatTime See formatTime() for description
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted relative date and time string
*/
public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
@@ -280,11 +280,11 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date and time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $type One of 'date', 'datetime' or 'time'
- * @param string $format Format string
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $type One of 'date', 'datetime' or 'time'
+ * @param string $format Format string
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date and time string
*/
protected function format($timestamp, $type, $format, ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {