From 1b9aaf5a5909f130ede03bcab8be4aadaf9868d1 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 2 Nov 2021 12:26:34 +0300
Subject: [PATCH] Tune whitespacing settings to be compatible with Weblate

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
---
 lib/twine/formatters/abstract.rb     |  4 ++--
 lib/twine/formatters/android.rb      | 18 +++++++++---------
 lib/twine/formatters/apple.rb        |  6 +++---
 lib/twine/formatters/apple_plural.rb |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/twine/formatters/abstract.rb b/lib/twine/formatters/abstract.rb
index ad70f3aa..6e96a1d1 100644
--- a/lib/twine/formatters/abstract.rb
+++ b/lib/twine/formatters/abstract.rb
@@ -103,7 +103,7 @@ def format_file(lang)
 
         header = format_header(lang)
         result = ""
-        result += header + "\n" if header
+        result += header if header
         result += format_sections(processed_twine_file, lang)
       end
 
@@ -130,7 +130,7 @@ def format_section(section, lang)
 
         if section.name && section.name.length > 0
           section_header = format_section_header(section)
-          result += "\n#{section_header}" if section_header
+          result += "#{section_header}" if section_header
         end
 
         definitions.map! { |definition| format_definition(definition, lang) }
diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index 01468cf8..34adbed8 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -94,33 +94,33 @@ def read(io, lang)
       end
 
       def format_header(lang)
-        "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<!-- Android Strings File -->\n<!-- Generated by Twine #{Twine::VERSION} -->\n<!-- Language: #{lang} -->"
+        "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<!-- Android Strings File --><!-- Generated by Twine #{Twine::VERSION} --><!-- Language: #{lang} -->"
       end
 
       def format_sections(twine_file, lang)
-        result = '<resources>'
+        result = "<resources>\n"
         
         result += super + "\n"
 
-        result += "</resources>\n"
+        result += "</resources>"
       end
 
       def format_section_header(section)
-        "\t<!-- SECTION: #{section.name} -->"
+        "    <!-- SECTION: #{section.name} -->"
       end
 
       def format_comment(definition, lang)
-        "\t<!-- #{definition.comment.gsub('--', '—')} -->\n" if definition.comment
+        "    <!-- #{definition.comment.gsub('--', '—')} -->\n" if definition.comment
       end
 
       def key_value_pattern
-        "\t<string name=\"%{key}\">%{value}</string>"
+        "    <string name=\"%{key}\">%{value}</string>"
       end
 
       def format_plural_keys(key, plural_hash)
-        result = "\t<plurals name=\"#{key}\">\n"
-        result += plural_hash.map{|quantity,value| "\t#{' ' * 2}<item quantity=\"#{quantity}\">#{escape_value(value)}</item>"}.join("\n")
-        result += "\n\t</plurals>"
+        result = "    <plurals name=\"#{key}\">\n"
+        result += plural_hash.map{|quantity,value| "    #{' ' * 4}<item quantity=\"#{quantity}\">#{escape_value(value)}</item>"}.join("\n")
+        result += "\n    </plurals>"
       end
 
       def gsub_unless(text, pattern, replacement)
diff --git a/lib/twine/formatters/apple.rb b/lib/twine/formatters/apple.rb
index 62dfcc05..47dbc2bc 100644
--- a/lib/twine/formatters/apple.rb
+++ b/lib/twine/formatters/apple.rb
@@ -68,15 +68,15 @@ def format_header(lang)
       end
 
       def format_section_header(section)
-        "/********** #{section.name} **********/\n"
+        "\n\n/********** #{section.name} **********/\n"
       end
 
       def key_value_pattern
-        "\"%{key}\" = \"%{value}\";\n"
+        "\"%{key}\" = \"%{value}\";"
       end
 
       def format_comment(definition, lang)
-        "/* #{definition.comment.gsub('*/', '* /')} */\n" if definition.comment
+        "\n/* #{definition.comment.gsub('*/', '* /')} */\n" if definition.comment
       end
 
       def format_key(key)
diff --git a/lib/twine/formatters/apple_plural.rb b/lib/twine/formatters/apple_plural.rb
index c53f02b4..1c1efda4 100644
--- a/lib/twine/formatters/apple_plural.rb
+++ b/lib/twine/formatters/apple_plural.rb
@@ -28,7 +28,7 @@ def format_header(lang)
         header = "<!--\n * Apple Stringsdict File\n * Generated by Twine #{Twine::VERSION}\n * Language: #{lang} -->\n"
         header += "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>\n"
         header += "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-        header += "<plist version=\"1.0\">\n<dict>"
+        header += "<plist version=\"1.0\">\n<dict>\n"
       end
 
       def format_section_header(section)