Fix compound locales with scripts. Release 1.1

elixir-cldr · Jul 3, 2021 · 4a32fd0 · 4a32fd0
1 parent db48d61
commit 4a32fd0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,15 @@
 
 ## Cldr Locale Display v1.1.0
 
-This is the changelog for Cldr Locale Display v1.1.0 released on ______, 2021.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_locale_display/tags)
+This is the changelog for Cldr Locale Display v1.1.0 released on July 3rd, 2021.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_locale_display/tags)
+
+### Bug Fixes
+
+* Correct an issue when the compound name includes the script (like zh-Hant).
 
 ### Enhancements
 
-* A `display_names/2` to backend modules.
+* Add `display_names/{1,2}` to backend modules.
 
 ## Cldr Locale Display v1.0.0
 

diff --git a/lib/cldr/backend.ex b/lib/cldr/backend.ex
@@ -166,7 +166,7 @@ defmodule Cldr.LocaleDisplay.Backend do
         """
         @doc since: "1.1.0"
 
-        @spec display_name(
+        @spec display_name!(
                 Cldr.Locale.locale_name() | Cldr.LanguageTag.t(),
                 Cldr.LocaleDisplay.display_options()
               ) ::

diff --git a/lib/cldr/locale_display.ex b/lib/cldr/locale_display.ex
@@ -205,7 +205,7 @@ defmodule Cldr.LocaleDisplay do
       "anglais américain (calendrier grégorien, devise : A$)"
 
   """
-  @spec display_name(Cldr.Locale.locale_name() | Cldr.LanguageTag.t(), display_options()) ::
+  @spec display_name!(Cldr.Locale.locale_name() | Cldr.LanguageTag.t(), display_options()) ::
           String.t() | no_return()
 
   def display_name!(language_tag, options \\ []) do
@@ -242,7 +242,7 @@ defmodule Cldr.LocaleDisplay do
   # If we don't want a compound language then we need to omit
   # the territory when matching but restore is afterwards so
   # its generated as a subtag
-  @reinstate_subtags [:script, :territory]
+  @reinstate_subtags [:territory]
 
   defp first_match(
          language_tag,

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Cldr.LocaleDisplay.MixProject do
   use Mix.Project
 
-  @version "1.1.0-dev"
+  @version "1.1.0"
 
   def project do
     [

diff --git a/test/locale_display_name_test.exs b/test/locale_display_name_test.exs
@@ -28,5 +28,9 @@ defmodule Cldr.LocaleDisplayName.Test do
     import Cldr.LanguageTag.Sigil
 
     assert Cldr.display_name(~l(en)u) == "English"
+    assert Cldr.display_name(~l(zh-Hans)u) == "Simplified Chinese"
+    assert Cldr.display_name(~l(zh-Hant)u) == "Traditional Chinese"
+    assert Cldr.display_name(~l(zh-Hant)) == "Traditional Chinese (Taiwan)"
+    assert Cldr.display_name(~l(zh-Hans)) == "Simplified Chinese (China)"
   end
 end