@@ -96,7 +96,7 @@ module GettextToI18n def to_i18n id = @namespace.consume_id! @namespace.set_id(id, contents_i18n) - output = "I18n.t(:#{id}" + 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(", ") lib/gettext_i18n_convertor.rb @@ -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 "I18n.t(:message_0, :a => 'sdasd', :scope => [:somenamespace])", GettextI18nConvertor.new("_('a ' % {:a => 'sdasd'})", Namespace.new("somenamespace")).to_i18n - assert_equal "I18n.t(:message_0, :a => 'sdasd', :b => 'sd', :scope => [:somenamespace])", 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 "<%=I18n.t(:message_0, :a => 'sdf', :b => 'agh', :scope => [:somenamespace]) %>", 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' + I18n.t(:message_0, :scope => [:somenamespace]) + I18n.t(:message_1, :scope => [:somenamespace])", :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 "<%=I18n.t(:message_0, :a => 'sdf' + I18n.t(:message_1, :scope => [:somenamespace]) + I18n.t(:message_2, :scope => [:somenamespace]), :scope => [:somenamespace]) %>", 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 "I18n.t(:message_0, :a => 'sdasddd', :b => 'sdasd' + I18n.t(:message_1, :scope => [:somenamespace]), :scope => [:somenamespace])" , 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 test/gettext_i18n_convertor_test.rb 803a02bd3bf7d7017dc299488eff1e6621af991f Jaap van der Meer jaapvandermeer@gmail.com http://github.com/japetheape/gettext_to_i18n/commit/7de10a5255086d3b71ca0194cc1f9613e843a962 7de10a5255086d3b71ca0194cc1f9613e843a962 2008-09-24T07:52:47-07:00 2008-09-24T07:52:47-07:00 Little tweaks 1c903e6834735f7db7720116c560cbb7b55bab6d Jaap van der Meer jaapvandermeer@gmail.com