Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warn user if conflicting plural messages are defined #401

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion lib/gettext/extractor_agent.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ defmodule Gettext.ExtractorAgent do

use Agent

require Logger

alias Expo.Message

@name __MODULE__
Expand Down Expand Up @@ -75,12 +77,45 @@ defmodule Gettext.ExtractorAgent do
end)
end

defp merge_messages(message_1, message_2) do
defp merge_messages(%Message.Singular{} = message_1, %Message.Plural{} = message_2) do
# Flipping the arguments to make sure that the pluaral message (more information) is used as the base message
merge_messages(message_2, message_1)
end

defp merge_messages(%Message.Plural{} = message_1, %Message.Plural{} = message_2) do
# Make sure message choice is deterministic
[message_1, message_2] =
Enum.sort_by([message_1, message_2], &IO.iodata_to_binary(&1.msgid_plural))
maennchen marked this conversation as resolved.
Show resolved Hide resolved

if IO.iodata_to_binary(message_1.msgid_plural) != IO.iodata_to_binary(message_2.msgid_plural) do
Logger.warning("""
Plural message for '#{IO.iodata_to_binary(message_1.msgid)}' is not matching:
Using '#{IO.iodata_to_binary(message_2.msgid_plural)}' instead of '#{IO.iodata_to_binary(message_1.msgid_plural)}'.
References: #{dump_references(message_1.references ++ message_2.references)}\
""")
maennchen marked this conversation as resolved.
Show resolved Hide resolved
end

merge_messages_after_checks(message_1, message_2)
end

defp merge_messages(message_1, message_2), do: merge_messages_after_checks(message_1, message_2)

defp merge_messages_after_checks(message_1, message_2) do
message_1
|> Map.put(:references, message_1.references ++ message_2.references)
|> Map.put(
:extracted_comments,
Enum.uniq(message_1.extracted_comments ++ message_2.extracted_comments)
)
end

defp dump_references(references) do
references
|> List.flatten()
|> Enum.map(fn
{file, line} -> [file, ":", Integer.to_string(line)]
file -> file
end)
|> Enum.intersperse(", ")
end
end
44 changes: 41 additions & 3 deletions test/gettext/extractor_test.exs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
defmodule Gettext.ExtractorTest do
use ExUnit.Case

import ExUnit.CaptureLog

alias Expo.Message
alias Expo.Messages
alias Gettext.Extractor
Expand Down Expand Up @@ -322,6 +324,8 @@ defmodule Gettext.ExtractorTest do
Gettext.Macros.gettext_comment("repeated comment")
Gettext.Macros.gettext_with_backend(Gettext.ExtractorTest.MyGettext, "foo")
Gettext.Macros.dngettext_with_backend(Gettext.ExtractorTest.MyGettext, "errors", "one error", "%{count} errors", 2)
Gettext.Macros.dngettext_with_backend(Gettext.ExtractorTest.MyGettext, "errors", "one error", "%{count} errors", 2)
Gettext.Macros.dgettext_with_backend(Gettext.ExtractorTest.MyGettext, "errors", "one error")
Gettext.Macros.gettext_comment("one more comment")
Gettext.Macros.gettext_comment("repeated comment")
Gettext.Macros.gettext_comment("repeated comment")
Expand All @@ -345,12 +349,12 @@ defmodule Gettext.ExtractorTest do
#. repeated comment
#. one more comment
#: foo.ex:16
#: foo.ex:21
#: foo.ex:23
#, elixir-autogen, elixir-format
msgid "foo"
msgstr ""

#: foo.ex:23
#: foo.ex:25
#, elixir-autogen, elixir-format
msgctxt "test"
msgid "context based message"
Expand All @@ -362,6 +366,8 @@ defmodule Gettext.ExtractorTest do
msgstr ""

#: foo.ex:17
#: foo.ex:18
#: foo.ex:19
#, elixir-autogen, elixir-format
msgid "one error"
msgid_plural "%{count} errors"
Expand All @@ -373,7 +379,7 @@ defmodule Gettext.ExtractorTest do
msgid ""
msgstr ""

#: foo.ex:22
#: foo.ex:24
#, elixir-autogen, elixir-format
msgid "hi"
msgstr ""
Expand Down Expand Up @@ -435,6 +441,38 @@ defmodule Gettext.ExtractorTest do
Extractor.disable()
end

test "warns on conflicting plural messages" do
refute Extractor.extracting?()
Extractor.enable()
assert Extractor.extracting?()

code = """
defmodule Gettext.ExtractorTest.ConflictingPlural.Gettext do
use Gettext.Backend, otp_app: :test_conflicting_plural
end

defmodule Gettext.ExtractorTest.ConflictingPlural.Foo do
require Gettext.Macros

def bar do
Gettext.Macros.dngettext_with_backend(Gettext.ExtractorTest.ConflictingPlural.Gettext, "errors", "one error", "%{count} errors", 2)
Gettext.Macros.dngettext_with_backend(Gettext.ExtractorTest.ConflictingPlural.Gettext, "errors", "one error", "multiple errors", 2)
end
end
"""

assert capture_log(fn ->
Code.compile_string(code, Path.join(File.cwd!(), "foo.ex"))
end) =~
"""
Plural message for 'one error' is not matching:
Using 'multiple errors' instead of '%{count} errors'.
References: foo.ex:9, foo.ex:10
"""
after
Extractor.disable()
end

defp write_file(path, contents) do
path |> Path.dirname() |> File.mkdir_p!()
File.write!(path, contents)
Expand Down