rdoc/classes/GettextToI18n.html rdoc/classes/GettextToI18n/Base.html rdoc/classes/GettextToI18n/Convertor.html rdoc/classes/GettextToI18n/Files.html rdoc/created.rid rdoc/files/README.html rdoc/files/lib/base_rb.html rdoc/files/lib/convertor_rb.html rdoc/files/lib/files_rb.html rdoc/fr_class_index.html rdoc/fr_file_index.html rdoc/fr_method_index.html rdoc/index.html rdoc/rdoc-style.css @@ -3,7 +3,8 @@ module GettextToI18n GETTEXT_METHOD = /\_\(([\''\%\{\}\=\>\:a-zA-Z0-9 \"]*)\)/ GETTEXT_VARIABLES = /\%\{(\w+)\}*/ - GETTEXT_VARIABLE_CONTENTS = /:(\w+)[ *]\=\>[ *]([a-zA-Z\_\-\:\'\(\)\"\.\#]+)/ + # GETTEXT_VARIABLE_CONTENTS = /:(\w+)[ *]\=\>[ *]([a-zA-Z\_\-\:\'\(\)\"\.\#]+)/ + GETTEXT_VARIABLE_CONTENTS = /_\(.*:(\w+)[ *]\=\>[ *]([a-zA-Z\_\-\:\'\(\)\"\.\#]+)/ attr_reader :translations @@ -25,14 +26,14 @@ module GettextToI18n add_translation(result[:id], contents) i18ncall = construct_i18n_call(result[:id], line) - puts "-----------" - - line.gsub!(/(\_\(.+\))/, i18ncall) - - - puts line - puts contents - puts + #puts "-----------" + #puts line + #line.gsub!(/(\_\(.+\))/, i18ncall) + # + # + #puts line + #puts contents + #puts end end lib/convertor.rb @@ -65,8 +65,12 @@ class GettextToI18nTest < Test::Unit::TestCase 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 [], convertor.get_method_vars(line) + end end test/gettext_to_i18n_test.rb c63088f37befc364579279fd12c3d7830333f86c Jaap van der Meer jaapvandermeer@gmail.com http://github.com/japetheape/gettext_to_i18n/commit/9e5a2824d526959932d0db7be297f3db1aa0d277 9e5a2824d526959932d0db7be297f3db1aa0d277 2008-09-09T05:36:37-07:00 2008-09-09T05:36:37-07:00 Added documentation f5526c4ac6eaf6740fed79c866b9242db2242155 Jaap van der Meer jaapvandermeer@gmail.com