Fix currency detection when parsing money with locales

lib/money.ex

@@ -527,7 +527,7 @@ defmodule Money do
 
     with {:ok, backend} <- Cldr.validate_backend(backend),
          {:ok, locale} <- Cldr.validate_locale(locale, backend) do
-      currency = Cldr.Currency.current_currency_from_locale(locale)
+      currency = Cldr.Currency.currency_from_locale(locale)
 
       money_map
       |> Map.put(:currency, currency)

mix/test_cldr.ex

@@ -5,7 +5,7 @@ defmodule Money.Cldr do
   @moduledoc false
 
   use Cldr,
-    locales: ["en", "de", "it", "es", "fr", "da"],
+    locales: ["en", "de", "it", "es", "fr", "da", "zh-Hant-HK", "zh-Hans", "ja"],
     default_locale: "en",
     data_dir: "../cldr/priv/cldr",
     providers: [Cldr.Number, Money]

test/money_parse_test.exs

@@ -75,6 +75,17 @@ defmodule MoneyTest.Parse do
       assert Money.parse("100", default_currency: "australian dollars") == Money.new(:AUD, 100)
     end
 
+    test "with locale overrides" do
+      # A locale that has a regional override. The regional override
+      # takes precedence and hence the currency is USD
+      assert Money.parse("100", locale: "zh-Hans-u-rg-uszzzz") == Money.new(:USD, 100)
+
+      # A locale that has a regional override and a currency
+      # override uses the currency override as precedent over
+      # the regional override. In this case, EUR
+      assert Money.parse("100", locale: "zh-Hans-u-rg-uszzzz-cu-eur") == Money.new(:EUR, 100)
+    end
+
     test "parse with negative numbers" do
       assert Money.parse("-127,54 €", locale: "fr") == Money.new(:EUR, "-127.54")
       assert Money.parse("-127,54€", locale: "fr") == Money.new(:EUR, "-127.54")

test/support/test_cldr.ex

@@ -4,7 +4,7 @@ require Money
 defmodule Test.Cldr do
   use Cldr,
     default_locale: "en",
-    locales: ["en", "root", "de", "da", "nl", "de-CH", "fr"],
+    locales: ["en", "root", "de", "da", "nl", "de-CH", "fr", "zh-Hant-HK", "zh-Hans", "ja"],
     providers: [Cldr.Number, Money],
     supress_warnings: true
 end