Merge branch 'master' of github.com:alex-oleshkevich/starlette_babel

starlette_babel/formatters.py

@@ -35,14 +35,28 @@ def format_datetime(
     return dates.format_datetime(dt, format=format, locale=parse_locale(locale))
 
 
-def format_date(date: datetime.datetime, format: _DateTimeFormats = "medium", locale: str | None = None) -> str:
+def format_date(
+    date: datetime.date | datetime.datetime, format: _DateTimeFormats = "medium", locale: str | None = None
+) -> str:
     return dates.format_date(date, format=format, locale=parse_locale(locale))
 
 
 def format_time(
-    time: datetime.datetime, format: _DateTimeFormats = "medium", rebase: bool = True, locale: str | None = None
+    time: datetime.time | datetime.datetime,
+    format: _DateTimeFormats = "medium",
+    rebase: bool = True,
+    locale: str | None = None,
 ) -> str:
     if rebase:
+        if isinstance(time, datetime.time):
+            time = datetime.datetime.utcnow().replace(
+                hour=time.hour,
+                minute=time.minute,
+                second=time.second,
+                microsecond=time.microsecond,
+                tzinfo=time.tzinfo,
+                fold=time.fold,
+            )
         time = to_user_timezone(time)
     return dates.format_time(time, format=format, locale=parse_locale(locale))
 

starlette_babel/translator.py

@@ -69,7 +69,19 @@ def translate(self) -> str:
         return typing.cast(str, value)
 
 
-gettext_lazy = typing.cast(typing.Callable[[str], str], LazyString)
+class _GettextLazy(typing.Protocol):  # pragma: nocover
+    def __call__(
+        self,
+        msgid: str,
+        msgid_plural: str | None = None,
+        count: int | None = None,
+        domain: str = "messages",
+        translator: Translator | None = None,
+    ) -> str:
+        ...
+
+
+gettext_lazy = typing.cast(_GettextLazy, LazyString)
 
 
 def gettext(

tests/test_formatters.py

@@ -86,6 +86,9 @@ def test_format_time(
     assert format_time(christmas, "long", False) == "12:30:59 UTC"
     assert format_time(christmas, "full", False) == "12:30:59, Універсальны каардынаваны час"
 
+    naive_time = datetime.time(12, 30, 59)
+    assert format_time(naive_time, "medium", False) == "12:30:59"
+
 
 def test_format_time_rebases_timezone(
     bel_tz: typing.Generator[None, None, None], bel_locale: typing.Generator[None, None, None]
@@ -95,6 +98,9 @@ def test_format_time_rebases_timezone(
     assert format_time(christmas, "long", True) == "15:30:59 +0300"
     assert format_time(christmas, "full", True) == "15:30:59, Маскоўскі стандартны час"
 
+    naive_time = datetime.time(12, 30, 59)
+    assert format_time(naive_time, "medium", True) == "15:30:59"
+
 
 def test_format_timedelta(
     bel_tz: typing.Generator[None, None, None], bel_locale: typing.Generator[None, None, None]