twine 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c61dcacafc740f0edf24674f331c77c83b1d94b
-  data.tar.gz: e45d63d180e8d396194d1f86d408acefb6813886
+  metadata.gz: e3466fcfcd027a2fd2af846ddd8bdba4d822cd39
+  data.tar.gz: 7f5df06f8206324c53d5e23de67aa8e35d90a6aa
 SHA512:
-  metadata.gz: 05f6f055d5eb781de1173a0556921e286381a0effbe328a8be5d586405fc10b0a25fc2e1c235f58a9ddbd96264f3fd3a1f27bc965386302e9522c1806184b961
-  data.tar.gz: ef330b79c5c17f265823e2646b04f30e7a415cf39569148968f5708cee40c7b2108dc9de64f5facfced1d8ec35d6e7a1ed129d3677234ab38f5a6b10126cfb4f
+  metadata.gz: 04dbdfb83e0ba690b5893d6b52539ae65b2ad687a6143fb7f998cacb6671418ff8ecedb0731ccf0404cc5f56b93b68ac2c1459ced44ddf840551ceea351cffcf
+  data.tar.gz: a9e1c41cdcea98f785eff464dde70f2883ea3b9080e40fce4271bbe429faafa98c1a756820d8fba189d560bc6b9e7751555b50ea0412ccfdd12e7247933ecdfb

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -76,6 +76,7 @@ Twine currently supports the following formats for outputting strings:
 * [Android String Resources][androidstrings] (format: android)
 * [Gettext PO Files][gettextpo] (format: gettext)
 * [jquery-localize Language Files][jquerylocalize] (format: jquery)
+* [Django PO Files][djangopo] (format: django)
 
 If you would like to enable twine to create language files in another format, create an appropriate formatter in `lib/twine/formatters`.
 
@@ -157,15 +158,23 @@ It is easy to incorporate Twine right into your iOS and OS X app build processes
 
 Now, whenever you build your application, Xcode will automatically invoke Twine to make sure that your `.strings` files are up-to-date.
 
+## User Interface
+
+* [Twine TextMate 2 Bundle](https://github.com/mobiata/twine.tmbundle) — This [TextMate 2](https://github.com/textmate/textmate) bundle will make it easier for you to work with Twine strings files. In particular, it lets you use code folding to easily collapse and expand both strings and sections.
+* [twine_ui](https://github.com/Daij-Djan/twine_ui) — A user interface for Twine written by [Dominik Pich](https://github.com/Daij-Djan/). Consider using this if you would prefer to use Twine without dropping to a command line.
+
 ## Contributors
 
 Many thanks to all of the contributors to the Twine project, including:
 
+* [Blake Watters](https://github.com/blakewatters)
 * [Ishitoya Kentaro](https://github.com/kent013)
+* [Joseph Earl](https://github.com/JosephEarl)
 * [Kevin Everets](https://github.com/keverets)
 * [Kevin Wood](https://github.com/kwood)
 * [Mohammad Hejazi](https://github.com/MohammadHejazi)
 * [Robert Guo](http://www.robertguo.me/)
+* [Shai Shamir](https://github.com/pichirichi)
 
 
 [rubyzip]: http://rubygems.org/gems/rubyzip
@@ -175,3 +184,4 @@ Many thanks to all of the contributors to the Twine project, including:
 [androidstrings]: http://developer.android.com/guide/topics/resources/string-resource.html
 [gettextpo]: http://www.gnu.org/savannah-checkouts/gnu/gettext/manual/html_node/PO-Files.html
 [jquerylocalize]: https://github.com/coderifous/jquery-localize
+[djangopo]: https://docs.djangoproject.com/en/dev/topics/i18n/translation/

data/lib/twine/formatters.rb

@@ -4,9 +4,10 @@ require 'twine/formatters/apple'
 require 'twine/formatters/flash'
 require 'twine/formatters/gettext'
 require 'twine/formatters/jquery'
+require 'twine/formatters/django'
 
 module Twine
   module Formatters
-    FORMATTERS = [Formatters::Apple, Formatters::Android, Formatters::Gettext, Formatters::JQuery, Formatters::Flash]
+    FORMATTERS = [Formatters::Apple, Formatters::Android, Formatters::Gettext, Formatters::JQuery, Formatters::Flash, Formatters::Django]
   end
 end

data/lib/twine/formatters/abstract.rb

@@ -14,42 +14,8 @@ module Twine
       end
 
       def iosify_substitutions(str)
-        # 1) use "@" instead of "s" for substituting strings
+        # use "@" instead of "s" for substituting strings
         str.gsub!(/%([0-9\$]*)s/, '%\1@')
-
-        # 2) if substitutions are numbered, see if we can remove the numbering safely
-        expectedSub = 1
-        startFound = false
-        foundSub = 0
-        str.each_char do |c|
-          if startFound
-            if c == "%"
-              # this is a literal %, keep moving
-              startFound = false
-            elsif c.match(/\d/)
-              foundSub *= 10
-              foundSub += Integer(c)
-            elsif c == "$"
-              if expectedSub == foundSub
-                # okay to keep going
-                startFound = false
-                expectedSub += 1
-              else
-                # the numbering appears to be important (or non-existent), leave it alone
-                return str
-              end
-            end
-          elsif c == "%"
-            startFound = true
-            foundSub = 0
-          end
-        end
-
-        # if we got this far, then the numbering (if any) is in order left-to-right and safe to remove
-        if expectedSub > 1
-          str.gsub!(/%\d+\$(.)/, '%\1')
-        end
-
         return str
       end
 
@@ -152,12 +118,23 @@ module Twine
         end
 
         file_name = @options[:file_name] || default_file_name
+        langs_written = []
         Dir.foreach(path) do |item|
-          lang = determine_language_given_path(item)
-          if lang
-            write_file(File.join(path, item, file_name), lang)
+          if item == "." or item == ".."
+            next
+          end
+          item = File.join(path, item)
+          if File.directory?(item)
+            lang = determine_language_given_path(item)
+            if lang
+              write_file(File.join(item, file_name), lang)
+              langs_written << lang
+            end
           end
         end
+        if langs_written.empty?
+          raise Twine::Error.new("Failed to genertate any files: No languages found at #{path}")
+        end
       end
     end
   end

data/lib/twine/formatters/android.rb

@@ -49,7 +49,7 @@ module Twine
       end
 
       def read_file(path, lang)
-        resources_regex = /<resources>(.*)<\/resources>/m
+        resources_regex = /<resources(?:[^>]*)>(.*)<\/resources>/m
         key_regex = /<string name="(\w+)">/
         comment_regex = /<!-- (.*) -->/
         value_regex = /<string name="\w+">(.*)<\/string>/

data/lib/twine/formatters/django.rb

@@ -0,0 +1,143 @@
+module Twine
+  module Formatters
+    class Django < Abstract
+      FORMAT_NAME = 'django'
+      EXTENSION = '.po'
+      DEFAULT_FILE_NAME = 'strings.po'
+
+      def self.can_handle_directory?(path)
+      Dir.entries(path).any? { |item| /^.+\.po$/.match(item) }
+      end
+
+      def default_file_name
+        return DEFAULT_FILE_NAME
+      end
+
+      def determine_language_given_path(path)
+          path_arr = path.split(File::SEPARATOR)
+          path_arr.each do |segment|
+              match = /(..)\.po$/.match(segment)
+              if match
+                  return match[1]
+              end
+          end
+          
+        return
+      end
+
+      def read_file(path, lang)
+        comment_regex = /#.? *"(.*)"$/
+        key_regex = /msgid *"(.*)"$/
+        value_regex = /msgstr *"(.*)"$/m
+
+        encoding = Twine::Encoding.encoding_for_path(path)
+        sep = nil
+        if !encoding.respond_to?(:encode)
+          # This code is not necessary in 1.9.3 and does not work as it did in 1.8.7.
+          if encoding.end_with? 'LE'
+            sep = "\x0a\x00"
+          elsif encoding.end_with? 'BE'
+            sep = "\x00\x0a"
+          else
+            sep = "\n"
+          end
+        end
+
+        if encoding.index('UTF-16')
+          mode = "rb:#{encoding}"
+        else
+          mode = "r:#{encoding}"
+        end
+
+        File.open(path, mode) do |f|
+          last_comment = nil
+          while line = (sep) ? f.gets(sep) : f.gets
+            if encoding.index('UTF-16')
+              if line.respond_to? :encode!
+                line.encode!('UTF-8')
+              else
+                require 'iconv'
+                line = Iconv.iconv('UTF-8', encoding, line).join
+              end
+            end
+            if @options[:consume_comments]
+               comment_match = comment_regex.match(line)
+               if comment_match
+                   comment = comment_match[1]
+               end
+            else
+                comment = nil
+            end
+            key_match = key_regex.match(line)
+            if key_match
+                key = key_match[1].gsub('\\"', '"')
+            end
+            value_match = value_regex.match(line)
+            if value_match
+                value = value_match[1].gsub(/"\n"/, '').gsub('\\"', '"')
+            end
+
+
+            if key and key.length > 0 and value and value.length > 0
+                set_translation_for_key(key, lang, value)
+                if comment and comment.length > 0 and !comment.start_with?("--------- ")
+                    set_comment_for_key(key, comment)
+                end
+                comment = nil
+            end
+
+          end
+        end
+      end
+
+      def write_file(path, lang)
+        default_lang = @strings.language_codes[0]
+        encoding = @options[:output_encoding] || 'UTF-8'
+        File.open(path, "w:#{encoding}") do |f|
+          f.puts "##\n # Django Strings File\n # Generated by Twine #{Twine::VERSION}\n # Language: #{lang}\n "
+          @strings.sections.each do |section|
+            printed_section = false
+            section.rows.each do |row|
+              if row.matches_tags?(@options[:tags], @options[:untagged])
+                f.puts ''
+                if !printed_section
+                  if section.name && section.name.length > 0
+                    f.print "#--------- #{section.name} ---------#\n\n"
+                  end
+                  printed_section = true
+                end
+                
+                basetrans = row.translated_string_for_lang(default_lang)
+
+                key = row.key
+                key = key.gsub('"', '\\\\"')
+
+                value = row.translated_string_for_lang(lang, default_lang)
+                if value
+                  value = value.gsub('"', '\\\\"')
+
+                  comment = row.comment
+
+                  if comment
+                     comment = comment.gsub('"', '\\\\"')
+                  end
+
+                  if comment && comment.length > 0
+                    f.print "#. #{comment} \n"
+                  end
+
+                  if basetrans && basetrans.length > 0
+                    f.print "# base translation: \"#{basetrans}\"\n"
+                  end
+
+                  f.print "msgid \"#{key}\"\n"
+                  f.print "msgstr \"#{value}\"\n"
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/twine/formatters/gettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Twine
   module Formatters
     class Gettext < Abstract
@@ -35,25 +37,24 @@ module Twine
             value = nil
             comment = nil
 
-            for line in item.split(/\r?\n/)
-              comment_match = comment_regex.match(line)
-              if comment_match
-                comment = comment_match[1]
-              end
-              key_match = key_regex.match(line)
-              if key_match
-                key = key_match[1].gsub('\\"', '"')
-              end
-              value_match = value_regex.match(line)
-              if value_match
-                value = value_match[1].gsub('\\"', '"')
-              end
+            comment_match = comment_regex.match(item)
+            if comment_match
+              comment = comment_match[1]
+            end
+            key_match = key_regex.match(item)
+            if key_match
+              key = key_match[1].gsub('\\"', '"')
+            end
+            value_match = value_regex.match(item)
+            if value_match
+              value = value_match[1].gsub(/"\n"/, '').gsub('\\"', '"')
             end
             if key and key.length > 0 and value and value.length > 0
               set_translation_for_key(key, lang, value)
-              if comment and comment.length > 0
+              if comment and comment.length > 0 and !comment.start_with?("SECTION:")
                 set_comment_for_key(key, comment)
               end
+              comment = nil
             end
           end
         end
@@ -68,6 +69,15 @@ module Twine
             printed_section = false
             section.rows.each do |row|
               if row.matches_tags?(@options[:tags], @options[:untagged])
+                if !printed_section
+                  f.puts ''
+                    if section.name && section.name.length > 0
+                      section_name = section.name.gsub('--', '—')
+                      f.puts "# SECTION: #{section_name}"
+                    end
+                  printed_section = true
+                end
+
                 basetrans = row.translated_string_for_lang(default_lang)
 
                 if basetrans

data/lib/twine/stringsfile.rb

@@ -167,7 +167,7 @@ module Twine
             end
             @language_codes[1..-1].each do |lang|
               value = row.translations[lang]
-              if value && value != row.translations[dev_lang]
+              if value
                 if value[0,1] == ' ' || value[-1,1] == ' ' || (value[0,1] == '`' && value[-1,1] == '`')
                   value = '`' + value + '`'
                 end

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/test/fixtures/en-2.po

@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Language: en\n"
+"X-Generator: Twine\n"
+
+msgctxt "key1"
+msgid "key1-english"
+msgstr "key1-english"
+
+msgctxt "key3"
+msgid "key3-english"
+msgstr ""
+
+msgctxt "key4"
+msgid "key4"
+"multiline"
+msgstr "A multi"
+"line string\n"
+"can occur"
+
+msgctxt "key5"
+msgid "A new string"
+msgstr "A new string"

data/test/fixtures/test-output-7.txt

@@ -3,6 +3,8 @@ msgstr ""
 "Language: en\n"
 "X-Generator: Twine <%= Twine::VERSION %>\n"
 
+
+# SECTION: My Strings
 #. "This is a comment"
 msgctxt "key1"
 msgid "key1-english"

data/test/fixtures/test-output-9.txt

@@ -0,0 +1,21 @@
+[[Uncategorized]]
+	[key5]
+		en = A new string
+
+[[My Strings]]
+	[key1]
+		en = key1-english
+		tags = tag1
+		comment = This is a comment
+		es = key1-spanish
+		fr = key1-french
+	[key2]
+		en = key2-english
+		tags = tag2
+		fr = key2-french
+	[key3]
+		en = key3-english
+		tags = tag1,tag2
+		es = key3-spanish
+	[key4]
+		en = A multiline string\ncan occur

data/test/twine_test.rb

@@ -84,6 +84,14 @@ class TwineTest < Test::Unit::TestCase
     end
   end
 
+  def test_consume_string_file_5
+    Dir.mktmpdir do |dir|
+      output_path = File.join(dir, 'strings.txt')
+      Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/en-2.po -o #{output_path} -l en -a))
+      assert_equal(File.read('test/fixtures/test-output-9.txt'), File.read(output_path))
+    end
+  end
+
   def test_generate_report_1
     Twine::Runner.run(%w(generate-report test/fixtures/strings-1.txt))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sebastian Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -56,6 +56,7 @@ files:
 - lib/twine/formatters/abstract.rb
 - lib/twine/formatters/android.rb
 - lib/twine/formatters/apple.rb
+- lib/twine/formatters/django.rb
 - lib/twine/formatters/flash.rb
 - lib/twine/formatters/gettext.rb
 - lib/twine/formatters/jquery.rb
@@ -68,6 +69,7 @@ files:
 - test/fixtures/en-1.json
 - test/fixtures/en-1.po
 - test/fixtures/en-1.strings
+- test/fixtures/en-2.po
 - test/fixtures/fr-1.xml
 - test/fixtures/strings-1.txt
 - test/fixtures/strings-2.txt
@@ -80,6 +82,7 @@ files:
 - test/fixtures/test-output-6.txt
 - test/fixtures/test-output-7.txt
 - test/fixtures/test-output-8.txt
+- test/fixtures/test-output-9.txt
 - test/twine_test.rb
 homepage: https://github.com/mobiata/twine
 licenses: []
@@ -100,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Manage strings and their translations for your iOS and Android projects.