web_translate_it 1.6.5 → 1.6.6

data/examples/en.yml

@@ -1,3 +1,38 @@
-fr:
-  hello: "Bonjour tout le monde"
-  test: "Ceci est un test."
+en:
+  activerecord:
+    errors:
+      templates:
+        header:
+          one: "1 error prohibited this {{model}} from being saved"
+          other: "{{count}} errors prohibited this {{model}} from being saved"
+          body: "there were problems with the following fields:"
+          messages:
+            accepted: "must be accepted"
+            blank: "can't be blank"
+            confirmation: "doesn't match confirmation"
+            empty: "can't be empty"
+            equal_to: "must be equal to {{count}}"
+            even: "must be even"
+            exclusion: "is reserved"
+            greater_than: "must be greater than {{count}}"
+            greater_than_or_equal_to: "must be greater than or equal to {{count}}"
+            inclusion: "is not included in the list"
+            invalid: "is invalid"
+            less_than: "must be less than {{count}}"
+            less_than_or_equal_to: "must be less than or equal to {{count}}"
+            not_a_number: "is not a number"
+            odd: "must be odd"
+            taken: "is already taken"
+            too_long: "is too long (maximum is {{count}} characters)"
+            too_short: "is too short (minimum is {{count}} characters)"
+            wrong_length: "is the wrong length (should be {{count}} characters)" 
+      models:
+        invitation:
+          attributes:
+            email:
+              user_already_invited: "This user has already been invited"
+              user_already_member: "This user is already a member"
+        project_file:
+          attributes:
+            file:
+              file_format_not_supported: "Sorry, we currenly support only Gettext .pot/.po, .yml/.yaml and .strings"

data/history.md

@@ -1,3 +1,8 @@
+## Version 1.6.6 /2010-04-26
+
+* New: `--merge` option to force WTI to perform a merge of this file with its database.
+* New: `--ignore_missing` option to force WTI to not obsolete missing strings.
+
 ## Version 1.6.5 /2010-04-19
 
 * Enhancement: Remove new line on push/pull result. It now displays `Pulling config/locales/app/fr.yml… 200 OK`.

data/lib/web_translate_it/command_line.rb

@@ -4,23 +4,26 @@ module WebTranslateIt
     require 'fileutils'
     
     OPTIONS = <<-OPTION
-pull            Pull target language file(s) from Web Translate It.
-push            Push master language file(s) to Web Translate It.
-autoconf        Configure your project to sync with Web Translate It.
-stats           Fetch and display your project statistics.
+pull             Pull target language file(s) from Web Translate It.
+push             Push master language file(s) to Web Translate It.
+autoconf         Configure your project to sync with Web Translate It.
+stats            Fetch and display your project statistics.
 
 OPTIONAL PARAMETERS:
 --------------------
--l --locale     The ISO code of a specific locale to pull or push.
--c --config     Path to a translation.yml file. If this option
-                is absent, looks for config/translation.yml.
---all           Respectively download or upload all files.
---force         Force wti pull to re-download the language file,
-                regardless if local version is current.
+-l --locale      The ISO code of a specific locale to pull or push.
+-c --config      Path to a translation.yml file. If this option
+                 is absent, looks for config/translation.yml.
+--all            Respectively download or upload all files.
+--force          Force wti pull to re-download the language file,
+                 regardless if local version is current.
+--merge          Force WTI to perform a merge of this file with its database.
+--ignore_missing Force WTI to not obsolete missing strings.
+
 OTHER:
 ------
--v --version    Show version.
--h --help       This page.
+-v --version     Show version.
+-h --help        This page.
 OPTION
     
     def self.run
@@ -58,9 +61,11 @@ OPTION
       STDOUT.sync = true
       configuration = fetch_configuration
       fetch_locales_to_push(configuration).each do |locale|
+      merge = !(ARGV.index('--merge')).nil?
+      ignore_missing = !(ARGV.index('--ignore_missing')).nil?
         configuration.files.find_all{ |file| file.locale == locale }.each do |file|
           print "Pushing #{file.file_path}… "
-          puts file.upload
+          puts file.upload(merge, ignore_missing)
         end
       end
     end

data/lib/web_translate_it/translation_file.rb

@@ -56,11 +56,11 @@ module WebTranslateIt
     # been completed. The request might or might not eventually be acted upon, as it might be disallowed when processing
     # actually takes place.
     # This is due to the fact that language file imports are handled by background processing.
-    def upload
+    def upload(merge=false, ignore_missing=false)
       if File.exists?(self.file_path)
         File.open(self.file_path) do |file|
           WebTranslateIt::Util.http_connection do |http|
-            request  = Net::HTTP::Put::Multipart.new(api_url, "file" => UploadIO.new(file, "text/plain", file.path))
+            request  = Net::HTTP::Put::Multipart.new(api_url, {"file" => UploadIO.new(file, "text/plain", file.path), "merge" => merge, "ignore_missing" => ignore_missing})
             Util.handle_response(http.request(request))
           end
         end

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 6
-:patch: 5
+:patch: 6

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 6
+  version: 1.6.6
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +02:00
+date: 2010-04-26 00:00:00 +02:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency