First stage of i18n. Some migrations and extra plugins.
This commit is contained in:
parent
6ac7f91734
commit
53b4d645d8
82 changed files with 6876 additions and 18 deletions
|
@ -100,6 +100,10 @@ class ApplicationController < ActionController::Base
|
|||
response.headers['Error'] = message
|
||||
render :text => message, :status => status
|
||||
end
|
||||
|
||||
def set_locale
|
||||
request.compatible_language_from(I18n.backend.available_locales)
|
||||
end
|
||||
|
||||
def api_call_handle_error
|
||||
begin
|
||||
|
@ -134,7 +138,6 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
private
|
||||
|
||||
# extract authorisation credentials from headers, returns user = nil if none
|
||||
def get_auth_data
|
||||
if request.env.has_key? 'X-HTTP_AUTHORIZATION' # where mod_rewrite might have put it
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
class DiaryEntryController < ApplicationController
|
||||
layout 'site', :except => :rss
|
||||
|
||||
before_filter :set_locale
|
||||
before_filter :authorize_web
|
||||
before_filter :require_user, :only => [:new, :edit]
|
||||
before_filter :check_database_readable
|
||||
|
@ -30,12 +31,7 @@ class DiaryEntryController < ApplicationController
|
|||
if @user != @diary_entry.user
|
||||
redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
|
||||
elsif params[:diary_entry]
|
||||
@diary_entry.title = params[:diary_entry][:title]
|
||||
@diary_entry.body = params[:diary_entry][:body]
|
||||
@diary_entry.latitude = params[:diary_entry][:latitude]
|
||||
@diary_entry.longitude = params[:diary_entry][:longitude]
|
||||
|
||||
if @diary_entry.save
|
||||
if @diary_entry.update_attributes(params[:diary_entry])
|
||||
redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
|
||||
end
|
||||
end
|
||||
|
@ -93,6 +89,15 @@ class DiaryEntryController < ApplicationController
|
|||
else
|
||||
render :nothing => true, :status => :not_found
|
||||
end
|
||||
elsif params[:language]
|
||||
@entries = DiaryEntry.find(:all, :include => :user,
|
||||
:conditions => ["users.visible = ? AND diary_entries.language = ?", true, params[:language]],
|
||||
:order => 'created_at DESC', :limit => 20)
|
||||
@title = "OpenStreetMap diary entries in #{params[:language]}"
|
||||
@description = "Recent diary entries from users of OpenStreetMap"
|
||||
@link = "http://#{SERVER_URL}/diary/#{params[:language]}"
|
||||
|
||||
render :content_type => Mime::RSS
|
||||
else
|
||||
@entries = DiaryEntry.find(:all, :include => :user,
|
||||
:conditions => ["users.visible = ?", true],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue