Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-21 14:44:07 +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 extend ActionView::Helpers::SanitizeHelper::ClassMethods
helper_method :format_date, :markdown helper_method :format_date, :markdown
I18n.locale = Tracks::Config.locale
# By default, sets the charset to UTF-8 if it isn't already set # By default, sets the charset to UTF-8 if it isn't already set
def set_charset def set_charset
headers["Content-Type"] ||= "text/html; charset=UTF-8" headers["Content-Type"] ||= "text/html; charset=UTF-8"
@ -278,7 +276,8 @@ class ApplicationController < ActionController::Base
def set_time_zone def set_time_zone
Time.zone = current_user.prefs.time_zone if logged_in? Time.zone = current_user.prefs.time_zone if logged_in?
I18n.locale = Tracks::Config.locale locale = params[:locale] || 'en-US'
I18n.locale = locale
end end
def set_zindex_counter def set_zindex_counter

2
app/views/users/new.html.erb
View file

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

1
config/site.yml.tmpl
View file

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

5
lib/tracks/config.rb
View file

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