diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 01244b36..23f06ea6 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -15,7 +15,7 @@ namespace :dev do
                    :content_en => File.open("#{RAILS_ROOT}/lib/template/#{page_name}.page.en").read )
       end
       
-      ["nav", "footer"].each do |page_name|
+      ["nav", "footer", "locale"].each do |page_name|
       Snippet.create!( :name => page_name, :parent_name => "root",
                       :content_zh_tw => File.open("#{RAILS_ROOT}/lib/template/#{page_name}.snippet.zh_tw").read,
                       :content_en => File.open("#{RAILS_ROOT}/lib/template/#{page_name}.snippet.en").read )                   
diff --git a/lib/template/locale.snippet.en b/lib/template/locale.snippet.en
new file mode 100644
index 00000000..490dd3a5
--- /dev/null
+++ b/lib/template/locale.snippet.en
@@ -0,0 +1,4 @@
+<ul>
+<li><a href="?locale=en">English</a></li>
+<li><a href="?locale=zh_tw">中文版</a></li>
+</ul>
\ No newline at end of file
diff --git a/lib/template/locale.snippet.zh_tw b/lib/template/locale.snippet.zh_tw
new file mode 100644
index 00000000..490dd3a5
--- /dev/null
+++ b/lib/template/locale.snippet.zh_tw
@@ -0,0 +1,4 @@
+<ul>
+<li><a href="?locale=en">English</a></li>
+<li><a href="?locale=zh_tw">中文版</a></li>
+</ul>
\ No newline at end of file
diff --git a/lib/template/root.layout.en b/lib/template/root.layout.en
index d9e80fca..d1db9974 100644
--- a/lib/template/root.layout.en
+++ b/lib/template/root.layout.en
@@ -17,6 +17,7 @@
 	</div>
 
     <div id="footer">
+         {{ 'locale' | render_snippet }}
          {{ 'footer' | render_snippet }}
     </div>
     
diff --git a/lib/template/root.layout.zh_tw b/lib/template/root.layout.zh_tw
index d9e80fca..d1db9974 100644
--- a/lib/template/root.layout.zh_tw
+++ b/lib/template/root.layout.zh_tw
@@ -17,6 +17,7 @@
 	</div>
 
     <div id="footer">
+         {{ 'locale' | render_snippet }}
          {{ 'footer' | render_snippet }}
     </div>