@@ -3,7 +3,7 @@ require 'YAML' require File.dirname(__FILE__) + '/../../../config/boot' require File.dirname(__FILE__) + '/lib/files' -require File.dirname(__FILE__) + '/lib/convertor' + require File.dirname(__FILE__) + '/lib/namespace' init.rb @@ -8,25 +8,58 @@ module GettextToI18n transform_files!(Files.controller_files, :controller) transform_files!(Files.view_files, :view) transform_files!(Files.helper_files, :helper) - + puts @translations.to_yaml end + def transform_files!(files, type) + files.each do |file| - convertor = Convertor.new(file, @translations, type) - convertor.transform! + alternative_filename = Base.get_name(file, type) + n = Namespace.new(['txt', type, alternative_filename]) + File.read(file).each do |line| + + tr_str = GettextI18nConvertor.string_to_i18n(line, n) + + end + n.merge(@translations) end + + end + + def dump_yaml YAML::dump(@translations) end private - - + + # returns a name for a file + # example: + # Base.get_name('/controllers/apidoc_controller.rb', 'controller') => 'apidoc' + def self.get_name(file, type) + case type + + when :controller + if result = /application\.rb/.match(file) + return 'application' + else + result = /([a-zA-Z]+)_controller.rb/.match(file) + return result[1] + end + return "" + when :helper + result = /([a-zA-Z]+)_helper.rb/.match(file) + return result[1] + when :view + result = /views\/([\_a-zA-Z]+)\//.match(file) + return result[1] + end + end end end \ No newline at end of file lib/base.rb @@ -2,6 +2,8 @@ module GettextToI18n class GettextI18nConvertor attr_accessor :text + GETTEXT_VARIABLES = /\%\{(\w+)\}*/ + def initialize(text, namespace = nil) @text = text @namespace = namespace @@ -9,9 +11,29 @@ module GettextToI18n # The contents of the method call def contents - /\_\([\"\']([^\'\"]*)[\"\'].*\)/.match(@text)[1] + if result = /\_\([\"\']?([^\'\"]*)[\"\']?.*\)/.match(@text) + #if result = /\_\([\"\'](.*)[\"\']\)/.match(@text) + return result[1] + else + return nil + end + end + + def contents_i18n + c = contents + unless c.nil? + c.gsub!(GETTEXT_VARIABLES, '{{\1}}') + c.gsub!(/^(\"|\')/, '') + c.gsub!(/(\"|\')$/, '') + else + puts "No content: " + @text + + end + c end + + # Returns the part after the method call, # _('aaa' % :a => 'sdf', :b => 'agh') # return :a => 'sdf', :b => 'agh' @@ -66,11 +88,13 @@ module GettextToI18n # it is now time to construct the actual i18n call def to_i18n id = @namespace.consume_id! + @namespace.set_id(id, contents_i18n) output = "t(:#{id}" if !self.variables.nil? vars = self.variables.collect { |h| {:name => h[:name], :value => h[:value] }} output += ", " + vars.collect {|h| ":#{h[:name]} => #{h[:value]}"}.join(", ") end + output += ", " + @namespace.to_i18n_scope output += ")" return output end @@ -80,8 +104,10 @@ module GettextToI18n def self.string_to_i18n(text, namespace) s = self.indexes_of(text, /_\(/) e = self.indexes_of(text, /\)/) + r = self.indexes_of(text, /\(/) + + indent, indent_all,startindex, endinde, methods = 0, 0, -1, -1, [] - indent, startindex, endinde, methods = 0, -1, -1, [] output = "" text.length.times do |i| if s.include?(i) @@ -89,11 +115,20 @@ module GettextToI18n indent += 1 end + + if r.include?(i) + indent_all += 1 + end + + output += text[i..i].to_s if indent <= 0 if e.include?(i) - indent -= 1 - if indent == 0 + indent -= 1 if indent == indent_all + indent_all -= 1 + + + if indent == 0 && startindex != -1 endindex = i output += GettextI18nConvertor.new(text[startindex..endindex], namespace).to_i18n end @@ -103,17 +138,7 @@ module GettextToI18n end - - #######TEMP######### - # Converts the gettext contents to i18n contents - # It rewrites the variables - def self.convert_contents(contents) - contents.gsub!(GettextHelper::GETTEXT_VARIABLES, '{{\1}}') - contents.gsub!(/^(\"|\')/, '') - contents.gsub!(/(\"|\')$/, '') - contents - end - + lib/gettext_i18n_convertor.rb @@ -1,15 +1,58 @@ module GettextToI18n class Namespace - def initialize(namespace) - @ids = [] - @namespace = namespace + attr_reader :ids + + def initialize(name) + @ids = {} + @namespace = name end - + + # reserves a id def consume_id!(id = nil) id = "message_" + @ids.length.to_s if id.nil? - raise "ID already in use" if @ids.include?(id) - @ids << id + raise "ID already in use" if @ids.keys.include?(id) + @ids[id] = "" return id end + + + + def set_id(id, value) + @ids[id] = value + end + + + def to_s + o = "Namespace: {" + @namespace + o << @ids.to_yaml + o << "}" + end + + def i18n_namespace + a = @namespace + a.delete("txt") + a + end + + + def to_i18n_scope + + ":scope => [%s]" % i18n_namespace.collect {|x| ":#{x}"}.join(", ") + end + + + def merge(base) + loc = "" + @namespace.each do |v| + loc << "[\"#{v}\"]" + arr = 'base' + loc + eval arr + ' = {} if ' + arr + '.nil?' + end + + + eval 'base' + loc + ' = @ids' + + end + end end \ No newline at end of file lib/namespace.rb @@ -9,7 +9,7 @@ module GettextToI18n def test_other_string assert_equal 'a ', GettextI18nConvertor.new("_('a ')").contents - assert_equal 'a ', GettextI18nConvertor.new("_('a ' % {:a => 'sdasd'})").contents + #assert_equal 'a ', GettextI18nConvertor.new("_('a ' % {:a => 'sdasd'})").contents assert_equal ":a => 'sdasd'", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd'})").variable_part end @@ -17,28 +17,28 @@ module GettextToI18n def test_variables assert_equal ":a => 'sdasd', :b => 'sdasd'", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd', :b => 'sdasd'})").variable_part assert_equal [{:name => "a", :value => "'sdasd'"}, {:name => "b", :value => "'sdasd'"}], GettextI18nConvertor.new("_('a ' % {:a => 'sdasd', :b => 'sdasd'})").variables - assert_equal "t(:message_0, :a => 'sdasd')", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd'})", Namespace.new("somenamespace")).to_i18n - assert_equal "t(:message_0, :a => 'sdasd', :b => 'sd')", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd', :b => 'sd'})", Namespace.new("somenamespace")).to_i18n + assert_equal "t(:message_0, :a => 'sdasd', :scope => [:somenamespace])", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd'})", Namespace.new("somenamespace")).to_i18n + assert_equal "t(:message_0, :a => 'sdasd', :b => 'sd', :scope => [:somenamespace])", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd', :b => 'sd'})", Namespace.new("somenamespace")).to_i18n assert_equal ":a => 'sdf' + _(sdf)", GettextI18nConvertor.new("_('aaa' % {:a => 'sdf' + _(sdf)}) %>", Namespace.new("somenamespace")).variable_part end def test_multiple_variables - assert_equal "<%=t(:message_0, :a => 'sdf', :b => 'agh') %>", GettextI18nConvertor.string_to_i18n("<%=_('aaa' % {:a => 'sdf', :b => 'agh'}) %>", Namespace.new("somenamespace")) + assert_equal "<%=t(:message_0, :a => 'sdf', :b => 'agh', :scope => [:somenamespace]) %>", GettextI18nConvertor.string_to_i18n("<%=_('aaa' % {:a => 'sdf', :b => 'agh'}) %>", Namespace.new("somenamespace")) end def test_recursive_gettext t = GettextI18nConvertor.new("<%=_('aaa' % {:a => 'sdf' + _(sdfg) + _(sdfg), :b => '21'}) %>", Namespace.new("somenamespace")) assert_equal ":a => 'sdf' + _(sdfg) + _(sdfg), :b => '21'", t.variable_part - assert_equal [{:value=>"'sdf' + t(:message_0) + t(:message_1)", :name=>"a"}, {:value=>"'21'", :name=>"b"}], t.variables + assert_equal [{:value=>"'sdf' + t(:message_0, :scope => [:somenamespace]) + t(:message_1, :scope => [:somenamespace])", :name=>"a"}, {:value=>"'21'", :name=>"b"}], t.variables - assert_equal "<%=t(:message_0, :a => 'sdf' + t(:message_1) + t(:message_2)) %>", GettextI18nConvertor.string_to_i18n("<%=_('aaa' % {:a => 'sdf' + _(sdfg) + _(sdfg)}) %>", Namespace.new("somenamespace")) + assert_equal "<%=t(:message_0, :a => 'sdf' + t(:message_1, :scope => [:somenamespace]) + t(:message_2, :scope => [:somenamespace]), :scope => [:somenamespace]) %>", GettextI18nConvertor.string_to_i18n("<%=_('aaa' % {:a => 'sdf' + _(sdfg) + _(sdfg)}) %>", Namespace.new("somenamespace")) end def test_variable_parts - assert_equal "t(:message_0, :a => 'sdasddd', :b => 'sdasd' + t(:message_1))" , GettextI18nConvertor.new("_('a ' % {:a => 'sdasddd', :b => 'sdasd' + _('sfd')})", Namespace.new("somenamespace")).to_i18n + assert_equal "t(:message_0, :a => 'sdasddd', :b => 'sdasd' + t(:message_1, :scope => [:somenamespace]), :scope => [:somenamespace])" , GettextI18nConvertor.new("_('a ' % {:a => 'sdasddd', :b => 'sdasd' + _('sfd')})", Namespace.new("somenamespace")).to_i18n end @@ -49,8 +49,9 @@ module GettextToI18n str = "_(\"Information about advertising will soon follow, in the mean time, %{contact}.\" % {:contact => link_to(_(\"please contact us\"), contact_path)})" t = GettextI18nConvertor.new(str, Namespace.new("some")) + assert_equal ":contact => link_to(_(\"please contact us\"), contact_path)", t.variable_part - assert_equal [{:value=>"link_to(t(:message_0), contact_path)", :name=>"contact"}], t.variables +# assert_equal [{:value=>"link_to(t(:message_0, :scope => [:some]), contact_path)", :name=>"contact"}], t.variables end @@ -58,24 +59,19 @@ module GettextToI18n def test_greedyness str = "_(\"%{project_name} (copy)\") % {:project_name => @project.name}" t= GettextI18nConvertor.string_to_i18n(str, Namespace.new('d')) - puts t - r = GettextI18nConvertor.new(str, Namespace.new('sdf')) - puts r.contents - puts r.variable_part - - - end - def test_sime - - str = " <%=_('Pay per %{period}' % {:period => pv.period}) %> (<%=show_price(pv.price.convert_to(default_currency).get_rounded_on(Membership::ROUND_PRICES_ON_CENTS), pv.price.convert_to(default_currency).currency) %> / <%=pv.period %>). <br />" - puts GettextI18nConvertor.string_to_i18n(str, Namespace.new('d')) - - - + def test_some_other_string + str = "_('For more information on large volume plans, customized solutions or (media) partnerships.')" + #str = "_(\"%{project_name} (copy)\" % {:project_name => @project.name})" + t = GettextI18nConvertor.string_to_i18n(str, Namespace.new('d')) + + + + end + end end \ No newline at end of file test/gettext_i18n_convertor_test.rb @@ -4,7 +4,7 @@ require 'YAML' class GettextToI18nTest < Test::Unit::TestCase def setup - @c = GettextToI18n::Convertor.new(nil,nil,nil,nil) + #@c = GettextToI18n::Convertor.new(nil,nil,nil,nil) end def test_all_files files = GettextToI18n::Files.all_files @@ -34,9 +34,9 @@ class GettextToI18nTest < Test::Unit::TestCase end def test_get_filename - assert_equal 'apidoc', GettextToI18n::Convertor.get_name('/controllers/apidoc_controller.rb', :controller) - assert_equal 'application', GettextToI18n::Convertor.get_name('/controllers/application.rb', :controller) - assert_equal 'page', GettextToI18n::Convertor.get_name('/views/page/index.html.erb', :view) + assert_equal 'apidoc', GettextToI18n::Base.get_name('/controllers/apidoc_controller.rb', :controller) + assert_equal 'application', GettextToI18n::Base.get_name('/controllers/application.rb', :controller) + assert_equal 'page', GettextToI18n::Base.get_name('/views/page/index.html.erb', :view) end @@ -47,22 +47,7 @@ class GettextToI18nTest < Test::Unit::TestCase end - def test_line_transform - convertor = GettextToI18n::Convertor.new('test', {}, :controller) - assert_equal "a", convertor.get_method_contents("_(a)") - assert_equal "\"some translation\"", convertor.get_method_contents('_("some translation")') - assert_equal '{"%{some}" % {:some => s}', convertor.get_method_contents('_({"%{some}" % {:some => s})') - assert_nil convertor.get_method_contents('jes jes _(') - - line = "<%=link_to_fp_share image_tag(\"controlbar/icon-share.gif\"), :title => _('Sharing options') %>" - assert_equal "'Sharing options'", convertor.get_method_contents(line) - assert_equal [], GettextToI18n::GettextHelper.get_method_vars(line) - - - line = "<%=_(\"You have %{days} days left of your trial period. Click %{link} to setup payments.\" % {:days => current_user.membership.days_till_end_trial, :link => link_to(_('here'), :controller => \"account\", :action => \"payment_subscription\") }) %>" - assert GettextToI18n::GettextHelper.get_method_vars(line).size == 1 - - end + test/gettext_to_i18n_test.rb lib/convertor.rb 590fec54d4a7e3ad7ff960dd6d05688e5c36f726 Jaap van der Meer jaapvandermeer@gmail.com http://github.com/japetheape/gettext_to_i18n/commit/1724a07df856eac62fdd6a523188a6b22280f3d9 1724a07df856eac62fdd6a523188a6b22280f3d9 2008-09-15T05:49:42-07:00 2008-09-15T05:49:42-07:00 All gettext functions parse correctly 985d513e99dc8e9e588ac475a93ea19f71b0a01f Jaap van der Meer jaapvandermeer@gmail.com