Skip to content

Commit 7796f7b

Browse files
committed
Update test data for CLDR48
1 parent fb7e16a commit 7796f7b

File tree

5 files changed

+244
-52
lines changed

5 files changed

+244
-52
lines changed

lib/cldr/backend.ex

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,15 @@ defmodule Cldr.LocaleDisplay.Backend do
232232
def territory_standard_format(locale)
233233

234234
for locale_name <- Cldr.Locale.Loader.known_locale_names(config) do
235-
locale = Cldr.Locale.Loader.get_locale(locale_name, config)
236-
locale_display_names = locale.locale_display_names
235+
locale =
236+
Cldr.Locale.Loader.get_locale(locale_name, config)
237+
238+
locale_display_names =
239+
locale
240+
|> Map.fetch!(:locale_display_names)
241+
|> Map.put(:language, locale.languages)
242+
|> Map.put(:territory, locale.territories)
243+
237244
time_zone = locale.dates.time_zone_names
238245
time_zone_names = time_zone.zone
239246

lib/cldr/locale_display.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ defmodule Cldr.LocaleDisplay do
294294

295295
[language_name, subtags]
296296
|> Cldr.Substitution.substitute(locale_pattern)
297-
|> :erlang.iolist_to_binary()
297+
|> List.to_string()
298298
end
299299

300300
defp subtag_names(_locale, [], _display_names, _prefer) do
@@ -343,7 +343,7 @@ defmodule Cldr.LocaleDisplay do
343343
end
344344

345345
def get_display_preference(values, preference) when is_map(values) do
346-
Map.get(values, preference) || Map.fetch!(values, :default)
346+
Map.get(values, preference) || Map.fetch!(values, :standard)
347347
end
348348

349349
defp join_subtags([], _display_names) do

mix.exs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ defmodule Cldr.LocaleDisplay.MixProject do
3939

4040
defp deps do
4141
[
42-
{:ex_cldr, "~> 2.43"},
42+
#{:ex_cldr, "~> 2.44"},
43+
{:ex_cldr, path: "../cldr", override: true},
44+
4345
{:ex_cldr_currencies, "~> 2.12"},
4446
{:ex_cldr_territories, "~> 2.4"},
4547

0 commit comments

Comments
 (0)