Allow comments in strings.txt

.gitignore

@@ -0,0 +1,37 @@
+#Android generated
+bin
+gen
+
+#Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+#IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+out
+
+#Maven
+target
+release.properties
+pom.xml.*
+
+#Ant
+build.xml
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+#Ruby
+*.gem
+
+#Other
+.DS_Store
+tmp

LICENSE

@@ -1,5 +1,8 @@
 Software License Agreement (BSD License)
 
+Copyright (c) 2013, Joseph Earl
+All rights reserved.
+
 Copyright (c) 2012, Mobiata, LLC
 All rights reserved.
 

README.md

@@ -1,35 +1,35 @@
-# Twine
+# Traduco
 
-Twine is a command line tool for managing your strings and their translations. These strings are all stored in a master text file and then Twine uses this file to import and export strings in a variety of file types, including iOS and Mac OS X `.strings` files, Android `.xml` files, gettext `.po` files, and [jquery-localize][jquerylocalize] `.json` files. This allows individuals and companies to easily share strings across multiple projects, as well as export strings in any format the user wants.
+Traduco is a command line tool for managing your strings and their translations. These strings are all stored in a master text file and then Traduco uses this file to import and export strings in a variety of file types, including iOS and Mac OS X `.strings` files, Android `.xml` files, gettext `.po` files, and [jquery-localize][jquerylocalize] `.json` files. This allows individuals and companies to easily share strings across multiple projects, as well as export strings in any format the user wants.
 
 ## Install
 
 ### As a Gem
 
-Twine is most easily installed as a Gem.
+Traduco is most easily installed as a Gem.
 
-	$ gem install twine
+	$ gem install traduco
 
 ### From Source
 
-You can also run Twine directly from source. However, it requires [rubyzip][rubyzip] in order to create and read standard zip files.
+You can also run Traduco directly from source. However, it requires [rubyzip][rubyzip] in order to create and read standard zip files.
 
 	$ gem install rubyzip
-	$ git clone git://github.com/mobiata/twine.git
-	$ cd twine
-	$ ./twine --help
+	$ git clone git://github.com/mobiata/traduco.git
+	$ cd traduco
+	$ ./traduco --help
 
-Make sure you run the `twine` executable at the root of the project as it properly sets up your Ruby library path. The `bin/twine` executable does not.
+Make sure you run the `traduco` executable at the root of the project as it properly sets up your Ruby library path. The `bin/traduco` executable does not.
 
 ## String File Format
 
-Twine stores all of its strings in a single file. The format of this file is a slight variant of the [Git][git] config file format, which itself is based on the old [Windows INI file][INI] format. The entire file is broken up into sections, which are created by placing the section name between two pairs of square brackets. Sections are optional, but they are a recommended way of breaking your strings into smaller, more manageable chunks.
+Traduco stores all of its strings in a single file. The format of this file is a slight variant of the [Git][git] config file format, which itself is based on the old [Windows INI file][INI] format. The entire file is broken up into sections, which are created by placing the section name between two pairs of square brackets. Sections are optional, but they are a recommended way of breaking your strings into smaller, more manageable chunks.
 
-Each grouping section contains N string definitions. These string definitions start with the string key placed within a single pair of square brackets. This string definition then contains a number of key-value pairs, including a comment, a comma-separated list of tags (which are used by Twine to select a subset of strings), and all of the translations.
+Each grouping section contains N string definitions. These string definitions start with the string key placed within a single pair of square brackets. This string definition then contains a number of key-value pairs, including a comment, a comma-separated list of tags (which are used by Traduco to select a subset of strings), and all of the translations.
 
 ### Tags
 
-Tags are used by Twine as a way to only work with a subset of your strings at any given point in time. Each string can be assigned zero or more tags which are separated by commas. Tags are optional, though highly recommended. You can get a list of all strings currently missing tags by executing the `generate-report` command.
+Tags are used by Traduco as a way to only work with a subset of your strings at any given point in time. Each string can be assigned zero or more tags which are separated by commas. Tags are optional, though highly recommended. You can get a list of all strings currently missing tags by executing the `generate-report` command.
 
 ### Whitespace
 
@@ -70,101 +70,101 @@ Whitepace in this file is mostly ignored. If you absolutely need to put spaces a
 
 ## Supported Output Formats
 
-Twine currently supports the following formats for outputting strings:
+Traduco currently supports the following formats for outputting strings:
 
 * [iOS and OS X String Resources][applestrings] (format: apple)
 * [Android String Resources][androidstrings] (format: android)
 * [Gettext PO Files][gettextpo] (format: gettext)
 * [jquery-localize Language Files][jquerylocalize] (format: jquery)
 
-If you would like to enable twine to create language files in another format, create an appropriate formatter in `lib/twine/formatters`.
+If you would like to enable traduco to create language files in another format, create an appropriate formatter in `lib/traduco/formatters`.
 
 ## Usage
 
-	Usage: twine COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tags TAG1,TAG2,TAG3...] [--format FORMAT]
+	Usage: traduco COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tags TAG1,TAG2,TAG3...] [--format FORMAT]
 
 ### Commands
 
 #### `generate-string-file`
 
 This command creates an Apple or Android strings file from the master strings data file.
 
-	$ twine generate-string-file /path/to/strings.txt values-ja.xml --tags common,app1
-	$ twine generate-string-file /path/to/strings.txt Localizable.strings --lang ja --tags mytag
-	$ twine generate-string-file /path/to/strings.txt all-english.strings --lang en
+	$ traduco generate-string-file /path/to/strings.txt values-ja.xml --tags common,app1
+	$ traduco generate-string-file /path/to/strings.txt Localizable.strings --lang ja --tags mytag
+	$ traduco generate-string-file /path/to/strings.txt all-english.strings --lang en
 
 #### `generate-all-string-files`
 
-This command is a convenient way to call `generate-string-file` multiple times. It uses standard Mac OS X, iOS, and Android conventions to figure out exactly which files to create given a parent directory. For example, if you point it to a parent directory containing `en.lproj`, `fr.lproj`, and `ja.lproj` subdirectories, Twine will create a `Localizable.strings` file of the appropriate language in each of them. This is often the command you will want to execute during the build phase of your project.
+This command is a convenient way to call `generate-string-file` multiple times. It uses standard Mac OS X, iOS, and Android conventions to figure out exactly which files to create given a parent directory. For example, if you point it to a parent directory containing `en.lproj`, `fr.lproj`, and `ja.lproj` subdirectories, Traduco will create a `Localizable.strings` file of the appropriate language in each of them. This is often the command you will want to execute during the build phase of your project.
 
-	$ twine generate-all-string-files /path/to/strings.txt /path/to/project/locales/directory --tags common,app1
+	$ traduco generate-all-string-files /path/to/strings.txt /path/to/project/locales/directory --tags common,app1
 
 #### `consume-string-file`
 
 This command slurps all of the strings from a `.strings` or `.xml` file and incorporates the translated text into the master strings data file. This is a simple way to incorporate any changes made to a single file by one of your translators. It will only identify strings that already exist in the master data file.
 
-	$ twine consume-string-file /path/to/strings.txt fr.strings
-	$ twine consume-string-file /path/to/strings.txt Localizable.strings --lang ja
-	$ twine consume-string-file /path/to/strings.txt es.xml
+	$ traduco consume-string-file /path/to/strings.txt fr.strings
+	$ traduco consume-string-file /path/to/strings.txt Localizable.strings --lang ja
+	$ traduco consume-string-file /path/to/strings.txt es.xml
 
 #### `consume-all-string-files`
 
-This command reads in a folder containing many `.strings` or `.xml` files. These files should be in a standard folder hierarchy so that twine knows the language of each file. When combined with the `--developer-language`, `--consume-comments`, and `--consume-all` flags, this command is a great way to create your initial strings data file from an existing iOS or Android project. Just make sure that you create a blank strings.txt file, first!
+This command reads in a folder containing many `.strings` or `.xml` files. These files should be in a standard folder hierarchy so that traduco knows the language of each file. When combined with the `--developer-language`, `--consume-comments`, and `--consume-all` flags, this command is a great way to create your initial strings data file from an existing iOS or Android project. Just make sure that you create a blank strings.txt file, first!
 
-	$ twine consume-all-string-files strings.txt Resources/Locales --developer-language en --consume-all --consume-comments
+	$ traduco consume-all-string-files strings.txt Resources/Locales --developer-language en --consume-all --consume-comments
 
 #### `generate-loc-drop`
 
 This command is a convenient way to generate a zip file containing files created by the `generate-string-file` command. It is often used for creating a single zip containing a large number of strings in all languages which you can then hand off to your translation team.
 
-	$ twine generate-loc-drop /path/to/strings.txt LocDrop1.zip
-	$ twine generate-loc-drop /path/to/strings.txt LocDrop2.zip --lang en,fr,ja,ko --tags common,app1
+	$ traduco generate-loc-drop /path/to/strings.txt LocDrop1.zip
+	$ traduco generate-loc-drop /path/to/strings.txt LocDrop2.zip --lang en,fr,ja,ko --tags common,app1
 
 #### `consume-loc-drop`
 
 This command is a convenient way of taking a zip file and executing the `consume-string-file` command on each file within the archive. It is most often used to incorporate all of the changes made by the translation team after they have completed work on a localization drop.
 
-	$ twine consume-loc-drop /path/to/strings.txt LocDrop2.zip
+	$ traduco consume-loc-drop /path/to/strings.txt LocDrop2.zip
 
 #### `generate-report`
 
 This command gives you useful information about your strings. It will tell you how many strings you have, how many have been translated into each language, and whether your master strings data file has any duplicate string keys.
 
-	$ twine generate-report /path/to/strings.txt
+	$ traduco generate-report /path/to/strings.txt
 
 ## Creating Your First strings.txt File
 
 The easiest way to create your first strings.txt file is to run the `consume-all-string-files` command. The one caveat is to first create a blank strings.txt file to use as your starting point. Then, just point the `consume-all-string-files` command at a directory in your project containing all of your iOS, OS X, or Android strings files.
 
 	$ touch strings.txt
-	$ twine consume-all-string-files strings.txt Resources/Locales --developer-language en --consume-all --consume-comments
+	$ traduco consume-all-string-files strings.txt Resources/Locales --developer-language en --consume-all --consume-comments
 
-## Twine and Your Build Process
+## Traduco and Your Build Process
 
-It is easy to incorporate Twine right into your iOS and OS X app build processes.
+It is easy to incorporate Traduco right into your iOS and OS X app build processes.
 
 1. In your project folder, create all of the `.lproj` directories that you need. It does not really matter where they are. We tend to put them in `Resources/Locales/`.
 2. Run the `generate-all-string-files` command to create all of the string files you need in these directories. For example,
 
-		$ twine generate-all-string-files strings.txt Resources/Locales/ --tags tag1,tag2
+		$ traduco generate-all-string-files strings.txt Resources/Locales/ --tags tag1,tag2
 
-	Make sure you point Twine at your strings data file, the directory that contains all of your `.lproj` directories, and the tags that describe the strings you want to use for this project.
+	Make sure you point Traduco at your strings data file, the directory that contains all of your `.lproj` directories, and the tags that describe the strings you want to use for this project.
 3. Drag the `Resources/Locales/` directory to the Xcode project navigator so that Xcode knows to include all of these strings files in your build.
 4. In Xcode, navigate to the "Build Phases" tab of your target.
 5. Click on the "Add Build Phase" button and select "Add Run Script".
 6. Drag the new "Run Script" build phase up so that it runs earlier in the build process. It doesn't really matter where, as long as it happens before the resources are copied to your bundle.
 7. Edit your script to run the exact same command you ran in step (2) above.
 
-Now, whenever you build your application, Xcode will automatically invoke Twine to make sure that your `.strings` files are up-to-date.
+Now, whenever you build your application, Xcode will automatically invoke Traduco 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.
+* [Traduco TextMate 2 Bundle](https://github.com/mobiata/traduco.tmbundle) — This [TextMate 2](https://github.com/textmate/textmate) bundle will make it easier for you to work with Traduco strings files. In particular, it lets you use code folding to easily collapse and expand both strings and sections.
+* [traduco_ui](https://github.com/Daij-Djan/traduco_ui) — A user interface for Traduco written by [Dominik Pich](https://github.com/Daij-Djan/). Consider using this if you would prefer to use Traduco without dropping to a command line.
 
 ## Contributors
 
-Many thanks to all of the contributors to the Twine project, including:
+Many thanks to all of the contributors to the Traduco project, including:
 
 * [Ishitoya Kentaro](https://github.com/kent013)
 * [Kevin Everets](https://github.com/keverets)

Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.test_files = %w(test/twine_test.rb)
+  t.test_files = %w(test/traduco_test.rb)
 end
 
 task :default => :test

library/traduco.rb

@@ -0,0 +1,10 @@
+module Traduco
+  class Error < StandardError
+  end
+
+  require 'traduco/cli'
+  require 'traduco/encoding'
+  require 'traduco/formatters'
+  require 'traduco/runner'
+  require 'traduco/l10nfile'
+end