Further modularized Abstract formatter so it's easier to meed special requirements like in the Django and Gettext formatters.

lib/twine/formatters/abstract.rb

@@ -166,21 +166,24 @@ module Twine
         result += rows.join
       end
 
-      def format_row(row, lang)
-        value = row.translated_string_for_lang(lang)
-
-        return nil unless value
-
-        result = ""
-        if row.comment
-          comment = format_comment(row.comment)
-          result += comment + "\n" if comment
-        end
-
-        result += key_value_pattern % { key: format_key(row.key.dup), value: format_value(value.dup) }
+      def row_pattern
+        "%{comment}%{key_value}"
       end
 
-      def format_comment(comment)
+      def format_row(row, lang)
+        return nil unless row.translated_string_for_lang(lang)
+
+        result = row_pattern.scan(/%\{([a-z_]+)\}/).flatten
+        result.map! { |element| send("format_#{element}".to_sym, row, lang) }
+        result.flatten.join
+      end
+
+      def format_comment(row, lang)
+      end
+
+      def format_key_value(row, lang)
+        value = row.translated_string_for_lang(lang)
+        key_value_pattern % { key: format_key(row.key.dup), value: format_value(value.dup) }
       end
 
       def key_value_pattern

lib/twine/formatters/android.rb

@@ -105,8 +105,8 @@ module Twine
         "\t<!-- SECTION: #{section.name} -->"
       end
 
-      def format_comment(comment)
-        "\t<!-- #{comment.gsub('--', '—')} -->"
+      def format_comment(row, lang)
+        "\t<!-- #{row.comment.gsub('--', '—')} -->\n" if row.comment
       end
 
       def key_value_pattern

lib/twine/formatters/apple.rb

@@ -98,8 +98,8 @@ module Twine
         "\"%{key}\" = \"%{value}\";\n"
       end
 
-      def format_comment(comment)
-        "/* #{comment.gsub('*/', '* /')} */"
+      def format_comment(row, lang)
+        "/* #{row.comment.gsub('*/', '* /')} */\n" if row.comment
       end
 
       def format_key(key)

lib/twine/formatters/django.rb

@@ -103,19 +103,13 @@ module Twine
         "#--------- #{section.name} ---------#\n"
       end
 
-      def format_row(row, lang)
-        value = row.translated_string_for_lang(lang)
+      def row_pattern
+        "%{comment}%{base_translation}%{key_value}"
+      end
 
-        return nil unless value
-
-        result = ""
-        if row.comment
-          comment = format_comment(row.comment)
-          result += comment + "\n" if comment
-        end
-
-        result += "# base translation: \"#{row.translations[@default_lang]}\"\n"
-        result += key_value_pattern % { key: format_key(row.key.dup), value: format_value(value.dup) }
+      def format_base_translation(row, lang)
+        base_translation = row.translations[@default_lang]
+        "# base translation: \"#{base_translation}\"\n" if base_translation
       end
 
       def key_value_pattern
@@ -123,8 +117,8 @@ module Twine
         "msgstr \"%{value}\"\n"
       end
 
-      def format_comment(comment)
-        "#. #{escape_quotes(comment)}"
+      def format_comment(row, lang)
+        "#. #{escape_quotes(row.comment)}\n" if row.comment
       end
 
       def format_key(key)

lib/twine/formatters/flash.rb

@@ -78,8 +78,8 @@ module Twine
         "## #{section.name} ##\n"
       end
 
-      def format_comment(comment)
-        "# #{comment}"
+      def format_comment(row, lang)
+        "# #{row.comment}\n" if row.comment
       end
 
       def key_value_pattern

lib/twine/formatters/gettext.rb

@@ -73,26 +73,30 @@ module Twine
         "# SECTION: #{section.name}"
       end
 
+      def row_pattern
+        "%{comment}%{key}%{base_translation}%{value}"
+      end
+
       def format_row(row, lang)
         return nil unless row.translated_string_for_lang(@default_lang)
 
-        value = row.translated_string_for_lang(lang)
-
-        return nil unless value
-
-        result = ""
-        if row.comment
-          comment = format_comment(row.comment)
-          result += comment + "\n" if comment
-        end
-
-        result += "msgctxt \"#{format_key(row.key.dup)}\"\n"
-        result += "msgid \"#{format_value(row.translations[@default_lang])}\"\n"
-        result += "msgstr \"#{format_value(value)}\"\n"
+        super
       end
 
-      def format_comment(comment)
-        "#. \"#{escape_quotes(comment)}\""
+      def format_comment(row, lang)
+        "#. \"#{escape_quotes(row.comment)}\"\n" if row.comment
+      end
+
+      def format_key(row, lang)
+        "msgctxt \"#{row.key.dup}\"\n"
+      end
+
+      def format_base_translation(row, lang)
+        "msgid \"#{row.translations[@default_lang]}\"\n"
+      end
+
+      def format_value(row, lang)
+        "msgstr \"#{row.translated_string_for_lang(lang)}\"\n"
       end
     end
   end

lib/twine/formatters/tizen.rb

@@ -127,8 +127,8 @@ module Twine
         "\t<!-- SECTION: #{section.name} -->"
       end
 
-      def format_comment(comment)
-        "\t<!-- #{comment.gsub('--', '—')} -->"
+      def format_comment(row, lang)
+        "\t<!-- #{row.comment.gsub('--', '—')} -->\n" if row.comment
       end
 
       def key_value_pattern