Don't force the "elixir-format" flag when merging

elixir-gettext · Jul 31, 2023 · b9bd1cd · b9bd1cd
1 parent d7e1bef
commit b9bd1cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/gettext.ex b/lib/gettext.ex
@@ -587,9 +587,9 @@ defmodule Gettext do
  removing messages that you have extracted using another tool.
 
  * `:custom_flags_to_keep` - a list of custom flags that will be kept for
- existing messages during a merge. Gettext always keeps the `elixir-format`
- and `fuzzy` flags.
- 
+ existing messages during a merge. Gettext always keeps the `fuzzy` flag.
+ If you want to keep the `elixir-format` flag, which is also commonly
+ used by Gettext, add it to this list.
 
  * `:write_reference_comments` - a boolean that specifies whether reference
  comments should be written when outputting PO(T) files. If this is `false`,

diff --git a/lib/gettext/merger.ex b/lib/gettext/merger.ex
@@ -234,9 +234,9 @@ defmodule Gettext.Merger do
  }
  end
 
- @default_flags_to_keep ["elixir-format", "fuzzy"]
  defp merge_flags(old_message, new_message, custom_flags_to_keep) do
- flags_to_keep = Enum.uniq(@default_flags_to_keep ++ custom_flags_to_keep)
+ # Force the "fuzzy" flag.
+ flags_to_keep = Enum.uniq(["fuzzy" | custom_flags_to_keep])
 
  %{flags: flags} =
  Enum.reduce(flags_to_keep, new_message, fn flag, message ->