From 1aeee66812ed91885f1233e1607f3272059a49b1 Mon Sep 17 00:00:00 2001
From: Dwayne Bailey <dwayne@translatehouse.co.uk>
Date: Wed, 7 Aug 2024 16:17:56 +0100
Subject: [PATCH] Consistent space indents for Android strings

Indent with 4 spaces and fix the broken plural \t\s*2 indentation
---
 lib/twine/formatters/android.rb     | 16 ++++++++++------
 test/fixtures/formatter_android.xml | 16 ++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index eabef60..bbcf5c7 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -108,21 +108,25 @@ module Twine
       end
 
       def format_section_header(section)
-        "\t<!-- SECTION: #{section.name} -->"
+        "#{space(4)}<!-- SECTION: #{section.name} -->"
       end
 
       def format_comment(definition, lang)
-        "\t<!-- #{definition.comment.gsub('--', '—')} -->\n" if definition.comment
+        "#{space(4)}<!-- #{definition.comment.gsub('--', '—')} -->\n" if definition.comment
       end
 
       def key_value_pattern
-        "\t<string name=\"%{key}\">%{value}</string>"
+        "#{space(4)}<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 = "#{space(4)}<plurals name=\"#{key}\">\n"
+        result += plural_hash.map{|quantity,value| "#{space(8)}<item quantity=\"#{quantity}\">#{escape_value(value)}</item>"}.join("\n")
+        result += "\n#{space(4)}</plurals>"
+      end
+
+      def space(level)
+        ' ' * level
       end
 
       def gsub_unless(text, pattern, replacement)
diff --git a/test/fixtures/formatter_android.xml b/test/fixtures/formatter_android.xml
index fe7d15f..7fcb655 100644
--- a/test/fixtures/formatter_android.xml
+++ b/test/fixtures/formatter_android.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<!-- SECTION: Section 1 -->
-	<!-- comment key1 -->
-	<string name="key1">value1-english</string>
-	<string name="key2">value2-english</string>
+    <!-- SECTION: Section 1 -->
+    <!-- comment key1 -->
+    <string name="key1">value1-english</string>
+    <string name="key2">value2-english</string>
 
-	<!-- SECTION: Section 2 -->
-	<string name="key3">value3-english</string>
-	<!-- comment key4 -->
-	<string name="key4">value4-english</string>
+    <!-- SECTION: Section 2 -->
+    <string name="key3">value3-english</string>
+    <!-- comment key4 -->
+    <string name="key4">value4-english</string>
 </resources>