organicmaps/twine
Archived
13
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity Actions

Consistent space indents for Android strings

Browse source 
Indent with 4 spaces and fix the broken plural \t\s*2 indentation
This commit is contained in:
Dwayne Bailey 2024-08-07 16:17:56 +01:00
parent 4cfda06f87
commit 1aeee66812
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/twine/formatters/android.rb
View file

@ -108,21 +108,25 @@ module Twine
end end
def format_section_header(section) def format_section_header(section)
"\t<!-- SECTION: #{section.name} -->" "#{space(4)}<!-- SECTION: #{section.name} -->"
end end
def format_comment(definition, lang) def format_comment(definition, lang)
"\t<!-- #{definition.comment.gsub('--', '—')} -->\n" if definition.comment "#{space(4)}<!-- #{definition.comment.gsub('--', '—')} -->\n" if definition.comment
end end
def key_value_pattern def key_value_pattern
"\t<string name=\"%{key}\">%{value}</string>" "#{space(4)}<string name=\"%{key}\">%{value}</string>"
end end
def format_plural_keys(key, plural_hash) def format_plural_keys(key, plural_hash)
result = "\t<plurals name=\"#{key}\">\n" result = "#{space(4)}<plurals name=\"#{key}\">\n"
result += plural_hash.map{|quantity,value| "\t#{' ' * 2}<item quantity=\"#{quantity}\">#{escape_value(value)}</item>"}.join("\n") result += plural_hash.map{|quantity,value| "#{space(8)}<item quantity=\"#{quantity}\">#{escape_value(value)}</item>"}.join("\n")
result += "\n\t</plurals>" result += "\n#{space(4)}</plurals>"
end
def space(level)
' ' * level
end end
def gsub_unless(text, pattern, replacement) def gsub_unless(text, pattern, replacement)

16
test/fixtures/formatter_android.xml vendored
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- SECTION: Section 1 --> <!-- SECTION: Section 1 -->
<!-- comment key1 --> <!-- comment key1 -->
<string name="key1">value1-english</string> <string name="key1">value1-english</string>
<string name="key2">value2-english</string> <string name="key2">value2-english</string>
<!-- SECTION: Section 2 --> <!-- SECTION: Section 2 -->
<string name="key3">value3-english</string> <string name="key3">value3-english</string>
<!-- comment key4 --> <!-- comment key4 -->
<string name="key4">value4-english</string> <string name="key4">value4-english</string>
</resources> </resources>