Revert i18n changes

We haven't merged that branch yet to trunk

app/controllers/application_controller.rb

@@ -42,8 +42,6 @@ class ApplicationController < ActionController::Base
   extend ActionView::Helpers::SanitizeHelper::ClassMethods
   helper_method :format_date, :markdown
 
-    I18n.locale = Tracks::Config.locale
-
   # By default, sets the charset to UTF-8 if it isn't already set
   def set_charset
     headers["Content-Type"] ||= "text/html; charset=UTF-8" 
@@ -278,7 +276,8 @@ class ApplicationController < ActionController::Base
   
   def set_time_zone
     Time.zone = current_user.prefs.time_zone if logged_in?
-    I18n.locale = Tracks::Config.locale
+    locale = params[:locale] || 'en-US'
+    I18n.locale = locale
   end
 
   def set_zindex_counter

app/views/users/new.html.erb

@@ -1,7 +1,7 @@
 <div title="Account signup" id="signupform" class="form">
 <% form_tag :action=> "create" do %>
 
-  <%#= error_messages_for 'user' %><br/>
+  <%= error_messages_for 'user' %><br/>
 
   <%= render_flash %>
 	

config/site.yml.tmpl

@@ -25,7 +25,6 @@ authentication_schemes:
 # You''ll probably want to change this to the time zone of the computer where Tracks is running
 # run rake time:zones:local have Rails suggest time zone names on your system
 time_zone: "UTC"
-locale: 'en-US'
 
 
 # setting this to true will make the cookies only available over HTTPS

lib/tracks/config.rb

@@ -23,10 +23,5 @@ module Tracks
         auth_schemes.first
       end
     end
-
-    def self.locale
-       SITE_CONFIG['locale'] || 'en-US'
-    end
-
   end
 end