Create page.

lib/parser.rb

@@ -47,10 +47,14 @@ module Parser
           when 'destroy'
             var = I18nVariable.find(tag.attr['id'])
             var.destroy
-          else
-            tag.attr[I18n.locale.to_s] rescue nil
         end
       end
+      c.define_tag 'multi_lang' do |tag|
+        tag.expand
+      end
+      c.define_tag 'multi_lang:lang' do |tag|
+        tag.expand if tag.attr['name'].eql?(I18n.locale.to_s)
+      end
       c.define_tag 'css' do |tag|
         assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))
         res = ''
@@ -123,36 +127,11 @@ module Parser
           end
         }.join(' | ')
       end
-      c.define_tag 'locale' do |tag|
-        case attributes[:locale]
-          when 'create'
-            var = I18nVariable.new(:key => (tag.attr['name'] rescue nil), :document_class => 'Text')
-            @site.valid_locales.each do |locale|
-              var[locale] = tag.attr[locale] rescue nil
-            end
-            var.save!
-            res = ''
-            res << "<r:locale id='#{var.id}' " 
-            res << "name='#{var.key}' " if var.key
-            @site.valid_locales.each do |locale|
-              res << "#{locale}='#{var[locale]}' "
-            end
-            res << '/>'
-          when 'show'
-            var = I18nVariable.find(tag.attr['id'])
-            res = ''
-            res << "<r:locale " 
-            res << "name='#{var.key}' " if var.key
-            @site.valid_locales.each do |locale|
-              res << "#{locale}='#{var[locale]}' "
-            end
-            res << '/>'
-          when 'destroy'
-            var = I18nVariable.find(tag.attr['id'])
-            var.destroy
-          else
-            tag.attr[I18n.locale.to_s] rescue nil
-        end
+      c.define_tag 'multi_lang' do |tag|
+        tag.expand
+      end
+      c.define_tag 'multi_lang:lang' do |tag|
+        tag.expand if tag.attr['name'].eql?(I18n.locale.to_s)
       end
       c.define_tag 'css' do |tag|
         assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))

lib/tasks/dev.rake

@@ -51,15 +51,15 @@ namespace :dev do
     
     
     layout = Layout.create!( :name => 'root', :description => 'root', :content => File.open("#{RAILS_ROOT}/lib/template/root.layout").read )
-    layout.layout_parts.create!( :name => 'header', :content => "<r:language_bar /><r:snippet name='nav' />" )
+    layout.layout_parts.create!( :name => 'header', :content => File.open("#{RAILS_ROOT}/lib/template/nav.snippet").read )
     layout.layout_parts.create!( :name => 'main_content' )
-    layout.layout_parts.create!( :name => 'footer', :content => "<r:snippet name='footer' />" )
+    layout.layout_parts.create!( :name => 'footer', :content => File.open("#{RAILS_ROOT}/lib/template/footer.snippet").read )
     
     home = Page.create!( :i18n_variable_id => var_10.id, :layout_id => layout.id, :name => 'home', :is_published => true )
-    home.page_parts.create!( :name => 'main_content', :content => "<r:locale en='This is the homepage' zh_tw='這是首頁' />", :kind => 'text', :i18n_variable_id => var_13.id )
+    home.page_parts.create!( :name => 'main_content', :content => File.open("#{RAILS_ROOT}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
     
     about = Page.create!( :i18n_variable_id => var_11.id, :layout_id => layout.id, :name => 'about', :is_published => true, :parent_id => home.id )    
-    about.page_parts.create!( :name => 'main_content', :content => "<r:locale en='This is about' zh_tw='這是關於' />", :kind => 'text', :i18n_variable_id => var_14.id )                  
+    about.page_parts.create!( :name => 'main_content', :content => File.open("#{RAILS_ROOT}/lib/template/about.page").read, :kind => 'text', :i18n_variable_id => var_14.id )                  
     
     Link.create!( :i18n_variable_id => var_12.id, :name => 'google', :is_published => true, :parent_id => home.id, :url => 'www.google.com' )
     

lib/template/about.page

@@ -1 +1,8 @@
-This is about
+<r:multi_lang>
+	<r:lang name='en'>
+		<p>This is about</p>
+	</r:lang>
+	<r:lang name='zh_tw'>
+		<p>這是關於</p>
+	</r:lang>
+</r:multi_lang>

lib/template/footer.snippet

@@ -1 +1,8 @@
-<p>Footer</p>
+<r:multi_lang>
+	<r:lang name='en'>
+		<p>Footer</p>
+	</r:lang>
+	<r:lang name='zh_tw'>
+		<p>頁腳</p>
+	</r:lang>
+</r:multi_lang>

lib/template/home.page

@@ -1 +1,8 @@
-<r:locale en='This is the homepage' zh_tw='這是首頁' />
+<r:multi_lang>
+	<r:lang name='en'>
+		<p>This is the homepage</p>
+	</r:lang>
+	<r:lang name='zh_tw'>
+		<p>t這是首頁</p>
+	</r:lang>
+</r:multi_lang>

lib/template/nav.snippet

@@ -1,5 +1,27 @@
 <ul>
-  <li><a href='/'><r:locale en='Home' zh_tw='首頁' /></a></li>
-  <li><a href='/about'><r:locale en='About' zh_tw='關於我們' /></a></li>
+  <li>
+		<a href='/'>
+			<r:multi_lang>
+				<r:lang name='en'>
+					Home
+				</r:lang>
+				<r:lang name='zh_tw'>
+					首頁
+				</r:lang>
+			</r:multi_lang>
+		</a>
+	</li>
+  <li>
+		<a href='/about'>
+			<r:multi_lang>
+				<r:lang name='en'>
+					About
+				</r:lang>
+				<r:lang name='zh_tw'>
+					關於我們
+				</r:lang>
+			</r:multi_lang>
+		</a>
+	</li>
   <li><a href='/google'>Google</a></li>
 </ul>