From d09574914ca677019e3b2c618d46c616eb015778 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Wed, 18 Sep 2024 18:35:04 +0100 Subject: [PATCH 1/5] Use space indentation for Twine file --- lib/twine/twine_file.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb index f675f7a..3af92a9 100644 --- a/lib/twine/twine_file.rb +++ b/lib/twine/twine_file.rb @@ -213,7 +213,7 @@ module Twine f.puts "[[#{section.name}]]" section.definitions.each do |definition| - f.puts "\t[#{definition.key}]" + f.puts "#{space(2)}[#{definition.key}]" value = write_value(definition, dev_lang, f) if !value && !definition.reference_key @@ -221,14 +221,14 @@ module Twine end if definition.reference_key - f.puts "\t\tref = #{definition.reference_key}" + f.puts "#{space(4)}ref = #{definition.reference_key}" end if definition.tags && definition.tags.length > 0 tag_str = definition.tags.join(',') - f.puts "\t\ttags = #{tag_str}" + f.puts "#{space(4)}tags = #{tag_str}" end if definition.raw_comment and definition.raw_comment.length > 0 - f.puts "\t\tcomment = #{definition.raw_comment}" + f.puts "#{space(4)}comment = #{definition.raw_comment}" end @language_codes[1..-1].each do |lang| write_value(definition, lang, f) @@ -248,9 +248,14 @@ module Twine value = '`' + value + '`' end - file.puts "\t\t#{language} = #{value}" + file.puts "#{space(4)}#{language} = #{value}" return value end + def space(level) + ' ' * level + end + + end end -- 2.45.3 From 523e1875a2794209774cbbccfb852e5abea04918 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Wed, 18 Sep 2024 19:36:24 +0100 Subject: [PATCH 2/5] Output developer language after meta tags This aligns with current OrganicMaps structure of: comment = tag = en = --- lib/twine/twine_file.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb index 3af92a9..119f572 100644 --- a/lib/twine/twine_file.rb +++ b/lib/twine/twine_file.rb @@ -215,11 +215,6 @@ module Twine section.definitions.each do |definition| f.puts "#{space(2)}[#{definition.key}]" - value = write_value(definition, dev_lang, f) - if !value && !definition.reference_key - Twine::stdout.puts "WARNING: #{definition.key} does not exist in developer language '#{dev_lang}'" - end - if definition.reference_key f.puts "#{space(4)}ref = #{definition.reference_key}" end @@ -230,6 +225,12 @@ module Twine if definition.raw_comment and definition.raw_comment.length > 0 f.puts "#{space(4)}comment = #{definition.raw_comment}" end + + value = write_value(definition, dev_lang, f) + if !value && !definition.reference_key + Twine::stdout.puts "WARNING: #{definition.key} does not exist in developer language '#{dev_lang}'" + end + @language_codes[1..-1].each do |lang| write_value(definition, lang, f) end -- 2.45.3 From e9386d15bf66fc3355ecca6400fdab751692c313 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Wed, 18 Sep 2024 21:03:48 +0100 Subject: [PATCH 3/5] Keep derivatives of dev language close to the top allows: en = en-GB = before alphabetical sorting Aligns with existing and is more logical --- lib/twine/twine_file.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb index 119f572..e1d3953 100644 --- a/lib/twine/twine_file.rb +++ b/lib/twine/twine_file.rb @@ -232,7 +232,15 @@ module Twine end @language_codes[1..-1].each do |lang| - write_value(definition, lang, f) + if lang =~ /^#{dev_lang}/ + write_value(definition, lang, f) + end + end + + @language_codes[1..-1].each do |lang| + if not lang =~ /^#{dev_lang}/ + write_value(definition, lang, f) + end end end end -- 2.45.3 From a1d5145558af3d65bc2af9de56a1ae9296739d93 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Wed, 18 Sep 2024 18:39:35 +0100 Subject: [PATCH 4/5] Order meta data as comment, tags, ref OrganicMaps: comment = tags = ref = dev-LANG = other-LANG = Twine original: dev-LANG = ref = tags = comment = other-LANG = fix --- lib/twine/twine_file.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb index e1d3953..f0bae04 100644 --- a/lib/twine/twine_file.rb +++ b/lib/twine/twine_file.rb @@ -215,15 +215,15 @@ module Twine section.definitions.each do |definition| f.puts "#{space(2)}[#{definition.key}]" - if definition.reference_key - f.puts "#{space(4)}ref = #{definition.reference_key}" + if definition.raw_comment and definition.raw_comment.length > 0 + f.puts "#{space(4)}comment = #{definition.raw_comment}" end if definition.tags && definition.tags.length > 0 tag_str = definition.tags.join(',') f.puts "#{space(4)}tags = #{tag_str}" end - if definition.raw_comment and definition.raw_comment.length > 0 - f.puts "#{space(4)}comment = #{definition.raw_comment}" + if definition.reference_key + f.puts "#{space(4)}ref = #{definition.reference_key}" end value = write_value(definition, dev_lang, f) -- 2.45.3 From c9abfdfd514125d45773197875d1c78c62a7c7d1 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Wed, 18 Sep 2024 19:58:25 +0100 Subject: [PATCH 5/5] Insert space before each translation block --- lib/twine/twine_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb index f0bae04..9d0a1e5 100644 --- a/lib/twine/twine_file.rb +++ b/lib/twine/twine_file.rb @@ -213,7 +213,7 @@ module Twine f.puts "[[#{section.name}]]" section.definitions.each do |definition| - f.puts "#{space(2)}[#{definition.key}]" + f.puts "\n#{space(2)}[#{definition.key}]" if definition.raw_comment and definition.raw_comment.length > 0 f.puts "#{space(4)}comment = #{definition.raw_comment}" -- 2.45.3