Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-27 04:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert i18n changes

Browse source 
We haven't merged that branch yet to trunk
This commit is contained in:
Eric Allen 2010-01-12 17:49:29 -08:00
parent f33b747422
commit b87f4cc12e
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/application_controller.rb
View file

@ -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