👌 IMPROVE: Don't duplicate month

Author: chrisjsewell

src/sphinx_timeline/dtime.py

@@ -122,9 +122,10 @@ def fmt_daterange(
     if not short_date and start.year == end.year:
         start_fmt = start_fmt.replace(" %Y", "")
         if start.month == end.month:
-            start_fmt = start_fmt.replace(f"{month_code}", "")
+            start_fmt = start_fmt.replace(f"{month_code.rstrip()}", "")
+            start_fmt = start_fmt.replace(" ,", ",")
 
-    return f"{fmt_datetime(start, start_fmt)} - {fmt_datetime(end, end_fmt)}"
+    return f"{fmt_datetime(start, start_fmt).rstrip()} - {fmt_datetime(end, end_fmt)}"
 
 
 def _ord_suffix(n: int):

tests/test_dtime.py

@@ -12,14 +12,20 @@
         ("2021-02-03", "", {"short_date": True}, "Wed 03/02/2021"),
         ("2021-02-03", "", {"short_date": True, "short_delim": "-"}, "Wed 03-02-2021"),
         ("2021-02-03 22:00", "", {"clock12": False}, "Wed 3rd Feb 2021, 22:00 (UTC)"),
-        ("2021-02-03", "1 day", {}, "Wed 3rd Feb - Thu 4th Feb 2021"),
+        ("2021-02-03", "1 day", {}, "Wed 3rd - Thu 4th Feb 2021"),
         ("2021-02-03", "1 month", {}, "Wed 3rd Feb - Wed 3rd Mar 2021"),
         ("2021-02-03", "1 year", {}, "Wed 3rd Feb 2021 - Thu 3rd Feb 2022"),
         (
             "2021-02-03 22:00",
             "1 day",
             {},
-            "Wed 3rd Feb, 10:00 PM - Thu 4th Feb 2021, 10:00 PM (UTC)",
+            "Wed 3rd, 10:00 PM - Thu 4th Feb 2021, 10:00 PM (UTC)",
+        ),
+        (
+            "2021-02-03 22:00",
+            "1 year",
+            {},
+            "Wed 3rd Feb 2021, 10:00 PM - Thu 3rd Feb 2022, 10:00 PM (UTC)",
         ),
         (
             "2021-02-03 22:00",