Fix concatenation of sigils (#412)

Author: Gladear

lib/gettext/macros.ex

@@ -709,15 +709,29 @@ defmodule Gettext.Macros do
       """
     end
 
-    # We support nil too in order to fall back to a nil context and always use the *p
-    # variants of the Gettext macros.
+    validated_expand_to_binary(term, env, raiser)
+  end
+
+  defp validated_expand_to_binary({:<>, _, pieces}, env, raiser) do
+    Enum.map_join(pieces, &validated_expand_to_binary(&1, env, raiser))
+  end
+
+  defp validated_expand_to_binary({:<<>>, _, pieces}, env, raiser) do
+    Enum.map_join(pieces, &validated_expand_to_binary(&1, env, raiser))
+  end
+
+  # We support nil too in order to fall back to a nil context and always use the *p
+  # variants of the Gettext macros.
+  defp validated_expand_to_binary(term, _env, _raiser)
+       when is_binary(term) or is_nil(term) do
+    term
+  end
+
+  defp validated_expand_to_binary(term, env, raiser) do
     case Macro.expand(term, env) do
       term when is_binary(term) or is_nil(term) ->
         term
 
-      {:<<>>, _, pieces} = term ->
-        if Enum.all?(pieces, &is_binary/1), do: Enum.join(pieces), else: raiser.(term)
-
       other ->
         raiser.(other)
     end

test/gettext/macros_test.exs

@@ -15,12 +15,19 @@ defmodule Gettext.MacrosTest do
   @backend Gettext.MacrosTest.Translator
   @gettext_msgid "Hello world"
 
-  describe "gettext/2" do
+  describe "gettext/1" do
     test "supports binary-ish msgid at compile-time" do
       Gettext.put_locale(@backend, "it")
       assert gettext("Hello world") == "Ciao mondo"
       assert gettext(@gettext_msgid) == "Ciao mondo"
       assert gettext(~s(Hello world)) == "Ciao mondo"
+      assert gettext("Hello " <> "world") == "Ciao mondo"
+      assert gettext("Hello " <> "wor" <> "ld") == "Ciao mondo"
+      assert gettext(<<"Hello world">>) == "Ciao mondo"
+      assert gettext(<<"Hello ", "world">>) == "Ciao mondo"
+      assert gettext("Hello " <> <<"wor", "ld">>) == "Ciao mondo"
+      assert gettext("Hello " <> ~s(world)) == "Ciao mondo"
+      assert gettext(~S(Hello ) <> ~s(world)) == "Ciao mondo"
     end
   end