localhots/oldhaven
1
0
Fork 0
Code Releases Activity

Added site locales

Browse Source
This commit is contained in:
magnolia-fan
2011-06-30 09:12:52 +04:00
parent 124e9e481e
commit 13a233ac72
26 changed files with 406 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/user_controller.rb
+14 -6
View File
@@ -8,6 +8,7 @@ class UserController < ApplicationController
if user.nil?
user = User.new
user.vkid = params[:mid]
user.lang = 'ru'
user.save
@res[:newbie] = true
end
@@ -20,10 +21,13 @@ class UserController < ApplicationController
:name => user.name,
:email => user.email,
:vkid => user.vkid,
:lastfm_username => user.lastfm_username,
:lastfm_login_url => 'http://www.last.fm/api/auth?api_key='+ LastFmController.api_key +
'&cb=http://'+ request.host << '/lastfm/connect/?sid='+ user.session.key
:lang => user.lang,
:lastfm_username => user.lastfm_username
}
unless user.lastfm_username
@res[:lastfm_login_url] = 'http://www.last.fm/api/auth?api_key='+ LastFmController.api_key +
'&cb=http://'+ request.host << '/lastfm/connect/?sid='+ user.session.key
end
render :json => @res
end
@@ -36,6 +40,7 @@ class UserController < ApplicationController
unless params[:username].nil? or params[:email].nil?
user.name = params[:username]
user.email = params[:email]
user.lang = params[:lang] if ['ru', 'en'].include? params[:lang]
user.save
end
@res[:user] = {
@@ -43,10 +48,13 @@ class UserController < ApplicationController
:name => user.name,
:email => user.email,
:vkid => user.vkid,
:lastfm_username => user.lastfm_username,
:lastfm_login_url => 'http://www.last.fm/api/auth?api_key='+ LastFmController.api_key +
'&cb=http://'+ request.host << '/lastfm/connect/?sid='+ user.session.key
:lang => user.lang,
:lastfm_username => user.lastfm_username
}
unless user.lastfm_username
@res[:lastfm_login_url] = 'http://www.last.fm/api/auth?api_key='+ LastFmController.api_key +
'&cb=http://'+ request.host << '/lastfm/connect/?sid='+ user.session.key
end
render :json => @res
end