mix format

Author: kipcole9

config/release.exs

@@ -1 +0,0 @@
-

lib/cldr/locale_display.ex

@@ -120,7 +120,13 @@ defmodule Cldr.LocaleDisplay do
 
       match_fun = &language_match_fun(&1, &2, display_names.language)
 
-      case first_match(language_tag, match_fun, @omit_script_if_only_one, language_display, prefer) do
+      case first_match(
+             language_tag,
+             match_fun,
+             @omit_script_if_only_one,
+             language_display,
+             prefer
+           ) do
         {language_name, matched_tags} ->
           language_tag = merge_extensions_and_private_use(language_tag)
 
@@ -140,7 +146,9 @@ defmodule Cldr.LocaleDisplay do
           {:ok, format_display_name(language_name, subtag_names, extension_names, display_names)}
 
         nil ->
-          {:error, {Cldr.DisplayName.NoDataError, "The locale #{inspect in_locale} has no display name data."}}
+          {:error,
+           {Cldr.DisplayName.NoDataError,
+            "The locale #{inspect(in_locale)} has no display name data."}}
       end
     end
   end
@@ -244,9 +252,10 @@ defmodule Cldr.LocaleDisplay do
   @reinstate_subtags [:territory, :script]
 
   defp first_match(language_tag, match_fun, omit_script_if_only_one?, :standard, prefer) do
-    language_tag = Enum.reduce(@reinstate_subtags, language_tag, fn key, tag ->
-      Map.put(tag, key, nil)
-    end)
+    language_tag =
+      Enum.reduce(@reinstate_subtags, language_tag, fn key, tag ->
+        Map.put(tag, key, nil)
+      end)
 
     case Cldr.Locale.first_match(language_tag, match_fun, omit_script_if_only_one?) do
       {language_name, matched_tags} ->

lib/cldr/locale_display/t.ex

@@ -52,11 +52,13 @@ defmodule Cldr.LocaleDisplay.T do
     end
   end
 
-  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer) when is_binary(value) do
+  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer)
+       when is_binary(value) do
     replace_parens_with_brackets(value)
   end
 
-  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer) when is_atom(value) do
+  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer)
+       when is_atom(value) do
     value
     |> to_string()
     |> replace_parens_with_brackets()

lib/cldr/locale_display/u.ex

@@ -33,11 +33,13 @@ defmodule Cldr.LocaleDisplay.U do
   # Returns the localised value for the key. If there is
   # no available key name then just return the value.
 
-  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer) when is_binary(value) do
+  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer)
+       when is_binary(value) do
     replace_parens_with_brackets(value)
   end
 
-  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer) when is_atom(value) do
+  defp display_value(_key, nil, value, _transform, _in_locale, _display_names, _prefer)
+       when is_atom(value) do
     value
     |> to_string()
     |> replace_parens_with_brackets()
@@ -165,8 +167,9 @@ defmodule Cldr.LocaleDisplay.U do
           zone_name = String.replace(city, "_", " ")
           Cldr.Substitution.substitute([zone_name], territory_format)
       end
-    else _other ->
-      zone
+    else
+      _other ->
+        zone
     end
   end
 

mix.exs

@@ -41,10 +41,8 @@ defmodule Cldr.LocaleDisplay.MixProject do
     [
       # {:ex_cldr, "~> 2.37"},
       {:ex_cldr, path: "../cldr", override: true},
-
       {:ex_cldr_currencies, "~> 2.12"},
       {:ex_cldr_territories, "~> 2.4"},
-
       {:jason, "~> 1.0", optional: true},
       {:ex_doc, "~> 0.18", only: [:dev, :release], runtime: false, optional: true},
       {:dialyxir, "~> 1.0", only: [:test, :dev], runtime: false},
@@ -81,7 +79,8 @@ defmodule Cldr.LocaleDisplay.MixProject do
   def links do
     %{
       "GitHub" => "https://github.com/elixir-cldr/cldr_locale_display",
-      "Readme" => "https://github.com/elixir-cldr/cldr_locale_display/blob/v#{@version}/README.md",
+      "Readme" =>
+        "https://github.com/elixir-cldr/cldr_locale_display/blob/v#{@version}/README.md",
       "Changelog" =>
         "https://github.com/elixir-cldr/cldr_locale_display/blob/v#{@version}/CHANGELOG.md"
     }

test/locale_display_name_test.exs

@@ -5,40 +5,80 @@ defmodule Cldr.LocaleDisplayName.Test do
   doctest MyApp.Cldr.LocaleDisplay
 
   # These tests have issues:
-  # * 1566, 1569, 1686, 1699 seem to have the icorrect test result in the data
+  # * 1566, 1569, 1686, 1699 seem to have the incorrect test result in the data
   # * 344, 345 appear to have the wrong timezone returned
   # * 21,41 includes a field for a -u- tag that is invalid
   @invalid_test_results [21, 41, 344, 345, 1556, 1569, 1686, 1699]
 
   # These have test results with [] but I think they should remain ()
   # since there are no subtags or extensions.
   @results_should_be_parens [
-    396, 474, 500, 786, 864, 942, 1124, 1203, 1254, 1358, 1384, 1538, 1928, 2008,
-    2188, 2214, 2242, 2254, 2268, 2294, 2500, 2554, 2580, 2684, 2708, 2942, 2968,
-    2994, 3020, 3022, 3126, 3152, 3178
+    396,
+    474,
+    500,
+    786,
+    864,
+    942,
+    1124,
+    1203,
+    1254,
+    1358,
+    1384,
+    1538,
+    1928,
+    2008,
+    2188,
+    2214,
+    2242,
+    2254,
+    2268,
+    2294,
+    2500,
+    2554,
+    2580,
+    2684,
+    2708,
+    2942,
+    2968,
+    2994,
+    3020,
+    3022,
+    3126,
+    3152,
+    3178
   ]
 
   # The test results for these are what would be generated with
   # language_display: :standard, but the test specifies language_tag: :dialect
   @wrong_language_display [
-    2370, 2374, 2375, 2371
+    2370,
+    2374,
+    2375,
+    2371
   ]
 
   @except_lines @invalid_test_results ++ @results_should_be_parens ++ @wrong_language_display
   @locales [:en, :fr, :de, :it, :es, :zh, :"zh-Hans", :"zh-Hant", :ja]
 
-  for [line, locale, language_display, from, to] <- Cldr.LocaleDisplayNameGenerator.data(), line not in @except_lines do
-    test "##{line} Locale #{inspect(from)} becomes #{inspect(to)} in locale #{inspect locale}" do
-      assert Cldr.LocaleDisplay.display_name!(unquote(from), locale: unquote(locale), language_display: unquote(language_display)) ==
+  for [line, locale, language_display, from, to] <- Cldr.LocaleDisplayNameGenerator.data(),
+      line not in @except_lines do
+    test "##{line} Locale #{inspect(from)} becomes #{inspect(to)} in locale #{inspect(locale)}" do
+      assert Cldr.LocaleDisplay.display_name!(unquote(from),
+               locale: unquote(locale),
+               language_display: unquote(language_display)
+             ) ==
                unquote(to)
     end
   end
 
   for [line, _locale, language_display, from, _to] <- Cldr.LocaleDisplayNameGenerator.data(),
       locale <- @locales,
       line not in @except_lines && locale != :und do
-    test "##{line} Language tag #{inspect(from)} in locale #{inspect locale} renders" do
-      assert Cldr.LocaleDisplay.display_name!(unquote(from), locale: unquote(locale), language_display: unquote(language_display))
+    test "##{line} Language tag #{inspect(from)} in locale #{inspect(locale)} renders" do
+      assert Cldr.LocaleDisplay.display_name!(unquote(from),
+               locale: unquote(locale),
+               language_display: unquote(language_display)
+             )
     end
   end
 
@@ -55,8 +95,13 @@ defmodule Cldr.LocaleDisplayName.Test do
     assert Cldr.display_name(~l(en)u) == "English"
     assert Cldr.display_name(~l(zh-Hans)u, language_display: :dialect) == "Simplified Chinese"
     assert Cldr.display_name(~l(zh-Hant)u, language_display: :dialect) == "Traditional Chinese"
-    assert Cldr.display_name(~l(zh-Hant), language_display: :dialect) == "Traditional Chinese (Taiwan)"
-    assert Cldr.display_name(~l(zh-Hans), language_display: :dialect) == "Simplified Chinese (China)"
+
+    assert Cldr.display_name(~l(zh-Hant), language_display: :dialect) ==
+             "Traditional Chinese (Taiwan)"
+
+    assert Cldr.display_name(~l(zh-Hans), language_display: :dialect) ==
+             "Simplified Chinese (China)"
+
     assert Cldr.display_name(~l(zh-Hant)u) == "Chinese (Traditional)"
     assert Cldr.display_name(~l(zh-Hans)u) == "Chinese (Simplified)"
     assert Cldr.display_name(~l(zh-Hant)) == "Chinese (Traditional, Taiwan)"
@@ -66,13 +111,21 @@ defmodule Cldr.LocaleDisplayName.Test do
   test "More complex language tags" do
     import Cldr.LanguageTag.Sigil
 
-    assert Cldr.display_name(~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi"u, locale: "zh-Hant")
-    assert Cldr.display_name(~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi-h0-hybrid"u,
-      locale: "zh-Hant")
+    assert Cldr.display_name(~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi"u,
+             locale: "zh-Hant"
+           )
 
-    assert Cldr.display_name(~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi"u, locale: "zh-Hans")
-    assert Cldr.display_name(~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi-h0-hybrid"u,
-      locale: "zh-Hans")
-  end
+    assert Cldr.display_name(
+             ~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi-h0-hybrid"u,
+             locale: "zh-Hant"
+           )
+
+    assert Cldr.display_name(~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi"u,
+             locale: "zh-Hans"
+           )
 
-end
+    assert Cldr.display_name(
+             ~l"fr-CA-u-ca-gregory-nu-arab-cu-usd-cf-account-ms-uksystem-t-hi-h0-hybrid"u,
+             locale: "zh-Hans"
+           )
+  end

test/support/locale_display_name_generator.ex

@@ -22,16 +22,19 @@ defmodule Cldr.LocaleDisplayNameGenerator do
     {acc, _, _} =
       Enum.reduce(list, {[], nil, nil}, fn
         [line, locale, display], {acc, test_locale, language_display} ->
-          {[[line, test_locale, language_display, locale, display] | acc], test_locale, language_display}
+          {[[line, test_locale, language_display, locale, display] | acc], test_locale,
+           language_display}
 
         [_line, option], {acc, locale, language_display} ->
           case String.split(option, "=") do
             ["@locale", locale] ->
               {acc, locale, language_display}
+
             ["@languageDisplay", language_display] ->
               {acc, locale, String.to_atom(language_display)}
           end
       end)
+
     acc
   end
 end

test/support/test_backend.ex

@@ -2,7 +2,8 @@ require Cldr.LocaleDisplay
 
 defmodule MyApp.Cldr do
   use Cldr,
-    locales: :all, # ["en", "fr", "de", "zh"],
+    # ["en", "fr", "de", "zh"],
+    locales: :all,
     default_locale: "en",
     providers: [Cldr.Territory, Cldr.LocaleDisplay, Cldr.Currency]
 end