Remove several TODOs

Author: whatyouhide

lib/gettext/merger.ex

@@ -54,10 +54,7 @@ defmodule Gettext.Merger do
           {Messages.t(), map()}
   def merge(%Messages{} = old, %Messages{} = new, locale, opts, gettext_config)
       when is_binary(locale) and is_list(opts) do
-    opts =
-      opts
-      |> handle_deprecated_plural_forms()
-      |> put_plural_forms_opt(old, locale)
+    opts = put_plural_forms_opt(opts, old, locale)
 
     stats = %{new: 0, exact_matches: 0, fuzzy_matches: 0, removed: 0, marked_as_obsolete: 0}
 
@@ -73,32 +70,6 @@ defmodule Gettext.Merger do
     {po, stats}
   end
 
-  # TODO: remove in v0.24.0
-  defp handle_deprecated_plural_forms(opts) do
-    plural_forms = Keyword.get(opts, :plural_forms)
-
-    cond do
-      is_nil(plural_forms) ->
-        opts
-
-      Keyword.has_key?(opts, :plural_forms_header) ->
-        raise ArgumentError, """
-        --plural-forms (or :plural_forms) and --plural-forms-header (or :plural_forms_header) \
-        cannot be used together\
-        """
-
-      true ->
-        IO.warn("""
-        The --plural-forms and :plural_forms options are deprecated. If your files \
-        have a Plural-Forms header, Gettext will use that to determin the number of plural \
-        forms for the locale. Otherwise, you can pass a Plural-Forms header via the \
-        --plural-forms-header or :plural_forms_header option.\
-        """)
-
-        Keyword.put(opts, :plural_forms_header, "nplurals=#{plural_forms}")
-    end
-  end
-
   defp merge_messages(old, new, opts, gettext_config, stats) do
     fuzzy? = Keyword.fetch!(opts, :fuzzy)
     fuzzy_threshold = Keyword.fetch!(opts, :fuzzy_threshold)

lib/gettext/plural.ex

@@ -362,7 +362,7 @@ defmodule Gettext.Plural do
 
   @doc false
   def plural_info(locale, messages_struct, plural_mod) do
-    ensure_compiled!(plural_mod)
+    Code.ensure_compiled!(plural_mod)
 
     if function_exported?(plural_mod, :init, 1) do
       pluralization_context =
@@ -379,7 +379,7 @@ defmodule Gettext.Plural do
 
   @doc false
   def plural_forms_header_impl(locale, messages_struct, plural_mod) do
-    ensure_compiled!(plural_mod)
+    Code.ensure_compiled!(plural_mod)
 
     plural_forms_header =
       if function_exported?(plural_mod, :plural_forms_header, 1) do
@@ -393,20 +393,4 @@ defmodule Gettext.Plural do
       "nplurals=#{nplurals}"
     end
   end
-
-  # TODO: remove when we depend on Elixir 1.12+
-  if function_exported?(Code, :ensure_compiled!, 1) do
-    defp ensure_compiled!(mod), do: Code.ensure_compiled!(mod)
-  else
-    defp ensure_compiled!(mod) do
-      case Code.ensure_compiled(mod) do
-        {:module, ^mod} ->
-          mod
-
-        {:error, reason} ->
-          raise ArgumentError,
-                "could not load module #{inspect(mod)} due to reason #{inspect(reason)}"
-      end
-    end
-  end
 end

lib/mix/tasks/gettext.merge.ex

@@ -129,10 +129,7 @@ defmodule Mix.Tasks.Gettext.Merge do
     fuzzy_threshold: :float,
     plural_forms_header: :string,
     on_obsolete: :string,
-    store_previous_message_on_fuzzy_match: :boolean,
-
-    # TODO: remove in v0.24.0
-    plural_forms: :integer
+    store_previous_message_on_fuzzy_match: :boolean
   ]
 
   @impl true
@@ -295,7 +292,6 @@ defmodule Mix.Tasks.Gettext.Merge do
       |> Keyword.take([
         :fuzzy,
         :fuzzy_threshold,
-        :plural_forms,
         :plural_forms_header,
         :on_obsolete,
         :store_previous_message_on_fuzzy_match

test/gettext/merger_test.exs

@@ -496,35 +496,6 @@ defmodule Gettext.MergerTest do
       assert stderr =~ ~s(Plural-Forms headers in the form "nplurals=<int>")
     end
 
-    # TODO: remove in v0.24.0
-    test "plural forms can be specified as an option, but is deprecated" do
-      old_po = %Messages{messages: []}
-
-      new_pot = %Messages{
-        messages: [
-          %Message.Singular{msgid: "a"},
-          %Message.Plural{msgid: "b", msgid_plural: "bs"}
-        ]
-      }
-
-      opts = [plural_forms: 1] ++ @opts
-
-      stderr =
-        capture_io(:stderr, fn ->
-          assert {%Messages{messages: [message, plural_message]}, _stats} =
-                   Merger.merge(old_po, new_pot, "en", opts, @gettext_config)
-
-          assert message.msgid == "a"
-
-          assert plural_message.msgid == "b"
-          assert plural_message.msgid_plural == "bs"
-          assert plural_message.msgstr == %{0 => [""]}
-        end)
-
-      assert stderr =~ "warning"
-      assert stderr =~ "The --plural-forms and :plural_forms options are deprecated"
-    end
-
     test "custom flags defined by :custom_flag_to_keep config are kept" do
       old_po = %Messages{
         messages: [

test/mix/tasks/gettext.merge_test.exs

@@ -36,54 +36,6 @@ defmodule Mix.Tasks.Gettext.MergeTest do
     end
   end
 
-  @tag :tmp_dir
-  test "passing :plural_forms alongside :plural_forms_header raises an error", %{tmp_dir: tmp_dir} do
-    write_file(Path.join(tmp_dir, "foo.pot"), """
-    msgid "hello"
-    msgstr ""
-    """)
-
-    write_file(Path.join(tmp_dir, "it/LC_MESSAGES/foo.po"), "")
-
-    assert_raise ArgumentError, ~r/cannot be used together/, fn ->
-      run([
-        Path.join(tmp_dir, "it/LC_MESSAGES/foo.po"),
-        Path.join(tmp_dir, "foo.pot"),
-        "--plural-forms",
-        "3",
-        "--plural-forms-header",
-        "nplurals=1;plural=n>1;"
-      ])
-    end
-  end
-
-  # TODO: remove in v0.24.0
-  @tag :tmp_dir
-  test ":plural_forms is deprecated", %{tmp_dir: tmp_dir} do
-    pot_contents = """
-    msgid "hello"
-    msgstr ""
-    """
-
-    write_file(Path.join(tmp_dir, "foo.pot"), pot_contents)
-    write_file(Path.join(tmp_dir, "it/LC_MESSAGES/foo.po"), "")
-
-    warning =
-      capture_io(:stderr, fn ->
-        capture_io(:stdio, fn ->
-          run([
-            Path.join(tmp_dir, "it/LC_MESSAGES/foo.po"),
-            Path.join(tmp_dir, "foo.pot"),
-            "--plural-forms",
-            "3"
-          ])
-        end)
-      end)
-
-    assert warning =~ "warning"
-    assert warning =~ "The --plural-forms and :plural_forms options are deprecated"
-  end
-
   @tag :tmp_dir
   test "merging an existing PO file with a new POT file", %{tmp_dir: tmp_dir} do
     pot_contents = """