From f0f111aced146d78b4c31a6175c0150bc6497c50 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 3 Jun 2009 08:06:03 +0000 Subject: [PATCH] Make a few more things translatable. --- app/controllers/message_controller.rb | 16 +++---- app/controllers/user_controller.rb | 58 ++++++++++++++----------- config/locales/en.yml | 18 ++++++++ test/functional/user_controller_test.rb | 2 +- 4 files changed, 59 insertions(+), 35 deletions(-) diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 183f8004a..155e619d7 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -12,7 +12,7 @@ class MessageController < ApplicationController # clicks send. # The user_id param is the id of the user that the message is being sent to. def new - @title = 'send message' + @title = t 'message.new.title' @to_user = User.find(params[:user_id]) if params[:message] @message = Message.new(params[:message]) @@ -21,7 +21,7 @@ class MessageController < ApplicationController @message.sent_on = Time.now.getutc if @message.save - flash[:notice] = 'Message sent' + flash[:notice] = t 'message.new.message_sent' Notifier::deliver_message_notification(@message) redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end @@ -45,7 +45,7 @@ class MessageController < ApplicationController # Show a message def read - @title = 'read message' + @title = t 'message.read.title' @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) @message.message_read = true if @message.to_user_id == @user.id @message.save @@ -55,7 +55,7 @@ class MessageController < ApplicationController # Display the list of messages that have been sent to the user. def inbox - @title = 'inbox' + @title = t 'message.inbox.title' if @user and params[:display_name] == @user.display_name else redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name @@ -64,7 +64,7 @@ class MessageController < ApplicationController # Display the list of messages that the user has sent to other users. def outbox - @title = 'outbox' + @title = t 'message.outbox.title' if @user and params[:display_name] == @user.display_name else redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name @@ -78,14 +78,14 @@ class MessageController < ApplicationController message = Message.find_by_id(id) if params[:mark] == 'unread' message_read = false - mark_type = 'unread' + notice = t 'message.mark.as_unread' else message_read = true - mark_type = 'read' + notice = t 'message.mark.as_read' end message.message_read = message_read if message.save - flash[:notice] = "Message marked as #{mark_type}" + flash[:notice] = notice redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 1dbc9368d..fa0adef56 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -12,7 +12,7 @@ class UserController < ApplicationController filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation def save - @title = 'create account' + @title = t 'user.new.title' if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) render :action => 'new' @@ -26,7 +26,7 @@ class UserController < ApplicationController @user.languages = request.user_preferred_languages if @user.save - flash[:notice] = I18n.t('user.new.flash create success message') + flash[:notice] = t 'user.new.flash create success message' Notifier.deliver_signup_confirm(@user, @user.tokens.create) redirect_to :action => 'login' else @@ -36,7 +36,8 @@ class UserController < ApplicationController end def account - @title = 'edit account' + @title = t 'user.account.title' + if params[:user] and params[:user][:display_name] and params[:user][:description] if params[:user][:email] != @user.email @user.new_email = params[:user][:email] @@ -58,10 +59,10 @@ class UserController < ApplicationController set_locale if params[:user][:email] == @user.new_email - flash[:notice] = I18n.t('user.account.flash update success confirm needed') + flash[:notice] = t 'user.account.flash update success confirm needed' Notifier.deliver_email_confirm(@user, @user.tokens.create) else - flash[:notice] = I18n.t('user.account.flash update success') + flash[:notice] = t 'user.account.flash update success' end end end @@ -72,7 +73,7 @@ class UserController < ApplicationController @user.home_lat = params[:user][:home_lat].to_f @user.home_lon = params[:user][:home_lon].to_f if @user.save - flash[:notice] = I18n.t('user.set_home.flash success') + flash[:notice] = t 'user.set_home.flash success' redirect_to :controller => 'user', :action => 'account' end end @@ -81,27 +82,29 @@ class UserController < ApplicationController def go_public @user.data_public = true @user.save - flash[:notice] = I18n.t('user.go_public.flash success') + flash[:notice] = t 'user.go_public.flash success' redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name end def lost_password - @title = I18n.t('user.lost_password.title') + @title = t 'user.lost_password.title' + if params[:user] and params[:user][:email] user = User.find_by_email(params[:user][:email], :conditions => {:visible => true}) if user token = user.tokens.create Notifier.deliver_lost_password(user, token) - flash[:notice] = I18n.t('user.lost_password.notice email on way') + flash[:notice] = t 'user.lost_password.notice email on way' else - flash[:notice] = I18n.t('user.lost_password.notice email cannot find') + flash[:notice] = t 'user.lost_password.notice email cannot find' end end end def reset_password - @title = I18n.t('user.reset_password.title') + @title = t 'user.reset_password.title' + if params['token'] token = UserToken.find_by_token(params[:token]) if token @@ -114,9 +117,9 @@ class UserController < ApplicationController user.save! token.destroy Notifier.deliver_reset_password(user, pass) - flash[:notice] = I18n.t('user.reset_password.flash changed check mail') + flash[:notice] = t 'user.reset_password.flash changed check mail' else - flash[:notice] = I18n.t('user.reset_password.flash token bad') + flash[:notice] = t 'user.reset_password.flash token bad' end end @@ -124,7 +127,8 @@ class UserController < ApplicationController end def new - @title = 'create account' + @title = t 'user.new.title' + # The user is logged in already, so don't show them the signup page, instead # send them to the home page redirect_to :controller => 'site', :action => 'index' if session[:user] @@ -140,7 +144,9 @@ class UserController < ApplicationController end return end - @title = 'login' + + @title = t 'user.login.title' + if params[:user] email_or_display_name = params[:user][:email] pass = params[:user][:password] @@ -154,9 +160,9 @@ class UserController < ApplicationController end return elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true) - @notice = I18n.t('user.login.account not active') + @notice = t 'user.login.account not active' else - @notice = I18n.t('user.login.auth failure') + @notice = t 'user.login.auth failure' end end end @@ -186,11 +192,11 @@ class UserController < ApplicationController @user.email_valid = true @user.save! token.destroy - flash[:notice] = I18n.t('user.confirm.success') + flash[:notice] = t 'user.confirm.success' session[:user] = @user.id redirect_to :action => 'account', :display_name => @user.display_name else - @notice = I18n.t('user.confirm.failure') + @notice = t 'user.confirm.failure' end end end @@ -206,11 +212,11 @@ class UserController < ApplicationController @user.email_valid = true @user.save! token.destroy - flash[:notice] = I18n.t('user.confirm_email.success') + flash[:notice] = t 'user.confirm_email.success' session[:user] = @user.id redirect_to :action => 'account', :display_name => @user.display_name else - @notice = I18n.t('user.confirm_email.failure') + @notice = t 'user.confirm_email.failure' end end end @@ -259,13 +265,13 @@ class UserController < ApplicationController friend.friend_user_id = new_friend.id unless @user.is_friends_with?(new_friend) if friend.save - flash[:notice] = "#{name} is now your friend." + flash[:notice] = t 'user.make_friend.success', :name => name Notifier.deliver_friend_notification(friend) else - friend.add_error("Sorry, failed to add #{name} as a friend.") + friend.add_error(t('user.make_friend.failed', :name => name)) end else - flash[:notice] = "You are already friends with #{name}." + flash[:notice] = t 'user.make_friend.already_a_friend', :name => name end redirect_to :controller => 'user', :action => 'view' @@ -278,9 +284,9 @@ class UserController < ApplicationController friend = User.find_by_display_name(name, :conditions => {:visible => true}) if @user.is_friends_with?(friend) Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}" - flash[:notice] = "#{friend.display_name} was removed from your friends." + flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name else - flash[:notice] = "#{friend.display_name} is not one of your friends." + flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name end redirect_to :controller => 'user', :action => 'view' diff --git a/config/locales/en.yml b/config/locales/en.yml index 0cabeaec0..eb68863a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -361,6 +361,7 @@ en: current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.' message: inbox: + title: "Inbox" my_inbox: "My inbox" outbox: "outbox" you_have: "You have {{new_count}} new messages and {{old_count}} old messages" @@ -374,15 +375,18 @@ en: read_button: "Mark as read" reply_button: "Reply" new: + title: "Send message" send_message_to: "Send a new message to {{name}}" subject: "Subject" body: "Body" send_button: "Send" back_to_inbox: "Back to inbox" + message_sent: "Message sent" no_such_user: no_such_user: "No such user or message" sorry: "Sorry there is no user or message with that name or id" outbox: + title: "Outbox" my_inbox: "My {{inbox_link}}" inbox: "inbox" outbox: "outbox" @@ -393,6 +397,7 @@ en: no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?" people_mapping_nearby: "people mapping nearby" read: + title: "Read message" reading_your_messages: "Reading your messages" from: "From" subject: "Subject" @@ -403,6 +408,9 @@ en: reading_your_sent_messages: "Reading your sent messages" to: "To" back_to_outbox: "Back to outbox" + mark: + as_read: "Message marked as read" + as_unread: "Message marked as unread" site: index: home: "home" @@ -507,6 +515,7 @@ en: made_public: "Track made public" user: login: + title: "Login" heading: "Login" please login: "Please login or {{create_user_link}}." create_account: "create an account" @@ -528,6 +537,7 @@ en: flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)" flash token bad: "Didn't find that token, check the URL maybe?" new: + title: "Create account" heading: "Create a User Account" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. ' @@ -576,6 +586,7 @@ en: your location: Your location nearby mapper: "Nearby mapper: " account: + title: "Edit account" my settings: My settings email never displayed publicly: "(never displayed publicly)" public editing: @@ -613,3 +624,10 @@ en: flash success: "Home location saved successfully" go_public: flash success: "All your edits are now public, and you are now allowed to edit." + make_friend: + success: "{{name}} is now your friend." + failed: "Sorry, failed to add {{name}} as a friend." + already_a_friend: "You are already friends with {{name}}." + remove_friend: + success: "{{name} was removed from your friends." + not_a_friend: "{{name}} is not one of your friends." diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index d68f1f883..8d90b2bcf 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -10,7 +10,7 @@ class UserControllerTest < ActionController::TestCase assert_select "html:root", :count => 1 do assert_select "head", :count => 1 do - assert_select "title", :text => /create account/, :count => 1 + assert_select "title", :text => /Create account/, :count => 1 end assert_select "body", :count => 1 do assert_select "div#content", :count => 1 do -- 2.43.2