gettext_i18n_rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81637bb2a53f8a8ba80ce961392da2504560e78f
-  data.tar.gz: 486b7f3fcbb883a32f87f0b1371f57b3db176409
+  metadata.gz: 5b639edb5db08cc33d5d8e91ea03aa2bb4b05f7b
+  data.tar.gz: 0bdd9275776ba4458410db76f8cd588ab67da765
 SHA512:
-  metadata.gz: 8464136d5396b5f1a351933cbb613b4717f10d273c9a1f2cc61f2dbd3b94a9f3c1b834d77c52aebffce565a795c78d5760f9df236ebba132db0b9331433347c1
-  data.tar.gz: 45be2a2509a1fec097d3205214d25294b9ac173747b9f68788eacefe1b04f6b21649dc20c3e0d960eb95ed2a87825be28fa0eba648f98a8461f7cd83b6df6f5e
+  metadata.gz: 45eb5bd57c4597d22fd44233211d244b32bd9a168ef495b1cf3482a11f5ae6f0a21baae09f4919ae561242f70a9add71bf1ea3fc9449fd902ec2150d6da54691
+  data.tar.gz: e79b893ecbadeeeb8fafdadded2aef8c4c7e3ced9e38694e0189d6bf105dc199adeb32c4f5e9f32c3a3b2844f78a588ee88a16c21fd99d8be3cc400dbd26da8a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (1.0.1)
+    gettext_i18n_rails (1.0.2)
       fast_gettext (>= 0.4.8)
 
 GEM

data/Readme.md

@@ -34,6 +34,21 @@ Add `ruby_parser` if you want to find translations inside haml/slim files
     gem 'gettext', '>=3.0.2', :require => false, :group => :development
     gem 'ruby_parser', :require => false, :group => :development
 
+###### Add first language:
+Add the first language using:
+
+    rake gettext:add_language[XX]
+
+or
+
+    LANGUAGE=[XX] rake gettext:add_languange
+
+where XX is the [ISO 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) 2-letter code for the language you want to create.
+
+This will also create the `locale` directory (where the translations are being stored) and run `gettext:find` to find any strings marked for translation.
+
+You can, of course, add more languages using the same command.
+
 #### Rails 2
 
 ##### As plugin:
@@ -202,6 +217,60 @@ lib/tasks/gettext.rake:
       end
     end
 
+Customizing text domains setup task
+===================================
+
+By default a single application text domain is created (named `app` or if you load the environment the value of `FastGettext.text_domain` is being used).
+
+If you want to have multiple text domains or change the definition of the text domains in any way, you can do so by overriding the `:setup` task in a file like lib/tasks/gettext.rake:
+
+    # Remove the provided gettext setup task
+    Rake::Task["gettext:setup"].clear
+
+    namespace :gettext do
+      task :setup => [:environment] do
+        domains = Application.config.gettext["domains"]
+
+        domains.each do |domain, options|
+          files = Dir.glob(options["paths"])
+
+          GetText::Tools::Task.define do |task|
+            task.package_name = options["name"]
+            task.package_version = "1.0.0"
+            task.domain = options["name"]
+            task.po_base_directory = locale_path
+            task.mo_base_directory = locale_path
+            task.files = files
+            task.enable_description = false
+            task.msgmerge_options = gettext_msgmerge_options
+            task.xgettext_options = gettext_xgettext_options
+          end
+        end
+      end
+    end
+
+Changing msgmerge and xgettext options
+======================================
+
+The default options for parsing and create `.po` files are:
+
+    --sort-by-msgid --no-location --no-wrap
+
+These options sort the translations by the msgid (original / source string), don't add location information in the po file and don't wrap long message lines into several lines.
+
+If you want to override them you can put the following into an initializer like config/initializers/gettext.rb:
+
+    Rails.application.config.gettext_i18n_rails.msgmerge = %w[--no-location]
+    Rails.application.config.gettext_i18n_rails.xgettext = %w[--no-location]
+
+or
+
+    Rails.application.config.gettext_i18n_rails.default_options = %w[--no-location]
+
+to override both.
+
+You can see the available options by running `rgettext -h` and `rxgettext -h`.
+
 Using your translations from javascript
 =======================================
 

data/lib/gettext_i18n_rails/tasks.rb

@@ -17,33 +17,48 @@ namespace :gettext do
     Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim}")
   end
 
+  def gettext_default_options
+    config = (Rails.application.config.gettext_i18n_rails.default_options if defined?(Rails.application))
+    config || %w[--sort-by-msgid --no-location --no-wrap]
+  end
+
+  def gettext_msgmerge_options
+    config = (Rails.application.config.gettext_i18n_rails.msgmerge if defined?(Rails.application))
+    config || gettext_default_options
+  end
+
+  def gettext_xgettext_options
+    config = (Rails.application.config.gettext_i18n_rails.xgettext if defined?(Rails.application))
+    config || gettext_default_options
+  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
+  task :setup => [:environment] do
+    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
+      task.msgmerge_options = gettext_msgmerge_options
+      task.xgettext_options = gettext_xgettext_options
+    end
   end
 
-  desc "Create mo-files for L10n"
-  task :pack => [:environment, "gettext:gettext:mo:update"] do
+  desc "Create mo-files"
+  task :pack => [:setup] do
+    Rake::Task["gettext:mo:update"].invoke
   end
 
-  desc "Update pot/po files."
-  task :find => [:environment, "gettext:gettext:po:update"] do
+  desc "Update pot/po files"
+  task :find => [:setup] do
+    Rake::Task["gettext:po:update"].invoke
   end
 
   # This is more of an example, ignoring

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '1.0.1'
+  Version = VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple FastGettext Rails integration.