@@ -82,13 +82,6 @@ module GetText # Extends PoMessage for RubyParser. # Implements a sort of state machine to assist the parser. module PoMessageForRubyParser - PARAMS = { - :normal => [:msgid], - :plural => [:msgid, :msgid_plural], - :msgctxt => [:msgctxt, :msgid], - :msgctxt_plural => [:msgctxt, :msgid, :msgid_plural] - } - # Supports parsing by setting attributes by and by. def set_current_attribute(str) param = @param_type[@param_number] @@ -98,7 +91,6 @@ module GetText def init_param @param_number = 0 - @param_type = PARAMS[@type] self end @@ -127,13 +119,13 @@ module GetText # (and ignored here). # And You don't need to keep the pomessages as unique. - def parse(path, deprecated = nil) # :nodoc: + def parse(path, deprecated = []) # :nodoc: lines = IO.readlines(path) - parse_lines(path, lines) + parse_lines(path, lines, deprecated) end def parse_lines(path, lines, deprecated = []) # :nodoc: - pomessages = [] + pomessages = deprecated file = StringIO.new(lines.join + "\n") rl = RubyLexX.new rl.set_input(file) lib/gettext/tools/parser/ruby.rb @@ -5,6 +5,13 @@ module GetText # Contains data related to the expression or sentence that # is to be translated. class PoMessage + PARAMS = { + :normal => [:msgid], + :plural => [:msgid, :msgid_plural], + :msgctxt => [:msgctxt, :msgid], + :msgctxt_plural => [:msgctxt, :msgid, :msgid_plural] + } + @@max_line_length = 70 # Sets the max line length. @@ -30,6 +37,7 @@ module GetText def initialize(type) @type = type @sources = [] + @param_type = PARAMS[@type] end # Support for extracted comments. Explanation s. @@ -178,6 +186,12 @@ module GetText ret.msgid_plural = msgid_plural ret end + + def [](number) + param = @param_type[number] + raise ParseError, 'no more string parameters expected' unless param + send param + end end end lib/gettext/tools/pomessage.rb 0d6d77803aa96bd61e45569e8d8d37fbde1ec2d5 Masao Mutoh mutomasa@gmail.com http://github.com/mutoh/gettext/commit/bea3a181da8d171c8859e4ad28f963c8d7d74f79 bea3a181da8d171c8859e4ad28f963c8d7d74f79 2009-11-08T06:36:37-08:00 2009-11-08T06:36:37-08:00 tools/parser/ruby.rb, tools/pomessage.rb: Move PARAMS to PoMessage. Fix trivial bugs. ebf346094722a9714d1f5697efc9d2680089f5a7 Masao Mutoh mutomasa@gmail.com