gettext 3.0.0 → 3.0.1

data/lib/gettext/po_format.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# 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/>.
+
+module GetText
+  module POFormat
+    TRANSLATOR_COMMENT_MARK = "# "
+    EXTRACTED_COMMENT_MARK = "#."
+    FLAG_MARK = "#,"
+    PREVIOUS_COMMENT_MARK = "#|"
+    REFERENCE_COMMENT_MARK = "#:"
+  end
+end

data/lib/gettext/po_parser.rb

@@ -77,39 +77,39 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
     until str.empty? do
       case str
       when /\A\s+/
-	str = $'
+        str = $'
       when /\Amsgctxt/
-	@q.push [:MSGCTXT, $&]
-	str = $'
+        @q.push [:MSGCTXT, $&]
+        str = $'
       when /\Amsgid_plural/
-	@q.push [:MSGID_PLURAL, $&]
-	str = $'
+        @q.push [:MSGID_PLURAL, $&]
+        str = $'
       when /\Amsgid/
-	@q.push [:MSGID, $&]
-	str = $'
+        @q.push [:MSGID, $&]
+        str = $'
       when /\Amsgstr/
-	@q.push [:MSGSTR, $&]
-	str = $'
+        @q.push [:MSGSTR, $&]
+        str = $'
       when /\A\[(\d+)\]/
-	@q.push [:PLURAL_NUM, $1]
-	str = $'
+        @q.push [:PLURAL_NUM, $1]
+        str = $'
       when /\A\#~(.*)/
         if report_warning?
           $stderr.print _("Warning: obsolete msgid exists.\n")
           $stderr.print "         #{$&}\n"
         end
-	@q.push [:COMMENT, $&]
-	str = $'
+        @q.push [:COMMENT, $&]
+        str = $'
       when /\A\#(.*)/
-	@q.push [:COMMENT, $&]
-	str = $'
+        @q.push [:COMMENT, $&]
+        str = $'
       when /\A\"(.*)\"/
-	@q.push [:STRING, unescape_string($1)]
-	str = $'
+        @q.push [:STRING, unescape_string($1)]
+        str = $'
       else
-	#c = str[0,1]
-	#@q.push [:STRING, c]
-	str = str[1..-1]
+        #c = str[0,1]
+        #@q.push [:STRING, c]
+        str = str[1..-1]
       end
     end
     @q.push [false, "$end"]
@@ -184,15 +184,15 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
         mark = $1
         content = $2
         case mark
-        when POEntry::TRANSLATOR_COMMENT_MARK
+        when POFormat::TRANSLATOR_COMMENT_MARK
           @translator_comments << content
-        when POEntry::EXTRACTED_COMMENT_MARK
+        when POFormat::EXTRACTED_COMMENT_MARK
           @extracted_comments << content
-        when POEntry::REFERENCE_COMMENT_MARK
+        when POFormat::REFERENCE_COMMENT_MARK
           @references.concat(parse_references_line(content))
-        when POEntry::FLAG_MARK
+        when POFormat::FLAG_MARK
           @flag << content
-        when POEntry::PREVIOUS_COMMENT_MARK
+        when POFormat::PREVIOUS_COMMENT_MARK
           @previous << content
         else
           @comments << comment

data/lib/gettext/text_domain.rb

@@ -164,10 +164,20 @@ module GetText
 
       if path
         charset = @output_charset || lang.charset || Locale.charset || "UTF-8"
+        charset = normalize_charset(charset)
         @mofiles[lang_key] = MO.open(path, charset)
       else
         @mofiles[lang_key] = :empty
       end
     end
+
+    def normalize_charset(charset)
+      case charset
+      when /\Autf8\z/i
+        "UTF-8"
+      else
+        charset
+      end
+    end
   end
 end

data/lib/gettext/tools/msginit.rb

@@ -18,6 +18,7 @@
 # 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 "etc"
 require "gettext"
 require "gettext/po_parser"
 require "gettext/tools/msgmerge"
@@ -200,7 +201,24 @@ module GetText
       end
 
       def guess_full_name
-        ENV["USERNAME"]
+        full_name = guess_full_name_from_password_entry
+        full_name ||= ENV["USERNAME"]
+        full_name
+      end
+
+      def guess_full_name_from_password_entry
+        password_entry = find_password_entry
+        return nil if password_entry.nil?
+
+        full_name = password_entry.gecos.split(/,/).first.strip
+        full_name = nil if full_name.empty?
+        full_name
+      end
+
+      def find_password_entry
+        Etc.getpwuid
+      rescue ArgumentError
+        nil
       end
 
       def translator_mail

data/lib/gettext/tools/msgmerge.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2005-2009 Masao Mutoh
 # Copyright (C) 2005,2006 speakillof
 #
@@ -192,9 +192,16 @@ module GetText
         end
       end
 
-      class Config #:nodoc:
+      # @private
+      class Config
+        include GetText
 
-        attr_accessor :defpo, :refpot, :output, :fuzzy, :update
+        bindtextdomain("gettext")
+
+        attr_accessor :definition_po, :reference_pot
+        attr_accessor :output, :fuzzy, :update
+        attr_accessor :order
+        attr_accessor :po_format_options
 
         # update mode options
         attr_accessor :backup, :suffix
@@ -213,106 +220,153 @@ module GetText
         # the SIMPLE_BACKUP_SUFFIX environment variable.
 
         def initialize
+          @definition_po = nil
+          @reference_po = nil
+          @update = false
           @output = nil
+          @order = :references
+          @po_format_options = {
+            :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+          }
           @fuzzy = nil
           @update = nil
           @backup = ENV["VERSION_CONTROL"]
           @suffix = ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
           @input_dirs = ["."]
         end
-      end
 
-      class << self
-        # Merge a po-file inluding translated messages and a new pot-file.
-        # @param [Array<String>] arguments arguments for rmsgfmt.
-        # @return [void]
-        def run(*arguments)
-          new.run(*arguments)
+        def parse(command_line)
+          parser = create_option_parser
+          rest = parser.parse(command_line)
+
+          if rest.size != 2
+            puts(parser.help)
+            exit(false)
+          end
+
+          @definition_po, @reference_pot = rest
+          @output = @definition_po if @update
         end
-      end
 
-      include GetText
+        private
+        def create_option_parser
+          parser = OptionParser.new
+          parser.banner =
+            _("Usage: %s [OPTIONS] definition.po reference.pot") % $0
+          #parser.summary_width = 80
+          parser.separator("")
+          description = _("Merges two Uniforum style .po files together. " +
+                            "The definition.po file is an existing PO file " +
+                            "with translations. The reference.pot file is " +
+                            "the last created PO file with up-to-date source " +
+                            "references. The reference.pot is generally " +
+                            "created by rxgettext.")
+          parser.separator(description)
+          parser.separator("")
+          parser.separator(_("Specific options:"))
+
+          parser.on("-U", "--[no-]update",
+                    _("Update definition.po")) do |update|
+            @update = update
+          end
 
-      bindtextdomain("gettext")
+          parser.on("-o", "--output=FILE",
+                    _("Write output to specified file")) do |output|
+            @output = output
+          end
 
-      # constant values
-      VERSION = GetText::VERSION
+          parser.on("--[no-]sort-output",
+                    _("Generate sorted output")) do |sort|
+            @order = sort ? :references : nil
+          end
 
-      def check_command_line_options(*options) #:nodoc:
-        options, output = parse_arguments(*options)
+          parser.on("--[no-]sort-by-file",
+                    _("Sort output by file location")) do |sort_by_file|
+            @order = sort_by_file ? :references : :msgid
+          end
 
-        config = Config.new
-        config.output = output
-        config.defpo = options[0]
-        config.refpot = options[1]
-
-        if config.defpo.nil?
-          raise ArgumentError, _("definition po is not given.")
-        elsif config.refpot.nil?
-          raise ArgumentError, _("reference pot is not given.")
-        end
+          parser.on("--[no-]sort-by-msgid",
+                    _("Sort output by msgid")) do |sort_by_msgid|
+            @order = sort_by_msgid ?  :msgid : :references
+          end
 
-        config
-      end
+          parser.on("--[no-]location",
+                    _("Preserve '#: FILENAME:LINE' lines")) do |location|
+            @po_format_options[:include_reference_comment] = location
+          end
 
-      def parse_arguments(*options) #:nodoc:
-        parser = OptionParser.new
-        parser.banner = _("Usage: %s def.po ref.pot [-o output.pot]") % $0
-        #parser.summary_width = 80
-        parser.separator("")
-        description = _("Merges two Uniforum style .po files together. " +
-                          "The def.po file is an existing PO file with " +
-                          "translations. The ref.pot file is the last " +
-                          "created PO file with up-to-date source " +
-                          "references. ref.pot is generally created by " +
-                          "rgettext.")
-        parser.separator(description)
-        parser.separator("")
-        parser.separator(_("Specific options:"))
-
-        output = nil
-
-        parser.on("-o", "--output=FILE",
-                _("write output to specified file")) do |out|
-          output = out
-        end
+          parser.on("--width=WIDTH", Integer,
+                    _("Set output page width"),
+                    "(#{@po_format_options[:max_line_width]})") do |width|
+            @po_format_options[:max_line_width] = width
+          end
 
-        #parser.on("-F", "--fuzzy-matching")
+          parser.on("--[no-]wrap",
+                    _("Break long message lines, longer than the output page width, into several lines"),
+                    "(#{@po_format_options[:max_line_width] >= 0})") do |wrap|
+            if wrap
+              max_line_width = POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH
+            else
+              max_line_width = -1
+            end
+            @po_format_options[:max_line_width] = max_line_width
+          end
 
-        parser.on("-h", "--help", _("Display this help and exit")) do
-          puts(parser.help)
-          exit(true)
-        end
+          #parser.on("-F", "--fuzzy-matching")
 
-        parser.on_tail("--version", _("display version information and exit")) do
-          puts(VERSION)
-          exit(true)
-        end
+          parser.on("-h", "--help", _("Display this help and exit")) do
+            puts(parser.help)
+            exit(true)
+          end
 
-        parser.parse!(options)
+          parser.on_tail("--version",
+                         _("Display version information and exit")) do
+            puts(GetText::VERSION)
+            exit(true)
+          end
 
-        [options, output]
+          parser
+        end
       end
 
-      def run(*options) #:nodoc:
-        config = check_command_line_options(*options)
+      class << self
+        # (see #run)
+        #
+        # This method is provided just for convenience. It equals to
+        # `new.run(*command_line)`.
+        def run(*command_line)
+          new.run(*command_line)
+        end
+      end
+
+      # Merge a po-file inluding translated messages and a new pot-file.
+      #
+      # @param [Array<String>] command_line
+      #   command line arguments for rmsgmerge.
+      # @return [void]
+      def run(*command_line)
+        config = Config.new
+        config.parse(command_line)
 
         parser = POParser.new
         parser.ignore_fuzzy = false
-        defpo = parser.parse_file(config.defpo, PO.new)
-        refpot = parser.parse_file(config.refpot, PO.new)
+        definition_po = PO.new
+        reference_pot = PO.new
+        parser.parse_file(config.definition_po, definition_po)
+        parser.parse_file(config.reference_pot, reference_pot)
 
         merger = Merger.new
-        result = merger.merge(defpo, refpot)
+        result = merger.merge(definition_po, reference_pot)
+        result.order = config.order
         p result if $DEBUG
         print result.generate_po if $DEBUG
 
         if config.output.is_a?(String)
           File.open(File.expand_path(config.output), "w+") do |file|
-            file.write(result.to_s)
+            file.write(result.to_s(config.po_format_options))
           end
         else
-          puts(result.to_s)
+          puts(result.to_s(config.po_format_options))
         end
       end
     end

data/lib/gettext/tools/task.rb

@@ -23,33 +23,147 @@ require "gettext/tools"
 module GetText
   module Tools
     class Task
+      class Error < StandardError
+      end
+
+      class ValidationError < Error
+        attr_reader :reasons
+        def initialize(reasons)
+          @reasons = reasons
+          lines = []
+          lines << "invalid configurations:"
+          @reasons.each do |variable, reason|
+            lines << "#{variable}: #{reason}"
+          end
+          super(lines.join("\n"))
+        end
+      end
+
       include GetText
       include Rake::DSL
 
-      attr_accessor :locales, :po_base_directory, :mo_base_directory, :domain
-      attr_accessor :namespace_prefix, :files
+      class << self
+        # Define gettext related Rake tasks. Normally, use this method
+        # to define tasks because this method is a convenient API.
+        #
+        # See accessor APIs how to configure this task.
+        #
+        # See {#define} for what task is defined.
+        #
+        # @example Recommended usage
+        #   require "gettext/tools/task"
+        #   # Recommended usage
+        #   GetText::Tools::Task.define do |task|
+        #     task.spec = spec
+        #     # ...
+        #   end
+        #   # Low level API
+        #   task = GetText::Tools::Task.new
+        #   task.spec = spec
+        #   # ...
+        #   task.define
+        #
+        # @yield [task] Gives the newely created task to the block.
+        # @yieldparam [GetText::Tools::Task] task The task that should be
+        #   configured.
+        # @see {#define}
+        # @return [void]
+        def define
+          task = new
+          yield(task)
+          task.define
+        end
+      end
+
+      # @return [Gem::Specification, nil] Package information associated
+      #   with the task.
+      attr_reader :spec
+
+      # @return [String, nil] Package name for messages.
+      attr_accessor :package_name
+
+      # @return [String, nil] Package version for messages.
+      attr_accessor :package_version
+
+      # It is a required parameter.
+      #
+      # @return [Array<String>] Supported locales. It is filled from
+      #   {#po_base_directory} by default.
+      attr_accessor :locales
+      attr_accessor :po_base_directory
+      # @return [String] Base directory that has generated MOs. MOs
+      #   are generated into
+      #   `#{mo_base_directory}/#{locale}/LC_MESSAGES/#{domain}.mo`.
+      attr_accessor :mo_base_directory
+      # It is a required parameter.
+      #
+      # @return [Array<String>] Files that have messages.
+      attr_accessor :files
+      # It is a required parameter.
+      #
+      # @return [String] Text domain
+      attr_accessor :domain
+      attr_accessor :namespace_prefix
       # @return [Array<String>] Command line options for extracting messages
       #   from sources.
       # @see GetText::Tools::XGetText
       # @see `rxgettext --help`
-      attr_reader :xgettext_options
-      def initialize(spec)
+      attr_accessor :xgettext_options
+
+      # @return [Array<String>] Command line options for merging PO with the
+      #   latest POT.
+      # @see GetText::Tools::MsgMerge
+      # @see `rmsgmerge --help`
+      attr_accessor :msgmerge_options
+
+      # @return [Bool]
+      # @see #enable_description? For details.
+      attr_writer :enable_description
+
+      # @return [Bool]
+      # @see #enable_po? For details.
+      attr_writer :enable_po
+
+      # @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.
+      def initialize(spec=nil)
+        initialize_variables
+        self.spec = spec
+        if spec
+          yield(self) if block_given?
+          warn("Use #{self.class.name}.define instead of #{self.class.name}.new(spec).")
+          define
+        end
+      end
+
+      # Sets package infromation by Gem::Specification. Here is a list
+      # for information extracted from the spec:
+      #
+      #   * {#package_name}
+      #   * {#package_version}
+      #   * {#domain}
+      #   * {#files}
+      #
+      # @param [Gem::Specification] spec package information for the
+      #   i18n application.
+      def spec=(spec)
         @spec = spec
-        @locales = []
-        @po_base_directory = "po"
-        @mo_base_directory = "."
-        @files = target_files
-        @domain = @spec.name
-        @namespace_prefix = nil
-        @xgettext_options = []
-        yield(self) if block_given?
-        @locales = detect_locales if @locales.empty?
-        raise("must set locales: #{inspect}") if @locales.empty?
-        define
+        return if @spec.nil?
+
+        @package_name = spec.name
+        @package_version = spec.version.to_s
+        @domain ||= spec.name
+        @files += target_files
       end
 
-      private
+      # Define tasks from configured parameters.
+      #
+      # TODO: List defined Rake tasks.
       def define
+        ensure_variables
+        validate
+
         define_file_tasks
         if namespace_prefix
           namespace_recursive namespace_prefix do
@@ -60,97 +174,202 @@ module GetText
         end
       end
 
+      # If it is true, each task has description. Otherwise, all tasks
+      # doesn't have description.
+      #
+      # @return [Bool]
+      # @since 3.0.1
+      def enable_description?
+        @enable_description
+      end
+
+      # If it is true, PO related tasks are defined. Otherwise, they
+      # are not defined.
+      #
+      # This parameter is useful to manage PO written by hand.
+      #
+      # @return [Bool]
+      # @since 3.0.1
+      def enable_po?
+        @enable_po
+      end
+
+      private
+      def initialize_variables
+        @spec = nil
+        @package_name = nil
+        @package_version = nil
+        @locales = []
+        @po_base_directory = "po"
+        @mo_base_directory = "locale"
+        @files = []
+        @domain = nil
+        @namespace_prefix = nil
+        @xgettext_options = []
+        @msgmerge_options = []
+        @enable_description = true
+        @enable_po = true
+      end
+
+      def ensure_variables
+        @locales = detect_locales if @locales.empty?
+      end
+
+      def validate
+        reasons = {}
+        if @locales.empty?
+          reasons["locales"] = "must set one or more locales"
+        end
+        if @enable_po and @files.empty?
+          reasons["files"] = "must set one or more files"
+        end
+        if @domain.nil?
+          reasons["domain"] = "must set domain"
+        end
+        raise ValidationError.new(reasons) unless reasons.empty?
+      end
+
+      def desc(*args)
+        return unless @enable_description
+        super
+      end
+
       def define_file_tasks
-        unless files.empty?
-          pot_dependencies = files.dup
-          unless File.exist?(po_base_directory)
-            directory po_base_directory
-            pot_dependencies << po_base_directory
+        define_pot_file_task
+
+        locales.each do |locale|
+          define_po_file_task(locale)
+          define_mo_file_task(locale)
+        end
+      end
+
+      def define_pot_file_task
+        return unless @enable_po
+
+        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])
           end
-          file pot_file => pot_dependencies do
-            command_line = [
-              "--package-name", @spec.name,
-              "--package-version", @spec.version.to_s,
-              "--output", pot_file,
-            ]
-            command_line.concat(@xgettext_options)
-            command_line.concat(files)
-            GetText::Tools::XGetText.run(*command_line)
+          if package_version
+            command_line.concat(["--package-version", package_version])
           end
+          command_line.concat(@xgettext_options)
+          command_line.concat(files)
+          GetText::Tools::XGetText.run(*command_line)
         end
+      end
 
-        locales.each do |locale|
-          _po_file = po_file(locale)
-          unless files.empty?
-            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)
-                GetText::Tools::MsgMerge.run(po_file(locale), pot_file,
-                                             "--output", _po_file)
-              else
-                GetText::Tools::MsgInit.run("--input", pot_file,
-                                            "--output", _po_file,
-                                            "--locale", locale.to_s)
-              end
-            end
-          end
+      def define_po_file_task(locale)
+        return unless @enable_po
 
-          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)
+        _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
+            GetText::Tools::MsgInit.run("--input", pot_file,
+                                        "--output", _po_file,
+                                        "--locale", locale.to_s)
           end
         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)
+        end
+      end
+
       def define_named_tasks
         namespace :gettext do
-          namespace :pot do
-            desc "Create #{pot_file}"
-            task :create => pot_file
+          if @enable_po
+            define_pot_tasks
+            define_po_tasks
           end
 
-          namespace :po do
-            update_tasks = []
-            @locales.each do |locale|
-              namespace locale do
-                desc "Update #{po_file(locale)}"
-                task :update => po_file(locale)
-                update_tasks << (current_scope + ["update"]).join(":")
-              end
-            end
+          define_mo_tasks
+        end
 
-            desc "Update *.po"
-            task :update => update_tasks
-          end
+        desc "Update *.mo"
+        task :gettext => (current_scope + ["gettext", "mo", "update"]).join(":")
+      end
+
+      def define_pot_tasks
+        namespace :pot do
+          desc "Create #{pot_file}"
+          task :create => pot_file
+        end
+      end
 
-          namespace :mo do
-            update_tasks = []
-            @locales.each do |locale|
-              namespace locale do
-                desc "Update #{mo_file(locale)}"
-                task :update => mo_file(locale)
-                update_tasks << (current_scope + ["update"]).join(":")
-              end
+      def define_po_tasks
+        namespace :po do
+          desc "Add a new locale"
+          task :add, [:locale] do |_task, args|
+            locale = args.locale || ENV["LOCALE"]
+            if locale.nil?
+              raise "specify locale name by " +
+                "'rake #{_task.name}[${LOCALE}]' or " +
+                "rake #{_task.name} LOCALE=${LOCALE}'"
             end
+            define_po_file_task(locale)
+            Rake::Task[po_file(locale)].invoke
+          end
 
-            desc "Update *.mo"
-            task :update => update_tasks
+          update_tasks = []
+          @locales.each do |locale|
+            namespace locale do
+              desc "Update #{po_file(locale)}"
+              task :update => po_file(locale)
+              update_tasks << (current_scope + ["update"]).join(":")
+            end
           end
+
+          desc "Update *.po"
+          task :update => update_tasks
         end
+      end
 
-        desc "Update *.mo"
-        task :gettext => (current_scope + ["gettext", "mo", "update"]).join(":")
+      def define_mo_tasks
+        namespace :mo do
+          update_tasks = []
+          @locales.each do |locale|
+            namespace locale do
+              desc "Update #{mo_file(locale)}"
+              task :update => mo_file(locale)
+              update_tasks << (current_scope + ["update"]).join(":")
+            end
+          end
+
+          desc "Update *.mo"
+          task :update => update_tasks
+        end
       end
 
       def pot_file
@@ -166,7 +385,7 @@ module GetText
       end
 
       def mo_directory(locale)
-        File.join(mo_base_directory, "locale", locale.to_s, "LC_MESSAGES")
+        File.join(mo_base_directory, locale.to_s, "LC_MESSAGES")
       end
 
       def mo_file(locale)