gettext_i18n_rails 0.10.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6790128b91777a1acffb1cad8853fa54a389609
-  data.tar.gz: 055a395fc45f44aacaca12ba8449cc8e8737bf53
+  metadata.gz: a4dd291e15fd76fd0cc3b38c9e08bc2ceb660919
+  data.tar.gz: 23285b33671f71bfffffc2f8d7a98a1234152898
 SHA512:
-  metadata.gz: b4f082ea89bd197f88d2cc07cb0463eb15648097158ba76d1d2ea9bc614317b96b786706cdf91c13ebcaa324b3a548a7e5ae3ac9a15d338a9ff1533818dcd19d
-  data.tar.gz: c4883ee16275ff3986bcbcab0c4562a7559340f8bac29838c5642ce91c1a045f7510479a23689df4d25f209197802227198828b96697ad04c66977db9afe364e
+  metadata.gz: a692ad8e854d81e8ec9412383e5526b3ee43572480efc53cd08a683bd1bc404d565056a7e127e3491fb1a431c991b7fd1264bf64c9048611624b7da31fb8c7a7
+  data.tar.gz: be798dab60d94e994f60bc16ce5b03240f9c8c0088e675a5640c8110100481940a08c69f1e9be893962fa4b56b97b7bb4e0fbad25a37725fa19142f761a1924b

data/.travis.yml

@@ -10,6 +10,5 @@ matrix:
     - rvm: 2.0
       gemfile: gemfiles/rails23.gemfile
 rvm:
-  - ree
   - 1.9.3
   - 2.0.0

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 gem 'appraisal'
 gem 'bump'
-gem 'gettext'
+gem 'gettext', '>= 3.0.2'
 gem 'haml'
 gem 'rails'
 gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.10.1)
+    gettext_i18n_rails (1.0.0)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -41,14 +41,14 @@ GEM
     diff-lcs (1.2.4)
     erubis (2.7.0)
     fast_gettext (0.7.1)
-    gettext (2.3.9)
-      locale
+    gettext (3.0.2)
+      locale (>= 2.0.5)
       text
     haml (4.0.3)
       tilt
     hike (1.2.3)
     i18n (0.6.4)
-    locale (2.0.8)
+    locale (2.0.9)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -98,7 +98,7 @@ GEM
       sprockets (~> 2.8)
     sqlite3 (1.3.7)
     temple (0.6.6)
-    text (1.2.1)
+    text (1.2.3)
     thor (0.18.1)
     thread_safe (0.1.2)
       atomic
@@ -114,7 +114,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bump
-  gettext
+  gettext (>= 3.0.2)
   gettext_i18n_rails!
   haml
   rails

data/Readme.md

@@ -31,7 +31,7 @@ Add `gettext` if you want to find translations or build .mo files<br/>
 Add `ruby_parser` if you want to find translations inside haml/slim files
 
     # Gemfile
-    gem 'gettext', '>=1.9.3', :require => false, :group => :development
+    gem 'gettext', '>=3.0.2', :require => false, :group => :development
     gem 'ruby_parser', :require => false, :group => :development
 
 #### Rails 2
@@ -235,6 +235,7 @@ If want to use your .PO files on client side javascript you should have a look a
  - [Imre Farkas](https://github.com/ifarkas)
  - [Trong Tran](https://github.com/trongrg)
  - [Dmitri Dolguikh](https://github.com/witlessbird)
+ - [Joe Ferris](https://github.com/jferris)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/gemfiles/rails23.gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "bump"
-gem "gettext"
+gem "gettext", ">= 3.0.2"
 gem "rake"
 gem "ruby_parser", ">= 3"
 gem "rspec"

data/gemfiles/rails23.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.10.0)
+    gettext_i18n_rails (0.10.1)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -23,11 +23,11 @@ GEM
     bump (0.4.2)
     diff-lcs (1.2.4)
     fast_gettext (0.7.1)
-    gettext (2.3.9)
-      locale
+    gettext (3.0.2)
+      locale (>= 2.0.5)
       text
     haml (3.1.7)
-    locale (2.0.8)
+    locale (2.0.9)
     rack (1.1.6)
     rails (2.3.18)
       actionmailer (= 2.3.18)
@@ -53,7 +53,7 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     sqlite3 (1.3.7)
     temple (0.6.6)
-    text (1.2.1)
+    text (1.2.3)
     tilt (1.4.1)
 
 PLATFORMS
@@ -62,7 +62,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bump
-  gettext
+  gettext (>= 3.0.2)
   gettext_i18n_rails!
   haml (~> 3.0)
   rails (~> 2.3.0)

data/gemfiles/rails30.gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "bump"
-gem "gettext"
+gem "gettext", ">= 3.0.2"
 gem "haml"
 gem "rake"
 gem "ruby_parser", ">= 3"

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.10.0)
+    gettext_i18n_rails (0.10.1)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -44,14 +44,14 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     fast_gettext (0.7.1)
-    gettext (2.3.9)
-      locale
+    gettext (3.0.2)
+      locale (>= 2.0.5)
       text
     haml (4.0.3)
       tilt
     i18n (0.5.0)
     json (1.8.0)
-    locale (2.0.8)
+    locale (2.0.9)
     mail (2.2.20)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -97,7 +97,7 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     sqlite3 (1.3.7)
     temple (0.6.6)
-    text (1.2.1)
+    text (1.2.3)
     thor (0.14.6)
     tilt (1.4.1)
     treetop (1.4.14)
@@ -111,7 +111,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bump
-  gettext
+  gettext (>= 3.0.2)
   gettext_i18n_rails!
   haml
   rails (~> 3.0.0)

data/gemfiles/rails31.gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "bump"
-gem "gettext"
+gem "gettext", ">= 3.0.2"
 gem "haml"
 gem "rake"
 gem "ruby_parser", ">= 3"

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.10.0)
+    gettext_i18n_rails (0.10.1)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -44,15 +44,15 @@ GEM
     diff-lcs (1.2.4)
     erubis (2.7.0)
     fast_gettext (0.7.1)
-    gettext (2.3.9)
-      locale
+    gettext (3.0.2)
+      locale (>= 2.0.5)
       text
     haml (4.0.3)
       tilt
     hike (1.2.3)
     i18n (0.6.4)
     json (1.8.0)
-    locale (2.0.8)
+    locale (2.0.9)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -107,7 +107,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     temple (0.6.6)
-    text (1.2.1)
+    text (1.2.3)
     thor (0.14.6)
     tilt (1.4.1)
     treetop (1.4.14)
@@ -121,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bump
-  gettext
+  gettext (>= 3.0.2)
   gettext_i18n_rails!
   haml
   rails (~> 3.1.0)

data/gemfiles/rails32.gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "bump"
-gem "gettext"
+gem "gettext", ">= 3.0.2"
 gem "haml"
 gem "rake"
 gem "ruby_parser", ">= 3"

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.10.0)
+    gettext_i18n_rails (0.10.1)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -43,8 +43,8 @@ GEM
     diff-lcs (1.2.4)
     erubis (2.7.0)
     fast_gettext (0.7.1)
-    gettext (2.3.9)
-      locale
+    gettext (3.0.2)
+      locale (>= 2.0.5)
       text
     haml (4.0.3)
       tilt
@@ -52,7 +52,7 @@ GEM
     i18n (0.6.4)
     journey (1.0.4)
     json (1.8.0)
-    locale (2.0.8)
+    locale (2.0.9)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -105,7 +105,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     temple (0.6.6)
-    text (1.2.1)
+    text (1.2.3)
     thor (0.18.1)
     tilt (1.4.1)
     treetop (1.4.14)
@@ -119,7 +119,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bump
-  gettext
+  gettext (>= 3.0.2)
   gettext_i18n_rails!
   haml
   rails (~> 3.2.0)

data/lib/gettext_i18n_rails/railtie.rb

@@ -1,7 +1,8 @@
 module GettextI18nRails
   class Railtie < ::Rails::Railtie
     config.gettext_i18n_rails = ActiveSupport::OrderedOptions.new
-    config.gettext_i18n_rails.msgmerge = %w[--sort-output --no-location --no-wrap]
+    config.gettext_i18n_rails.msgmerge = nil
+    config.gettext_i18n_rails.xgettext = nil
     config.gettext_i18n_rails.use_for_active_record_attributes = true
 
     rake_tasks do

data/lib/gettext_i18n_rails/tasks.rb

@@ -1,55 +1,49 @@
+require "gettext/tools/task"
+gem "gettext", ">= 3.0.2"
+
 namespace :gettext do
-  def load_gettext
-    require 'gettext'
-    require 'gettext/utils'
+  def locale_path
+    path = FastGettext.translation_repositories[text_domain].instance_variable_get(:@options)[:path] rescue nil
+    path || File.join(Rails.root, "locale")
+  end
+
+  def text_domain
+    # if your textdomain is not 'app': require the environment before calling e.g. gettext:find OR add TEXTDOMAIN=my_domain
+    ENV['TEXTDOMAIN'] || (FastGettext.text_domain rescue nil) || "app"
+  end
+
+  # do not rename, gettext_i18n_rails_js overwrites this to inject coffee + js
+  def files_to_translate
+    Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim}")
+  end
+
+  $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib') # needed when installed as plugin
+
+  require "gettext_i18n_rails/haml_parser"
+  require "gettext_i18n_rails/slim_parser"
+
+  GetText::Tools::Task.define do |task|
+    task.package_name = text_domain
+    task.package_version = "1.0.0"
+    task.domain = text_domain
+    task.po_base_directory = locale_path
+    task.mo_base_directory = locale_path
+    task.files = files_to_translate
+    task.enable_description = false
+
+    default = %w[--sort-by-msgid --no-location --no-wrap]
+    config = (Rails.application.config.gettext_i18n_rails.msgmerge if defined?(Rails.application))
+    task.msgmerge_options = config || default
+    config = (Rails.application.config.gettext_i18n_rails.xgettext if defined?(Rails.application))
+    task.xgettext_options = config || default
   end
 
   desc "Create mo-files for L10n"
-  task :pack => :environment do
-    load_gettext
-    GetText.create_mofiles(true, locale_path, locale_path)
+  task :pack => [:environment, "gettext:gettext:mo:update"] do
   end
 
   desc "Update pot/po files."
-  task :find => :environment do
-    load_gettext
-    $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib') # needed when installed as plugin
-
-    require "gettext_i18n_rails/haml_parser"
-    require "gettext_i18n_rails/slim_parser"
-
-    if GetText.respond_to? :update_pofiles_org
-      if defined?(Rails.application)
-        msgmerge = Rails.application.config.gettext_i18n_rails.msgmerge
-      end
-      msgmerge ||= %w[--sort-output --no-location --no-wrap]
-
-      GetText.update_pofiles_org(
-        text_domain,
-        files_to_translate,
-        "version 0.0.1",
-        :po_root => locale_path,
-        :msgmerge => msgmerge
-      )
-    else #we are on a version < 2.0
-      puts "install new GetText with gettext:install to gain more features..."
-      #kill ar parser...
-      require 'gettext/parser/active_record'
-      module GetText
-        module ActiveRecordParser
-          module_function
-          def init(x);end
-        end
-      end
-
-      #parse files.. (models are simply parsed as ruby files)
-      GetText.update_pofiles(
-        text_domain,
-        files_to_translate,
-        "version 0.0.1",
-        locale_path
-      )
-    end
+  task :find => [:environment, "gettext:gettext:po:update"] do
   end
 
   # This is more of an example, ignoring
@@ -92,35 +86,9 @@ namespace :gettext do
       puts "You need to specify the language to add. Either 'LANGUAGE=eo rake gettext:add_languange' or 'rake gettext:add_languange[eo]'"
       next
     end
-    pot = File.join(locale_path, "#{text_domain}.pot")
-    if !File.exists? pot
-      puts "You don't have a pot file yet, you probably should run 'rake gettext:find' at least once. Tried '#{pot}'."
-      next
-    end
-
-    # Create the directory for the new language.
-    dir = File.join(locale_path, language)
-    puts "Creating directory #{dir}"
-    Dir.mkdir dir
-
-    # Create the po file for the new language.
-    new_po = File.join(locale_path, language, "#{text_domain}.po")
-    puts "Initializing #{new_po} from #{pot}."
-    system "msginit --locale=#{language} --input=#{pot} --output=#{new_po}"
-  end
-
-  def locale_path
-    path = FastGettext.translation_repositories[text_domain].instance_variable_get(:@options)[:path] rescue nil
-    path || File.join(Rails.root, "locale")
-  end
 
-  def text_domain
-    # if your textdomain is not 'app': require the environment before calling e.g. gettext:find OR add TEXTDOMAIN=my_domain
-    ENV['TEXTDOMAIN'] || (FastGettext.text_domain rescue nil) || "app"
-  end
-
-  # do not rename, gettext_i18n_rails_js overwrites this to inject coffee + js
-  def files_to_translate
-    Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim}")
+    language_path = File.join(locale_path, language)
+    mkdir_p(language_path)
+    ruby($0, "gettext:find")
   end
 end

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.10.1'
+  Version = VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext