mirror of
https://framagit.org/framasoft/mobilizon.git
synced 2024-12-22 07:52:43 +00:00
Add datetime_to_date_string/3 and is_same_day?/2 to Mobilizon.Service.DateTime
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
7ecf2e1da0
commit
aca2ed612e
1 changed files with 14 additions and 2 deletions
|
@ -16,8 +16,13 @@ defmodule Mobilizon.Service.DateTime do
|
||||||
Mobilizon.Cldr.Time.to_string!(datetime, format: format, locale: locale_or_default(locale))
|
Mobilizon.Cldr.Time.to_string!(datetime, format: format, locale: locale_or_default(locale))
|
||||||
end
|
end
|
||||||
|
|
||||||
@spec datetime_tz_convert(DateTime.t(), String.t()) :: DateTime.t()
|
@spec datetime_to_date_string(DateTime.t(), String.t(), to_string_format()) :: String.t()
|
||||||
def datetime_tz_convert(%DateTime{} = datetime, timezone) do
|
def datetime_to_date_string(%DateTime{} = datetime, locale \\ "en", format \\ :short) do
|
||||||
|
Mobilizon.Cldr.Date.to_string!(datetime, format: format, locale: locale_or_default(locale))
|
||||||
|
end
|
||||||
|
|
||||||
|
@spec datetime_tz_convert(DateTime.t(), String.t() | nil) :: DateTime.t()
|
||||||
|
def datetime_tz_convert(%DateTime{} = datetime, timezone) when is_binary(timezone) do
|
||||||
case DateTime.shift_zone(datetime, timezone) do
|
case DateTime.shift_zone(datetime, timezone) do
|
||||||
{:ok, datetime_with_tz} ->
|
{:ok, datetime_with_tz} ->
|
||||||
datetime_with_tz
|
datetime_with_tz
|
||||||
|
@ -27,6 +32,8 @@ defmodule Mobilizon.Service.DateTime do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def datetime_tz_convert(%DateTime{} = datetime, nil), do: datetime
|
||||||
|
|
||||||
@spec datetime_relative(DateTime.t(), String.t()) :: String.t()
|
@spec datetime_relative(DateTime.t(), String.t()) :: String.t()
|
||||||
def datetime_relative(%DateTime{} = datetime, locale \\ "en") do
|
def datetime_relative(%DateTime{} = datetime, locale \\ "en") do
|
||||||
Relative.to_string!(datetime, Mobilizon.Cldr,
|
Relative.to_string!(datetime, Mobilizon.Cldr,
|
||||||
|
@ -200,4 +207,9 @@ defmodule Mobilizon.Service.DateTime do
|
||||||
DateTime.compare(DateTime.add(last_notification_sent, 3_600), DateTime.utc_now()) ==
|
DateTime.compare(DateTime.add(last_notification_sent, 3_600), DateTime.utc_now()) ==
|
||||||
:lt
|
:lt
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec is_same_day?(DateTime.t(), DateTime.t()) :: boolean()
|
||||||
|
def is_same_day?(%DateTime{} = one, %DateTime{} = two) do
|
||||||
|
DateTime.to_date(one) == DateTime.to_date(two)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue