gettext 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f3f4a12673f081a860813f30da662079d0edd77
-  data.tar.gz: bcd3e0248f466c79282b287735f574387d6340cd
+  metadata.gz: 68f70a5a649302fb4a62942b1626b61b9ee5f8a9
+  data.tar.gz: 317f5c21e670363bb9e2c7adcc1535c1ef0ee7eb
 SHA512:
-  metadata.gz: 7bbb867c029053591a6d2172f93fafdefd12daad5d11e85a89b3e6960cb3bd43050dc4b4f0a0d38fa3bf40b47128f99d80cb2dfaa3604161774725752d82b3ee
-  data.tar.gz: 57e18f09cc88fda408eedd4a965490d103d8e0c61a5da72e17e0f39a1e02b6dbc1357df4b93a8347e6983f4747f378093b86de82a641e7bd70e605a1ffc1efe7
+  metadata.gz: 6dc47c78cc61c15c1e9f229a313ec9362b5e1de07312e61cf3d198b57ffc011b08b82c6fc41a8b464d9279448e48a8fc613b5a3354c5e157309022b597e3a748
+  data.tar.gz: 60ae2968f1a102f05dda963a01dd680d8569780abdc3643661114186bafd7180952908e9ccc14f84c78fed0425e3aabe882ea260e045e389ec7a46e50fd84f7f

data/.yardopts

@@ -1,6 +1,7 @@
 --protected
 --no-private
 --markup markdown
+--markup-provider kramdown
 --output doc/reference/en
 --title "gettext API Reference"
 -

data/{README.rdoc → README.md}

@@ -1,4 +1,7 @@
-= gettext - gettext for Ruby
+# gettext - gettext for Ruby
+
+HELP US: Please fix markup of this file. This file's markup is
+migrated from RDoc format. But some RDoc markups still exist.
 
 NOTE: Gettext gem 3.0.0 removed many deprecated APIs and improves
 internal APIs. We want to keep backward compatibility as much as
@@ -27,11 +30,13 @@ localized message files(message catalogs).
 ((*Rails*))
 Rails support has been removed.
 
-== Website
-* homepage[http://ruby-gettext.github.io/]
-* on github[http://github.com/ruby-gettext/gettext]
+## Website
+
+* [Homepage](http://ruby-gettext.github.io/)
+* on [GitHub](http://github.com/ruby-gettext/gettext)
+
+## Features
 
-== Features
 * Translate singular/plural messages with simple APIs(similar to GNU gettext)
 
 * Thread safety. Message resources are shared from all threads, but
@@ -58,16 +63,18 @@ Rails support has been removed.
   * Locale is retrieved from client informations using Ruby-Locale.
     (HTTP_ACCEPT_LANGUAGE, HTTP_ACCEPT_CHARSET, QUERY_STRING(lang), Cookies(lang)).
 
-== Requirements
-* {Ruby 1.9.3 or later}[http://www.ruby-lang.org]
-* {RubyGems}[http://www.rubygems.org/]
-* {locale gem}[http://ruby-gettext.github.io/]
+## Requirements
+
+* [Ruby 1.9.3 or later](http://www.ruby-lang.org)
+* [RubyGems](http://www.rubygems.org/)
+* [locale gem](http://ruby-gettext.github.io/)
   * $ gem install locale
 * (for development only)
-  * {Racc-1.4.3 or later}[http://rubygems.org/gems/racc]
+  * [Racc-1.4.3 or later](http://rubygems.org/gems/racc)
     * (for compiling src/rmsgfmt.ry only)
 
-== Install
+## Install
+
 * Uninstall old gettext if exists. (You need to do this when updating 1.93.0 -> 2.0.1)
     (sudo/su on POSIX system)
     gem uninstall gettext
@@ -85,8 +92,9 @@ Rails support has been removed.
 You can also install files in your favorite directory by
 supplying setup.rb some options. Try <tt>ruby setup.rb --help</tt>.
 
-== Usage
-===Translation
+## Usage
+
+### Translation
 - _: Basic translation method
   Translates the message.
     _("Hello")
@@ -124,7 +132,8 @@ The gettext methods comes in 3 combinable flavors
     fruits = Nn_("Apple", "%{num} Apples")
     n_(fruits, 3)
 
-=== Bind textdomains to the classes.
+### Bind textdomains to the classes.
+
 A textdomain has a translation file in each language.
 A module/class can have multi textdomains. This means the
 libraries/applications can have their own textdomains.
@@ -140,7 +149,8 @@ libraries/applications can have their own textdomains.
    bindtextdomain "book"
  end
 
-=== Locale
+### Locale
+
 If you need to set the locale by yourself, then use:
   GetText.locale = "en_US" # translate into english from now on
   GetText.locale # => en_US
@@ -151,7 +161,8 @@ Or
 For more details and options, have a look at the samples folder or
 consult the tutorial[http://www.yotabanana.com/hiki/ruby-gettext-howto.html].
 
-== License
+## License
+
 This program is licenced under the same licence as Ruby(See doc/text/ruby-license.txt) or 
 LGPL(Lesser General Public License: doc/text/lgpl-3.0.txt or http://www.gnu.org/licenses/lgpl-3.0.txt).  
 
@@ -171,7 +182,8 @@ LGPL(Lesser General Public License: doc/text/lgpl-3.0.txt or http://www.gnu.org/
   * Copyright (C) 2001-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
 
 
-== Translators
+## Translators
+
 * Bosnian(bs)                - Sanjin Sehic <saserr at gmail.com>
 * Bulgarian(bg)              - Sava Chankov <sava.chankov at gmail.com>
 * Catalan(ca)                - Ramon Salvadó <rsalvado at gnuine.com>
@@ -216,7 +228,8 @@ LGPL(Lesser General Public License: doc/text/lgpl-3.0.txt or http://www.gnu.org/
 * Ukrainian(uk)              - Alex Rootoff <rootoff at pisem.net>
 * Vietnamese(vi)             - Ngoc Dao Thanh <ngocdaothanh at gmail.com>
 
-== Status of translations
+## Status of translations
+
 * Bosnian(bs)               - 1.90.0 (old)
 * Bulgarian(bg)             - 2.0.1
 * Catalan(ca)               - 2.0.1
@@ -245,10 +258,10 @@ LGPL(Lesser General Public License: doc/text/lgpl-3.0.txt or http://www.gnu.org/
 * Ukrainian(uk)             - 2.0.1
 * Vietnamese(vi)            - 2.0.1
 
-== Maintainer
+## Maintainer
 
-* Kouhei Sutou <tt><kou@clear-code.com></tt>
+* Kouhei Sutou `<kou@clear-code.com>`
 
-=== Old maintainer
+### Old maintainer
 
-* Masao Mutoh <mutomasa at gmail.com>
+* Masao Mutoh `<mutomasa at gmail.com>`

data/doc/text/news.md

@@ -1,6 +1,29 @@
 # News
 
-## <a id="3-1-2">3.1.2</a>: 2014-04-24
+## 3.1.3: 2014-07-13 {#version-3-1-3}
+
+### Improvements
+
+  * Supported `Pathname` in `$LOAD_PATH`.
+    [GitHub#32] [Patch by Ben Carlsson]
+  * `GetText::Tools::Task`: Added `msgcat_options` to custom `rmsgcat`
+    command line.
+  * `GetText::Tools::Task`: Migrated to `.edit.po` style.
+  * `GetText::Tools::Task`: Added `pot_creator` to custom POT creation.
+  * `rmsgcat`: Added `--no-translator-comment` option.
+  * `rmsgcat`: Added `--no-extracted-comment` option.
+  * `rmsgcat`: Added `--no-flag-comment` option.
+  * `rmsgcat`: Added `--no-previous-comment` option.
+
+### Fixes
+
+  * `rmsgmerge`: Fixed a bug that metadata in fuzzy message aren't merged.
+
+### Thanks
+
+  * Ben Carlsson
+
+## 3.1.2: 2014-04-24 {#version-3-1-2}
 
 ### Improvements
 
@@ -17,7 +40,7 @@
   * Masafumi Yokoyama
   * David Silva
 
-## <a id="3-1-1">3.1.1</a>: 2014-02-23
+## 3.1.1: 2014-02-23 {#version-3-1-1}
 
 ### Improvements
 
@@ -28,25 +51,25 @@
   * `rmsgcat`: Fixed a bug that fuzzy entries are remained when
     `--no-fuzzy` option is used with `--no-all-comments`.
 
-## <a id="3-1-0">3.1.0</a>: 2014-02-09
+## 3.1.0: 2014-02-09 {#version-3-1-0}
 
 ### Improvements
 
   * `rmsgcat`: Added `--no-obsolete-entries` option.
 
-## <a id="3-0-9">3.0.9</a>: 2014-02-09
+## 3.0.9: 2014-02-09 {#version-3-0-9}
 
 ### Improvements
 
   * `rmsgmerge`: Improves fuzzy matching speed.
 
-## <a id="3-0-8">3.0.8</a>: 2014-02-09
+## 3.0.8: 2014-02-09 {#version-3-0-8}
 
 ### Fixes
 
   * `rmsginit`: Fixed a typo.
 
-## <a id="3-0-7">3.0.7</a>: 2014-02-09
+## 3.0.7: 2014-02-09 {#version-3-0-7}
 
 ### Improvements
 
@@ -54,7 +77,7 @@
   * `rmsginit`: Added `--translator-name`.
   * `rmsginit`: Added `--translator-email`.
 
-## <a id="3-0-6">3.0.6</a>: 2014-02-02
+## 3.0.6: 2014-02-02 {#version-3-0-6}
 
 ### Improvements
 
@@ -62,13 +85,13 @@
   * `rmsgcat` chooses translated entry if it exists.
   * `rmsgmerge`: Added `--no-obsolete-entries` option.
 
-## <a id="3-0-5">3.0.5</a>: 2014-02-02
+## 3.0.5: 2014-02-02 {#version-3-0-5}
 
 ### Fixes
 
   * Added missing `require` for {GetText::Tools::MsgCat}.
 
-## <a id="3-0-4">3.0.4</a>: 2014-02-02
+## 3.0.4: 2014-02-02 {#version-3-0-4}
 
 ### Improvements
 
@@ -111,7 +134,7 @@
   * akira yamada
   * Andreas Loupasakis
 
-## <a id="3-0-3">3.0.3</a>: 2013-12-15
+## 3.0.3: 2013-12-15 {#version-3-0-3}
 
 ### Improvements
 
@@ -141,7 +164,7 @@
   * Sam Lown
   * mtasaka
 
-## <a id="3-0-2">3.0.2</a>: 2013-09-29
+## 3.0.2: 2013-09-29 {#version-3-0-2}
 
 ### Improvements
 
@@ -154,7 +177,7 @@
   * xgettext: Added `--width` option.
   * xgettext: Added `--no-wrap` option.
 
-## <a id="3-0-1">3.0.1</a>: 2013-09-20
+## 3.0.1: 2013-09-20 {#version-3-0-1}
 
 ### Improvements
 
@@ -185,7 +208,7 @@
   * Ladislav Slezák
   * Antonio Terceiro
 
-## <a id="3-0-0">3.0.0</a>: 2013-08-31
+## 3.0.0: 2013-08-31 {#version-3-0-0}
 
 This is a new major version up release!
 
@@ -242,7 +265,7 @@ fix the problem and release a new version.
   * Ladislav Slezák
   * Francesco Poli
 
-## <a id="2-3-9">2.3.9</a>: 2013-04-21
+## 2.3.9: 2013-04-21 {#version-2-3-9}
 
 This is a msgmerge updated release.
 
@@ -261,7 +284,7 @@ This is a msgmerge updated release.
   * Benjamin Kerensa
   * Jérémy Bobbio
 
-## <a id="2-3-8">2.3.8</a>: 2013-04-05
+## 2.3.8: 2013-04-05 {#version-2-3-8}
 
 This is a msgmerge improved release.
 
@@ -285,7 +308,7 @@ This is a msgmerge improved release.
   * Francesco Poli
   * Jérémy Bobbio
 
-## <a id="2-3-7">2.3.7</a>: 2013-01-11
+## 2.3.7: 2013-01-11 {#version-2-3-7}
 
 This is a msgmerge improved release.
 
@@ -299,7 +322,7 @@ This is a msgmerge improved release.
     not fuzzy entries in merged PO.
   * [POEntry] Pretty formated all messages except msgstr.
 
-## <a id="2-3-6">2.3.6</a>: 2012-12-19
+## 2.3.6: 2012-12-19 {#version-2-3-6}
 
 This is a bug fix release.
 
@@ -313,7 +336,7 @@ This is a bug fix release.
     added to new PO file. Any obsolete entries in old PO file aren't
     treated for merging.
 
-## <a id="2-3-5">2.3.5</a>: 2012-12-11
+## 2.3.5: 2012-12-11 {#version-2-3-5}
 
 This is a bug fix release.
 
@@ -321,7 +344,7 @@ This is a bug fix release.
 
   * [POParser] Fixed the class name for backward compatibility.
 
-## <a id="2-3-4">2.3.4</a>: 2012-12-11
+## 2.3.4: 2012-12-11 {#version-2-3-4}
 
 This is a many changes and new implements release.
 
@@ -357,7 +380,7 @@ This is a many changes and new implements release.
   * Raised no error when POEntry doesn't have references.
     It is useful for no references in .PO file.
 
-## <a id="2-3-3">2.3.3</a>: 2012-10-18
+## 2.3.3: 2012-10-18 {#version-2-3-3}
 
 It's a package fix and msginit improvement release.
 
@@ -379,7 +402,7 @@ It's a package fix and msginit improvement release.
 
   * mtasaka
 
-## <a id="2-3-2">2.3.2</a>: 2012-09-20
+## 2.3.2: 2012-09-20 {#version-2-3-2}
 
 It's a bug fix release.
 
@@ -392,7 +415,7 @@ It's a bug fix release.
 
   * Ramón Cahenzli
 
-## <a id="2-3-1">2.3.1</a>: 2012-09-13
+## 2.3.1: 2012-09-13 {#version-2-3-1}
 
 It's a Bug and package fix release.
 Then, it's also encoding support release, only if you use Ruby 1.9.
@@ -441,7 +464,7 @@ Then, it's also encoding support release, only if you use Ruby 1.9.
   * Michael Grosser
   * Fotos Georgiadis
 
-## <a id="2-3-0">2.3.0</a>: 2012-08-28
+## 2.3.0: 2012-08-28 {#version-2-3-0}
 
 Various improvements, changes and fixes release.
 
@@ -502,7 +525,7 @@ Various improvements, changes and fixes release.
   * Eddie Lau
   * Yves-Eric Martin
 
-## <a id="2-2-0">2.2.0</a>: 2012-03-11
+## 2.2.0: 2012-03-11 {#version-2-2-0}
 
 Ruby 1.9 support release.
 

data/gettext.gemspec

@@ -20,7 +20,7 @@ So you can use GNU gettext tools for maintaining.
   s.require_paths = ["lib"]
   Dir.chdir(base_dir) do
     s.files = Dir.glob("{locale,bin,data,doc/text,lib,po,samples,src,test}/**/*")
-    s.files += ["README.rdoc", "Rakefile", "gettext.gemspec"]
+    s.files += ["README.md", "Rakefile", "gettext.gemspec"]
     s.files += [".yardopts"]
     s.executables = Dir.chdir("bin") do
       Dir.glob("*")
@@ -33,7 +33,7 @@ So you can use GNU gettext tools for maintaining.
   s.add_development_dependency("rake")
   s.add_development_dependency("racc")
   s.add_development_dependency("yard")
-  s.add_development_dependency("redcarpet")
+  s.add_development_dependency("kramdown")
   s.add_development_dependency("test-unit")
   s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("test-unit-rr")

data/lib/gettext/locale_path.rb

@@ -47,8 +47,10 @@ module GetText
         end
         default_path_rules += DEFAULT_RULES
 
-        load_path = $LOAD_PATH.dup
-        load_path.map!{|v| v.match(/(.*?)(\/lib)*?$/); $1}
+        load_path = $LOAD_PATH.map {|path|
+          path = path.to_path if path.respond_to?(:to_path)
+          path.gsub(/\/lib\z/, "")
+        }
         load_path.each {|path|
           default_path_rules += [
             "#{path}/data/locale/%{lang}/LC_MESSAGES/%{name}.mo",

data/lib/gettext/tools/msgcat.rb

@@ -245,6 +245,26 @@ module GetText
             @po_format_options[:include_reference_comment] = boolean
           end
 
+          parser.on("--no-translator-comment",
+                    _("Remove translator comment")) do |boolean|
+            @po_format_options[:include_translator_comment] = boolean
+          end
+
+          parser.on("--no-extracted-comment",
+                    _("Remove extracted comment")) do |boolean|
+            @po_format_options[:include_extracted_comment] = boolean
+          end
+
+          parser.on("--no-flag-comment",
+                    _("Remove flag comment")) do |boolean|
+            @po_format_options[:include_flag_comment] = boolean
+          end
+
+          parser.on("--no-previous-comment",
+                    _("Remove previous comment")) do |boolean|
+            @po_format_options[:include_previous_comment] = boolean
+          end
+
           parser.on("--no-all-comments",
                     _("Remove all comments")) do |boolean|
             @po_format_options[:include_all_comments] = boolean

data/lib/gettext/tools/msgmerge.rb

@@ -133,13 +133,12 @@ module GetText
             return merge_header(reference_entry, definition_entry)
           end
 
-          return definition_entry if definition_entry.fuzzy?
-
           entry = reference_entry
           entry.translator_comment = definition_entry.translator_comment
           entry.previous = nil
 
-          unless definition_entry.msgid_plural == reference_entry.msgid_plural
+          if definition_entry.fuzzy? or
+              definition_entry.msgid_plural != reference_entry.msgid_plural
             entry.flags << "fuzzy"
           end
 

data/lib/gettext/tools/task.rb

@@ -17,7 +17,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+require "pathname"
 require "rake"
+require "rake/clean"
+
 require "gettext/tools"
 
 module GetText
@@ -132,6 +135,12 @@ module GetText
       # @see `rmsgmerge --help`
       attr_accessor :msgmerge_options
 
+      # @return [Array<String>] Command line options for filtering PO.
+      # @see GetText::Tools::MsgCat
+      # @see `rmsgcat --help`
+      # @since 3.1.3
+      attr_accessor :msgcat_options
+
       # @return [Bool]
       # @see #enable_description? For details.
       attr_writer :enable_description
@@ -140,6 +149,27 @@ module GetText
       # @see #enable_po? For details.
       attr_writer :enable_po
 
+      # It is used to custom how to create POT file. The object must have
+      # `call` method. The method must accept one argument. The argument
+      #  is a `Pathname` object that represents POT file path.
+      #
+      # @example
+      #
+      #   GetText::Tools::Task.define do |task|
+      #     task.pot_creator = lambda do |pot_file_path|
+      #       pot_file_path.open("w") do |pot_file|
+      #         pot_file << <<-POT
+      #   msgid "Hello"
+      #   msgstr ""
+      #         POT
+      #       end
+      #     end
+      #   end
+      #
+      #
+      # @return [Proc]
+      attr_accessor :pot_creator
+
       # @param [Gem::Specification, nil] spec Package information associated
       #   with the task. Some information are extracted from the spec.
       # @see #spec= What information are extracted from the spec.
@@ -224,8 +254,10 @@ module GetText
         @xgettext_options = []
         @msginit_options = []
         @msgmerge_options = []
+        @msgcat_options = []
         @enable_description = true
         @enable_po = true
+        @pot_creator = nil
       end
 
       def ensure_variables
@@ -255,6 +287,7 @@ module GetText
         define_pot_file_task
 
         locales.each do |locale|
+          define_edit_po_file_task(locale)
           define_po_file_task(locale)
           define_mo_file_task(locale)
         end
@@ -263,74 +296,124 @@ module GetText
       def define_pot_file_task
         return unless @enable_po
 
+        path = create_path
         pot_dependencies = files.dup
-        unless File.exist?(po_base_directory)
-          directory po_base_directory
-          pot_dependencies << po_base_directory
-        end
-        file pot_file => pot_dependencies do
-          command_line = [
-            "--output", pot_file,
-          ]
-          if package_name
-            command_line.concat(["--package-name", package_name])
+        unless path.po_base_directory.exist?
+          directory path.po_base_directory.to_s
+          pot_dependencies << path.po_base_directory.to_s
+        end
+        file path.pot_file.to_s => pot_dependencies do
+          create_pot(path.pot_file)
+        end
+      end
+
+      def create_pot(pot_file_path)
+        if @pot_creator
+          @pot_creator.call(pot_file_path)
+        else
+          xgettext(pot_file_path)
+        end
+      end
+
+      def xgettext(pot_file_path)
+        command_line = [
+          "--output", pot_file_path.to_s,
+        ]
+        if package_name
+          command_line.concat(["--package-name", package_name])
+        end
+        if package_version
+          command_line.concat(["--package-version", package_version])
+        end
+        command_line.concat(@xgettext_options)
+        command_line.concat(files)
+        XGetText.run(*command_line)
+      end
+
+      def define_edit_po_file_task(locale)
+        return unless @enable_po
+
+        path = create_path(locale)
+        directory path.edit_po_directory.to_s
+        dependencies = [
+          path.pot_file.to_s,
+          path.edit_po_directory.to_s,
+        ]
+        if path.po_file_is_updated?
+          dependencies << internal_force_task_name
+        end
+        file path.edit_po_file.to_s => dependencies do
+          if path.po_file_is_updated?
+            rm_f(path.edit_po_file.to_s)
           end
-          if package_version
-            command_line.concat(["--package-version", package_version])
+          unless path.edit_po_file.exist?
+            if path.po_file.exist?
+              cp(path.po_file.to_s, path.edit_po_file.to_s)
+            else
+              MsgInit.run("--input", path.pot_file.to_s,
+                          "--output", path.po_file.to_s,
+                          "--locale", path.locale,
+                          "--no-translator",
+                          *@msginit_options)
+            end
+          end
+
+          edit_po_file_mtime = path.edit_po_file.mtime
+          MsgMerge.run("--update",
+                       "--sort-by-file",
+                       "--no-wrap",
+                       *@msgmerge_options,
+                       path.edit_po_file.to_s,
+                       path.pot_file.to_s)
+          if path.po_file.exist? and path.po_file.mtime > edit_po_file_mtime
+            MsgMerge.run("--output", path.edit_po_file.to_s,
+                         "--sort-by-file",
+                         "--no-wrap",
+                         "--no-obsolete-entries",
+                         path.po_file.to_s,
+                         path.edit_po_file.to_s)
           end
-          command_line.concat(@xgettext_options)
-          command_line.concat(files)
-          GetText::Tools::XGetText.run(*command_line)
         end
       end
 
       def define_po_file_task(locale)
         return unless @enable_po
 
-        _po_file = po_file(locale)
-        po_dependencies = [pot_file]
-        _po_directory = po_directory(locale)
-        unless File.exist?(_po_directory)
-          directory _po_directory
-          po_dependencies << _po_directory
-        end
-        file _po_file => po_dependencies do
-          if File.exist?(_po_file)
-            command_line = [
-              "--update",
-            ]
-            command_line.concat(@msgmerge_options)
-            command_line.concat([_po_file, pot_file])
-            GetText::Tools::MsgMerge.run(*command_line)
-          else
-            command_line = [
-              "--input", pot_file,
-              "--output", _po_file,
-              "--locale", locale.to_s,
-              "--no-translator",
-            ]
-            command_line.concat(@msginit_options)
-            GetText::Tools::MsgInit.run(*command_line)
-          end
+        path = create_path(locale)
+        directory path.po_directory.to_s
+        dependencies = [
+          path.edit_po_file.to_s,
+          path.po_directory.to_s,
+        ]
+        CLEAN << path.po_time_stamp_file.to_s
+        file path.po_file.to_s => dependencies do
+          MsgCat.run("--output", path.po_file.to_s,
+                     "--sort-by-file",
+                     "--no-location",
+                     "--no-report-warning",
+                     "--no-obsolete-entries",
+                     "--remove-header-field=POT-Creation-Date",
+                     *@msgcat_options,
+                     path.edit_po_file.to_s)
+          touch(path.po_time_stamp_file.to_s)
         end
       end
 
       def define_mo_file_task(locale)
-        _po_file  = po_file(locale)
-        mo_dependencies = [_po_file]
-        _mo_directory = mo_directory(locale)
-        unless File.exist?(_mo_directory)
-          directory _mo_directory
-          mo_dependencies << _mo_directory
-        end
-        _mo_file = mo_file(locale)
-        file _mo_file => mo_dependencies do
-          GetText::Tools::MsgFmt.run(_po_file, "--output", _mo_file)
+        path = create_path(locale)
+        directory path.mo_directory.to_s
+        mo_dependencies = [
+          path.po_file.to_s,
+          path.mo_directory.to_s,
+        ]
+        file path.mo_file.to_s => mo_dependencies do
+          MsgFmt.run(path.po_file.to_s, "--output", path.mo_file.to_s)
         end
       end
 
       def define_named_tasks
         namespace :gettext do
+          define_internal_tasks
           if @enable_po
             define_pot_tasks
             define_po_tasks
@@ -343,10 +426,21 @@ module GetText
         task :gettext => (current_scope + ["gettext", "mo", "update"]).join(":")
       end
 
+      def define_internal_tasks
+        namespace :internal do
+          task :force
+        end
+      end
+
+      def internal_force_task_name
+        [namespace_prefix, "gettext", "internal", "force"].compact.join(":")
+      end
+
       def define_pot_tasks
         namespace :pot do
-          desc "Create #{pot_file}"
-          task :create => pot_file
+          path = create_path
+          desc "Create #{path.pot_file}"
+          task :create => path.pot_file.to_s
         end
       end
 
@@ -367,8 +461,9 @@ module GetText
           update_tasks = []
           @locales.each do |locale|
             namespace locale do
-              desc "Update #{po_file(locale)}"
-              task :update => po_file(locale)
+              path = create_path(locale)
+              desc "Update #{path.po_file}"
+              task :update => path.po_file.to_s
               update_tasks << (current_scope + ["update"]).join(":")
             end
           end
@@ -383,8 +478,9 @@ module GetText
           update_tasks = []
           @locales.each do |locale|
             namespace locale do
-              desc "Update #{mo_file(locale)}"
-              task :update => mo_file(locale)
+              path = create_path(locale)
+              desc "Update #{path.mo_file}"
+              task :update => path.mo_file.to_s
               update_tasks << (current_scope + ["update"]).join(":")
             end
           end
@@ -394,24 +490,12 @@ module GetText
         end
       end
 
-      def pot_file
-        File.join(po_base_directory, "#{domain}.pot")
-      end
-
-      def po_directory(locale)
-        File.join(po_base_directory, locale.to_s)
-      end
-
-      def po_file(locale)
-        File.join(po_directory(locale), "#{domain}.po")
-      end
-
-      def mo_directory(locale)
-        File.join(mo_base_directory, locale.to_s, "LC_MESSAGES")
-      end
-
-      def mo_file(locale)
-        File.join(mo_directory(locale), "#{domain}.mo")
+      def create_path(locale=nil)
+        locale = locale.to_s if locale.is_a?(Symbol)
+        Path.new(Pathname.new(@po_base_directory),
+                 Pathname.new(@mo_base_directory),
+                 @domain,
+                 locale)
       end
 
       def target_files
@@ -461,6 +545,57 @@ module GetText
           end
         end
       end
+
+      class Path
+        attr_reader :po_base_directory
+        attr_reader :mo_base_directory
+        attr_reader :domain
+        attr_reader :locale
+        def initialize(po_base_directory, mo_base_directory, domain, locale=nil)
+          @po_base_directory = po_base_directory
+          @mo_base_directory = mo_base_directory
+          @domain = domain
+          @locale = locale
+        end
+
+        def pot_file
+          @po_base_directory + "#{@domain}.pot"
+        end
+
+        def po_directory
+          @po_base_directory + @locale
+        end
+
+        def po_file
+          po_directory + "#{@domain}.po"
+        end
+
+        def po_time_stamp_file
+          po_directory + "#{@domain}.po.time_stamp"
+        end
+
+        def po_file_is_updated?
+          return false unless po_file.exist?
+          return true unless po_time_stamp_file.exist?
+          po_file.mtime > po_time_stamp_file.mtime
+        end
+
+        def edit_po_directory
+          po_directory
+        end
+
+        def edit_po_file
+          edit_po_directory + "#{@domain}.edit.po"
+        end
+
+        def mo_directory
+          @mo_base_directory + @locale + "LC_MESSAGES"
+        end
+
+        def mo_file
+          mo_directory + "#{@domain}.mo"
+        end
+      end
     end
   end
 end