@@ -1,11 +1,11 @@ GettextToI18n ============= -ABOUT This plugin will convert your complete Rails project from Gettext calls to the new i18n api calls introduced in Rails 2.2.2. NB: This plugin is higly experimental, so before running, BACKUP YOUR CODE. It will touch your code and things always can go wrong! -EXAMPLE +Example +======= <%=_("Some string that will be translated, into %{lan}" % {:lan => 'english'}) %> will be converted into: @@ -19,7 +19,8 @@ it will then place a entry: in the standard.yml locale file it generates. -NAMESPACES +About namespaces +======== By default the plugin walks all files in the app directory. It places the message id's into namespaces. The namespace are divided like this: Controllers: translation[:txt][:controller][:controller_name] @@ -28,10 +29,17 @@ By default the plugin walks all files in the app directory. It places the messag -USAGE +Usage +======= To convert all your views, controllers and models to the new format. -rake gettext_to_i18n:transform + rake gettext_to_i18n:transform + + +Installation +======= +./script/plugin install git://github.com/japetheape/gettext_to_i18n.git + ------------- README @@ -19,15 +19,22 @@ module GettextToI18n def transform_files!(files, type) files.each do |file| parsed = "" - alternative_filename = Base.get_name(file, type) - n = Namespace.new([DEFAULT_LANGUAGE, 'txt', type, alternative_filename]) + namespace = [DEFAULT_LANGUAGE, 'txt', type] + Base.get_namespace(file, type) + puts "Converting: " + file + " into namespace: " + puts namespace.map {|x| "[\"#{x}\"]"}.join("") - File.read(file).each do |line| - parsed << GettextI18nConvertor.string_to_i18n(line, n) - end + n = Namespace.new(namespace) + contents = Base.get_file_as_string(file) + parsed << GettextI18nConvertor.string_to_i18n(contents, n) + + #puts parsed # write the file + File.open(file, 'w') { |file| file.write(parsed)} + + + n.merge(@translations) end end @@ -40,33 +47,46 @@ module GettextToI18n private - + + + def self.get_file_as_string(filename) + data = '' + f = File.open(filename, "r") + f.each_line do |line| + data += line + end + return data + end # returns a name for a file # example: # Base.get_name('/controllers/apidoc_controller.rb', 'controller') => 'apidoc' - def self.get_name(file, type) + def self.get_namespace(file, type) case type when :controller if result = /application\.rb/.match(file) - return 'application' + return ['application'] else result = /([a-zA-Z]+)_controller.rb/.match(file) - return result[1] + return [result[1]] end return "" when :helper result = /([a-zA-Z]+)_helper.rb/.match(file) - return result[1] + return [result[1]] when :model result = /([a-zA-Z]+).rb/.match(file) - return result[1] + return [result[1]] when :view - result = /views\/([\_a-zA-Z]+)\//.match(file) - return result[1] + result = /views\/([\_a-zA-Z]+)\/([\_a-zA-Z]+).*\.([a-zA-Z]+)/.match(file) + if result[3] != "erb" + return [result[1], result[2], result[3]] + else + return [result[1], result[2]] + end when :lib result = /([a-zA-Z]+).rb/.match(file) - return result[1] + return [result[1]] end end lib/base.rb @@ -14,7 +14,7 @@ module GettextToI18n # All view files def self.view_files - self.get_files('app/views', '**/*.erb') + self.get_files('app/views', '**/*.{erb,builder}') end # All view files lib/files.rb @@ -11,9 +11,16 @@ module GettextToI18n # The contents of the method call def contents - if result = /\_\([\"\']?([^\'\"]*)[\"\']?.*\)/.match(@text) - #if result = /\_\([\"\'](.*)[\"\']\)/.match(@text) - return result[1] + #if result = /\_\([\"\']?([^\'\"]*)[\"\']?.*\)/.match(@text) + + #if result = /\_\(([\']?([^\']*)[\'])|([\"]?([^\"]*)[\"])?.*\)/.match(@text) + single_quotes = /\_\(\'([^']*)\'.*\)/.match(@text) + double_quotes = /\_\(\"([^"]*)\".*\)/.match(@text) + + if single_quotes + return single_quotes[1] + elsif double_quotes + return double_quotes[1] else return nil end @@ -39,7 +46,7 @@ module GettextToI18n # return :a => 'sdf', :b => 'agh' def variable_part @variable_part_cached ||= begin - result = /\% \{(.*)\}/.match(@text) + result = /\%[\s]+\{(.*)\}/.match(@text) if result result[1] end @@ -78,7 +85,7 @@ module GettextToI18n vsplitted = get_variables_splitted return nil if vsplitted.nil? vsplitted.map! { |v| - r = v.match(/ *:(\w+) *=> *(.*)/) + r = v.match(/\s*:(\w+)\s*=>\s*(.*)/) {:name => r[1], :value => GettextI18nConvertor.string_to_i18n(r[2], @namespace)} } end @@ -89,7 +96,7 @@ module GettextToI18n def to_i18n id = @namespace.consume_id! @namespace.set_id(id, contents_i18n) - output = "t(:#{id}" + output = "I18n.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 @@ -31,7 +31,7 @@ module GettextToI18n def i18n_namespace @cached_i18n_namespace ||= begin a = @namespace.dup - a.delete("txt") + #a.delete("txt") a.delete(Base::DEFAULT_LANGUAGE) a end @@ -50,6 +50,7 @@ module GettextToI18n arr = 'base' + loc eval arr + ' = {} if ' + arr + '.nil?' end + eval 'base' + loc + ' = @ids' end lib/namespace.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 "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 "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 ":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', :scope => [:somenamespace]) %>", GettextI18nConvertor.string_to_i18n("<%=_('aaa' % {:a => 'sdf', :b => 'agh'}) %>", Namespace.new("somenamespace")) + assert_equal "<%=I18n.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, :scope => [:somenamespace]) + t(:message_1, :scope => [:somenamespace])", :name=>"a"}, {:value=>"'21'", :name=>"b"}], t.variables + 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 "<%=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")) + 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")) end def test_variable_parts - 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 + 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 end @@ -67,14 +67,26 @@ module GettextToI18n 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')) - - str = "o << content_tag(:div, _(\"Plan your own home with the free floorplanner\"), :class => \"content\")" - t = GettextI18nConvertor.string_to_i18n(str, Namespace.new('d')) puts t end + + def test_quotes + + n =GettextToI18n::Namespace.new("somenamespace") + str = "_('The easiest way to <span class=\"highlight\">create</span> and<br /> <span class=\"highlight\">share</span> interactive floorplans')" + t = GettextToI18n::GettextI18nConvertor.new(str, n) + assert_equal 'The easiest way to <span class="highlight">create</span> and<br /> <span class="highlight">share</span> interactive floorplans', t.contents + puts t.text + + + t = GettextToI18n::GettextI18nConvertor.new("_(\"Save\")", n) + assert_equal "Save", t.contents + + end + end end \ No newline at end of file test/gettext_i18n_convertor_test.rb 890a20464bde7b499d2e4a2959ca346b9c54b05f Jaap van der Meer jaapvandermeer@gmail.com http://github.com/japetheape/gettext_to_i18n/commit/803a02bd3bf7d7017dc299488eff1e6621af991f 803a02bd3bf7d7017dc299488eff1e6621af991f 2008-09-16T10:10:29-07:00 2008-09-16T10:10:29-07:00 Now completely converts and writes yaml file 5746f4c1f24e298d13fd603d8c42e027d76f3668 Jaap van der Meer jaapvandermeer@gmail.com