Update verison and changelog

Author: kipcole9

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 **Note that `ex_cldr_calendars` version 1.24.0 and later are supported on Elixir 1.12 and later only.**
 
+## Cldr.Calendars v2.1.1
+
+This is the changelog for Cldr Calendars v2.1.1 released on March 19th, 2025.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_calendars/tags)
+
+### Bug Fixes
+
+* Fix `Cldr.Calendar.localize/2` for calendars that aren't derived from `Cldr.Calendar.Gregorian`. For example `Cldr.Calendar.Ethiopian`, `Cldr.Calendar.Coptic`, `Cldr.Calendar.Julian` and the lunisolar calendars.
+
 ## Cldr.Calendars v2.1.0
 
 This is the changelog for Cldr Calendars v2.1.0 released on March 18th, 2025.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_calendars/tags)

lib/cldr/calendar.ex

@@ -292,7 +292,8 @@ defmodule Cldr.Calendar do
   in this implementation.
   """
   @callback cldr_calendar_type() ::
-              :gregorian | :persian | :coptic | :ethiopic | :chinese | :japanese | :dangi
+              :gregorian | :persian | :coptic | :ethiopic |
+              :ethiopic_amete_alem | :chinese | :japanese | :dangi
 
   @doc """
   Returns the calendar basis.
@@ -1280,7 +1281,9 @@ defmodule Cldr.Calendar do
   @spec iso_day_of_week(date()) :: Calendar.day_of_week()
 
   def iso_day_of_week(date) do
-    Date.day_of_week(date, :monday)
+    date
+    |> Date.convert!(Calendar.ISO)
+    |> Date.day_of_week(:monday)
   end
 
   @doc """
@@ -2679,10 +2682,9 @@ defmodule Cldr.Calendar do
 
     with {_, era} <- day_of_era(datetime) do
       era_key = if variant?, do: -era - 1, else: era
+      eras = backend.eras(locale, calendar.cldr_calendar_type())
 
-      locale
-      |> backend.eras(calendar.cldr_calendar_type())
-      |> get_in([format, era_key])
+      get_in(eras, [format, era_key])
     end
   end
 
@@ -2753,15 +2755,15 @@ defmodule Cldr.Calendar do
     case month_of_year(datetime) do
       month when is_number(month) ->
         cardinal_month =
-          cardinal_month(month, calendar.__config__(), months_in_year)
+          cardinal_month(month, calendar, months_in_year)
 
         locale
         |> backend.months(calendar.cldr_calendar_type())
         |> get_in([type, format, cardinal_month])
 
       {month, :leap} when is_number(month) ->
         cardinal_month =
-          cardinal_month(month, calendar.__config__(), months_in_year)
+          cardinal_month(month, calendar, months_in_year)
 
         month_patterns =
           backend.month_patterns(locale, calendar.cldr_calendar_type())
@@ -2853,22 +2855,38 @@ defmodule Cldr.Calendar do
   # Get the month of the calendar-specific year as the month
   # in the gregorian calendar (starting in January)
   @doc false
-  def cardinal_month(month, %{month_of_year: 1}, _months_in_year) do
+  def cardinal_month(month, calendar, months_in_year) do
+    if function_exported?(calendar, :__config__, 0) do
+      do_cardinal_month(month, calendar.__config__(), months_in_year)
+    else
+      month
+    end
+  end
+
+  defp do_cardinal_month(month, %{month_of_year: 1}, _months_in_year) do
     month
   end
 
-  def cardinal_month(month, %{month_of_year: month_of_year}, months_in_year) do
+  defp do_cardinal_month(month, %{month_of_year: month_of_year}, months_in_year) do
     Cldr.Math.amod(month + month_of_year - 1, months_in_year)
   end
 
   # Get the calendar-specific day of the week as the day
   # of the week in Calendar.ISO which starts with 1 == Monday.
   @doc false
-  def cardinal_day_of_week(day, %{day_of_week: 1}) do
+  def cardinal_day_of_week(day, calendar) do
+    if function_exported?(calendar, :__config__, 0) do
+      do_cardinal_day_of_week(day, calendar.__config__())
+    else
+      day
+    end
+  end
+
+  def do_cardinal_day_of_week(day, %{day_of_week: 1}) do
     day
   end
 
-  def cardinal_day_of_week(day, %{day_of_week: day_of_week}) do
+  def do_cardinal_day_of_week(day, %{day_of_week: day_of_week}) do
     Cldr.Math.amod(day + day_of_week - 1, @days_in_a_week)
   end
 

lib/cldr/calendar/backend/calendar.ex

@@ -15,8 +15,9 @@ defmodule Cldr.Calendar.Backend do
           `Cldr` defines formats for several calendars, the names of which
           are returned by `Cldr.known_calendars/0`.
 
-          Currently this implementation only supports the `:gregorian`,
-          `:persian`, `:coptic` and `ethiopic` calendars.
+          Currently this implementation supports the `:gregorian`,
+          `:persian`, `:coptic`, `:ethiopic`, `:ethiopic_amete_alem`, `:japanese`,
+          `:chinese`` and `:dangi` calendars.
 
           The `:gregorian` calendar aligns with the proleptic Gregorian calendar
           defined by Elixir, `Calendar.ISO`.
@@ -39,6 +40,7 @@ defmodule Cldr.Calendar.Backend do
           :persian,
           :coptic,
           :ethiopic,
+          :ethiopic_amete_alem,
           :chinese,
           :japanese,
           :dangi
@@ -352,28 +354,28 @@ defmodule Cldr.Calendar.Backend do
               end,
               month_names: fn month ->
                 cardinal_month =
-                  Cldr.Calendar.cardinal_month(month, calendar_config, 12)
+                  Cldr.Calendar.cardinal_month(month, calendar, 12)
 
                 months(locale, cldr_calendar)
                 |> get_in([:format, :wide, cardinal_month])
               end,
               abbreviated_month_names: fn month ->
                 cardinal_month =
-                  Cldr.Calendar.cardinal_month(month, calendar_config, 12)
+                  Cldr.Calendar.cardinal_month(month, calendar, 12)
 
                 months(locale, cldr_calendar)
                 |> get_in([:format, :abbreviated, cardinal_month])
               end,
               day_of_week_names: fn day ->
                 cardinal_day_of_week =
-                  Cldr.Calendar.cardinal_day_of_week(day, calendar_config)
+                  Cldr.Calendar.cardinal_day_of_week(day, calendar)
 
                 days(locale, cldr_calendar)
                 |> get_in([:format, :wide, cardinal_day_of_week])
               end,
               abbreviated_day_of_week_names: fn day ->
                 cardinal_day_of_week =
-                  Cldr.Calendar.cardinal_day_of_week(day, calendar_config)
+                  Cldr.Calendar.cardinal_day_of_week(day, calendar)
 
                 days(locale, cldr_calendar)
                 |> get_in([:format, :abbreviated, cardinal_day_of_week])

lib/cldr/calendar/era.ex

@@ -83,6 +83,7 @@ defmodule Cldr.Calendar.Era do
   @eras_in_julian_calendar [
     :coptic,
     :ethiopic,
+    :ethiopic_amete_alem,
     :islamic,
     :islamic_civil,
     :islamic_rgsa,

mix.exs

@@ -1,7 +1,7 @@
 defmodule Cldr.Calendar.MixProject do
   use Mix.Project
 
-  @version "2.1.0"
+  @version "2.1.1"
 
   def project do
     [