i18n-one_sky 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     i18n-one_sky (0.0.1)
       i18n (~> 0.5.0)
-      one_sky (~> 0.0.1)
+      one_sky (~> 0.0.2)
       thor (~> 0.14.4)
 
 GEM
@@ -13,7 +13,7 @@ GEM
     i18n (0.5.0)
     json (1.4.6)
     mime-types (1.16)
-    one_sky (0.0.1)
+    one_sky (0.0.2)
       json (~> 1.4.6)
       rest-client (~> 1.6.1)
     rest-client (1.6.1)
@@ -35,6 +35,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   i18n (~> 0.5.0)
   i18n-one_sky!
-  one_sky (~> 0.0.1)
+  one_sky (~> 0.0.2)
   rspec (~> 2.2.0)
   thor (~> 0.14.4)

data/i18n-one_sky.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "i18n-one_sky"
 
   s.add_dependency "i18n", "~> 0.5.0"
-  s.add_dependency "one_sky", "~> 0.0.1"
+  s.add_dependency "one_sky", "~> 0.0.2"
   s.add_dependency "thor", "~> 0.14.4"
 
   s.add_development_dependency "rspec", "~> 2.2.0"

data/lib/i18n-one_sky/simple_client.rb

@@ -21,7 +21,8 @@ module I18n
       def initialize(options = {})
         options = default_options.merge!(options)
         @project = ::OneSky::Project.new(options[:api_key], options[:api_secret], options[:project])
-        @one_sky_locale = @project.details["original_lang_code"].to_s
+        #@one_sky_locale = @project.details["base_locale"].gsub('_', '-')
+        @one_sky_locale = @project.details["base_locale"]
         check_default_locales_match
         @one_sky_languages = @project.languages
       end
@@ -64,7 +65,7 @@ module I18n
 
       # When your translators are done, call this method to download all available translations and save them as Simple backend *.yml files.
       # Outside of Rails, manually supply the path where downloaded files should be saved.
-      def download_translations(path=nil)
+      def download_translations(path=nil, download_base_locale=false)
         if defined? Rails
           path ||= [Rails.root.to_s, "config", "locales"].join("/")
         else
@@ -88,7 +89,7 @@ module I18n
         File.delete(*Dir.glob("#{path}/*_one_sky.yml"))
         
         # Process each locale and save to file
-        @translations.map { |k,v| save_locale(k, v, "#{path}/#{k}_one_sky.yml") unless k.to_s == @one_sky_locale }
+        @translations.map { |k,v| save_locale(k, v, "#{path}/#{k}_one_sky.yml") unless (k.to_s == @one_sky_locale and !download_base_locale)}
       end
 
       protected
@@ -101,13 +102,13 @@ module I18n
           parts.each_with_index { |segment,i| node[segment]; i == parts.size - 1 ? node[segment] = v : node = node[segment] }
         end
 
-        lang = @one_sky_languages.find { |e| e["lang_code"] == lang_code }
+        lang = @one_sky_languages.find { |e| e["locale"] == lang_code }
 
         File.open(filename, 'w') do |f| 
           f.puts "# PLEASE DO NOT EDIT THIS FILE."
           f.puts "# This was downloaded from OneSky. Log in to your OneSky account to manage translations on their website."
-          f.puts "# Language code: #{lang['lang_code']}"
-          f.puts "# Language name: #{lang['name']}"
+          f.puts "# Language code: #{lang['locale']}"
+          f.puts "# Language name: #{lang['local_name']}"
           f.puts "# Language English name: #{lang['eng_name']}"
           f.print(nested.to_yaml)
         end 
@@ -124,7 +125,7 @@ module I18n
 
       def check_default_locales_match
         # Special case: i18n "en" is "en-us".
-        i18n_default_locale = I18n.default_locale == :en ? "en-us" : I18n.default_locale.to_s.downcase
+        i18n_default_locale = I18n.default_locale == :en ? "en_us" : I18n.default_locale.to_s.downcase
         raise DefaultLocaleMismatchError, "I18n and OneSky have different default locale settings. #{I18n.default_locale.to_s} <> #{@one_sky_locale}" if i18n_default_locale != @one_sky_locale.downcase 
       end
     end

data/lib/i18n-one_sky/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Onesky
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/simple_client_spec.rb

@@ -50,7 +50,7 @@ describe "SimpleClient" do
   describe "#download_translations" do
     path = [File.dirname(__FILE__), 'data'].join('/')
     it "saves translation files." do
-      @client.download_translations(path).should be_a_kind_of Array
+      @client.download_translations(path, true).should be_a_kind_of Array
       Dir.glob("#{path}/*_one_sky.yml").size.should >= 1
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Junjun Olympia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +08:00
+date: 2011-02-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency