Merge branch 'main' into integration-test

elixir-cldr · Apr 21, 2024 · 67b09f8 · 67b09f8
2 parents a7a9cc5 + 5c7bafa
commit 67b09f8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 **Note that `ex_cldr` version 2.33.0 and later are supported on Elixir 1.11 and later only.**
 
+## Cldr v2.38.1
+
+This is the changelog for Cldr v2.38.1 released on ______, 2024.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr/tags)
+
+### Bug Fixes
+
+* Sort currency data in `Cldr.Config.territories/0` so ensure deterministic order. Closes #227.
+
 ## Cldr v2.38.0
 
 This is the changelog for Cldr v2.38.0 released on April 21st, 2024.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr/tags)

diff --git a/README.md b/README.md
@@ -300,7 +300,7 @@ The currently known providers and their `hex` package names are:
   | ex_cldr_locale_display | Cldr.LocaleDisplay | Localising locale names                        |
   | ex_cldr_routes         | Cldr.Route         | Localized routes and route helpers             |
   | ex_money               | Money              | Operations on and formatting of a money type   |
-  | ex_messages            | Cldr.Message       | Formatting of ICU-formatted messages           |
+  | ex_cldr_messages       | Cldr.Message       | Formatting of ICU-formatted messages           |
 
 Any library author can create a provider module by exposing a function called `cldr_backend_provider/1` that takes a `Cldr.Config` struct as a single parameter.  The function should return an AST that is inserted into the `backend` module being compiled.
 

diff --git a/lib/cldr/config/config.ex b/lib/cldr/config/config.ex
@@ -1826,7 +1826,7 @@ defmodule Cldr.Config do
           {currency, data}
         end)
 
-      {territory, Map.put(data, :currency, currencies)}
+      {territory, Map.put(data, :currency, Enum.sort(currencies))}
     end)
     |> Map.new()
   end

diff --git a/test/cldr_test.exs b/test/cldr_test.exs
@@ -248,10 +248,10 @@ defmodule Cldr.Test do
   test "that we can have repeated currencies in a territory" do
     assert Cldr.Config.territory(:PS)[:currency] ==
             [
-              JOD: %{from: ~D[1996-02-12]},
-              JOD: %{from: ~D[1950-07-01], to: ~D[1967-06-01]},
+              ILP: %{from: ~D[1967-06-01], to: ~D[1980-02-22]},
               ILS: %{from: ~D[1985-09-04]},
-              ILP: %{from: ~D[1967-06-01], to: ~D[1980-02-22]}
+              JOD: %{from: ~D[1996-02-12]},
+              JOD: %{from: ~D[1950-07-01], to: ~D[1967-06-01]}
             ]
   end