0
@@ -16,7 +16,7 @@ class AdminController < BaseController
0
   def activate_user
0
     user = User.find(params[:id])
0
     user.activate
0
-    flash[:notice] = "The user was activated"
0
+    flash[:notice] = "The user was activated".l
0
     redirect_to :action => :users
0
   end
0
   

0
@@ -41,7 +41,7 @@ class AdsController < BaseController
0
 
0
     respond_to do |format|
0
       if @ad.save
0
-        flash[:notice] = 'Ad was successfully created.'
0
+        flash[:notice] = 'Ad was successfully created.'.l
0
         format.html { redirect_to ad_url(@ad) }
0
         format.xml  { head :created, :location => ad_url(@ad) }
0
       else
0
@@ -58,7 +58,7 @@ class AdsController < BaseController
0
 
0
     respond_to do |format|
0
       if @ad.update_attributes(params[:ad])
0
-        flash[:notice] = 'Ad was successfully updated.'
0
+        flash[:notice] = 'Ad was successfully updated.'.l
0
         format.html { redirect_to ad_url(@ad) }
0
         format.xml  { head :ok }
0
       else

0
@@ -77,12 +77,12 @@ class BaseController < ApplicationController
0
     if @user = User.find(params[:user_id] || params[:id])
0
       @is_current_user = (@user && @user.eql?(current_user))
0
       unless logged_in? || @user.profile_public?
0
-        flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it."
0
+        flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it.".l
0
         redirect_to :controller => 'sessions', :action => 'new'        
0
       end
0
       return @user
0
     else
0
-      flash.now[:error] = "Please log in."
0
+      flash.now[:error] = "Please log in.".l
0
       redirect_to :controller => 'sessions', :action => 'new'
0
       return false
0
     end

0
@@ -63,7 +63,7 @@ class CategoriesController < BaseController
0
     
0
     respond_to do |format|
0
       if @category.save
0
-        flash[:notice] = 'Category was successfully created.'
0
+        flash[:notice] = 'Category was successfully created.'.l
0
         
0
         format.html { redirect_to category_url(@category) }
0
         format.xml do

0
@@ -145,7 +145,7 @@ class ClippingsController < BaseController
0
     respond_to do |format|
0
       if @clipping.save!
0
         @clipping.tag_with(params[:tag_list] || '')     
0
-        flash[:notice] = 'Clipping was successfully created.'
0
+        flash[:notice] = 'Clipping was successfully created.'.l
0
         format.html { 
0
           unless params[:user_id]
0
             redirect_to_url(@clipping.url) rescue redirect_to user_clipping_url(@user, @clipping) 

0
@@ -13,7 +13,7 @@ class CommentsController < BaseController
0
     @commentable = Inflector.constantize(Inflector.camelize(params[:commentable_type])).find(params[:commentable_id])
0
 
0
     unless logged_in? || @commentable && @commentable.owner.profile_public?
0
-      flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it."
0
+      flash.now[:error] = "This user's profile is not public. You'll need to create an account and log in to access it.".l
0
       redirect_to :controller => 'sessions', :action => 'new' and return
0
     end
0
 
0
@@ -54,7 +54,7 @@ class CommentsController < BaseController
0
     
0
     respond_to do |format|        
0
       format.html {
0
-        flash[:notice] = "Sorry, we couldn't find any comments for that #{Inflector.constantize(Inflector.camelize(params[:commentable_type]))}"
0
+        flash[:notice] = :no_comments_found.l_with_args(type => Inflector.constantize(Inflector.camelize(params[:commentable_type])))
0
         redirect_to :controller => 'base', :action => 'site_index' and return      
0
       }
0
       format.rss {
0
@@ -89,13 +89,13 @@ class CommentsController < BaseController
0
         UserNotifier.deliver_comment_notice(@comment) if should_receive_notification(@comment)
0
         deliver_comment_notice_to_previous_commenters(@comment)        
0
                 
0
-        flash.now[:notice] = 'Comment was successfully created.'        
0
+        flash.now[:notice] = 'Comment was successfully created.'.l        
0
         format.html { redirect_to :controller => Inflector.underscore(params[:commentable_type]).pluralize, :action => 'show', :id => params[:commentable_id], :user_id => @comment.recipient.id }
0
         format.js {
0
           render :partial => 'comments/comment.html.haml', :locals => {:comment => @comment, :highlighted => true}
0
         }
0
       else
0
-        flash.now[:error] = "Your comment couldn't be saved. #{@comment.errors.full_messages.join(", ")}"
0
+        flash.now[:error] = :comment_save_error.l_with_args(error => @comment.errors.full_messages.join(", "))
0
         format.html { redirect_to :controller => Inflector.underscore(params[:commentable_type]).pluralize, :action => 'show', :id => params[:commentable_id] }
0
         format.js{
0
           render :inline => flash[:error], :status => 500
0
@@ -108,9 +108,9 @@ class CommentsController < BaseController
0
     @comment = Comment.find(params[:id])
0
     if @comment.can_be_deleted_by(current_user)
0
       @comment.destroy
0
-      flash.now[:notice] = "The comment was deleted."
0
+      flash.now[:notice] = "The comment was deleted.".l
0
     else
0
-      flash.now[:error] = "Comment could not be deleted."
0
+      flash.now[:error] = "Comment could not be deleted.".l
0
     end
0
     respond_to do |format|
0
       format.html { redirect_to users_url }

0
@@ -42,7 +42,7 @@ class ContestsController < BaseController
0
     
0
     respond_to do |format|
0
       if @contest.save
0
-        flash[:notice] = 'Contest was successfully created.'
0
+        flash[:notice] = 'Contest was successfully created.'.l
0
         
0
         format.html { redirect_to contest_url(@contest) }
0
         format.xml do

0
@@ -26,7 +26,7 @@ class EventsController < BaseController
0
     
0
     respond_to do |format|
0
       if @event.save
0
-        flash[:notice] = 'Event was successfully created.'
0
+        flash[:notice] = 'Event was successfully created.'.l
0
         
0
         format.html { redirect_to events_path }
0
       else

0
@@ -22,7 +22,7 @@ class FriendshipsController < BaseController
0
  
0
     respond_to do |format|
0
       if @friendship.update_attributes(:friendship_status => FriendshipStatus[:denied]) && @friendship.reverse.update_attributes(:friendship_status => FriendshipStatus[:denied])
0
-        flash[:notice] = "The friendship was denied."
0
+        flash[:notice] = "The friendship was denied.".l
0
         format.html { redirect_to denied_user_friendships_path(@user) }
0
       else
0
         format.html { render :action => "edit" }
0
@@ -36,7 +36,7 @@ class FriendshipsController < BaseController
0
  
0
     respond_to do |format|
0
       if @friendship.update_attributes(:friendship_status => FriendshipStatus[:accepted]) && @friendship.reverse.update_attributes(:friendship_status => FriendshipStatus[:accepted])
0
-        flash[:notice] = "The friendship was accepted."
0
+        flash[:notice] = "The friendship was accepted.".l
0
         format.html { 
0
           redirect_to accepted_user_friendships_path(@user) 
0
         }
0
@@ -108,12 +108,12 @@ class FriendshipsController < BaseController
0
       if @friendship.save && reverse_friendship.save
0
         UserNotifier.deliver_friendship_request(@friendship) if @friendship.friend.notify_friend_requests?
0
         format.html {
0
-          flash[:notice] = "Requested friendship with #{@friendship.friend.login}."
0
+          flash[:notice] = :friendship_requested.l_with_args(:friend => @friendship.friend.login) 
0
           redirect_to accepted_user_friendships_path(@user)
0
         }
0
         format.js { render( :inline => "Requested friendship with #{@friendship.friend.login}." ) }        
0
       else
0
-        flash.now[:error] = 'Friendship could not be created'
0
+        flash.now[:error] = 'Friendship could not be created'.l
0
         @users = User.find(:all)
0
         format.html { redirect_to user_friendships_path(@user) }
0
         format.js { render( :inline => "Friendship request failed." ) }                

0
@@ -40,7 +40,7 @@ class HomepageFeaturesController < BaseController
0
     
0
     respond_to do |format|
0
       if @homepage_feature.save
0
-        flash[:notice] = 'Homepage Feature was successfully created.'
0
+        flash[:notice] = 'Homepage Feature was successfully created.'.l
0
         
0
         format.html { redirect_to homepage_feature_url(@homepage_feature) }
0
       else

0
@@ -44,7 +44,7 @@ class InvitationsController < BaseController
0
     
0
     respond_to do |format|
0
       if @invitation.save
0
-        flash[:notice] = 'Invitation was successfully created.'
0
+        flash[:notice] = 'Invitation was successfully created.'.l
0
         format.html { 
0
           unless params[:welcome]
0
             redirect_to user_path(@invitation.user) 

0
@@ -28,7 +28,7 @@ class MetroAreasController < BaseController
0
     
0
     respond_to do |format|
0
       if @metro_area.save
0
-        flash[:notice] = 'MetroArea was successfully created.'
0
+        flash[:notice] = 'MetroArea was successfully created.'.l
0
         
0
         format.html { redirect_to metro_area_url(@metro_area) }
0
         format.xml do

0
@@ -42,7 +42,7 @@ class OfferingsController < BaseController
0
     
0
     respond_to do |format|
0
       if @offering.save
0
-        flash[:notice] = 'Offering was successfully created.'
0
+        flash[:notice] = 'Offering was successfully created.'.l
0
         
0
         format.html { redirect_to user_offering_url(@offering) }
0
         format.xml do
0
@@ -91,9 +91,9 @@ class OfferingsController < BaseController
0
     @user = User.find(params[:user_id])
0
     @offering = Offering.find(params[:id])
0
     if @offering.destroy
0
-      flash.now[:notice] = "The service was deleted."
0
+      flash.now[:notice] = "The service was deleted.".l
0
     else
0
-      flash.now[:error] = "Service could not be deleted."
0
+      flash.now[:error] = "Service could not be deleted.".l
0
     end
0
     
0
     respond_to do |format|

0
@@ -109,7 +109,7 @@ class PhotosController < BaseController
0
         @photo.tag_with(params[:tag_list] || '') 
0
         #start the garbage collector
0
         GC.start        
0
-        flash[:notice] = 'Photo was successfully created.'
0
+        flash[:notice] = 'Photo was successfully created.'.l
0
         
0
         format.html { 
0
           render :action => 'inline_new', :layout => false and return if params[:inline]

0
@@ -107,7 +107,7 @@ class PostsController < BaseController
0
         @post.create_poll(params[:poll], params[:choices]) if params[:poll]
0
         
0
         @post.tag_with(params[:tag_list] || '') 
0
-        flash[:notice] = @post.category ? "Your '#{Inflector.singularize(@post.category.name)}' post was successfully created." : "Your post was successfully created."
0
+        flash[:notice] = @post.category ? :post_created_for_category.l_with_args(category => Inflector.singularize(@post.category.name)) : "Your post was successfully created.".l
0
         format.html { 
0
           if @post.is_live?
0
             redirect_to @post.category ? category_path(@post.category) : user_post_path(@user, @post) 
0
@@ -148,7 +148,7 @@ class PostsController < BaseController
0
     
0
     respond_to do |format|
0
       format.html { 
0
-        flash[:notice] = "Your post was deleted."
0
+        flash[:notice] = "Your post was deleted.".l
0
         redirect_to manage_user_posts_url(@user)   
0
         }
0
     end

0
@@ -47,7 +47,7 @@ class SbPostsController < BaseController
0
     if @topic.locked?
0
       respond_to do |format|
0
         format.html do
0
-          flash[:notice] = 'This topic is locked.'
0
+          flash[:notice] = 'This topic is locked.'.l
0
           redirect_to(forum_topic_path(:forum_id => params[:forum_id], :id => params[:topic_id]))
0
         end
0
         format.xml do
0
@@ -67,7 +67,7 @@ class SbPostsController < BaseController
0
       format.xml { head :created, :location => formatted_sb_user_post_url(:forum_id => params[:forum_id], :topic_id => params[:topic_id], :id => @post, :format => :xml) }
0
     end
0
   rescue ActiveRecord::RecordInvalid
0
-    flash[:bad_reply] = 'Please post something at least...'
0
+    flash[:bad_reply] = 'Please post something at least...'.l
0
     respond_to do |format|
0
       format.html do
0
         redirect_to forum_topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => 'reply-form', :page => params[:page] || '1')
0
@@ -87,7 +87,7 @@ class SbPostsController < BaseController
0
     @post.attributes = params[:post]
0
     @post.save!
0
   rescue ActiveRecord::RecordInvalid
0
-    flash[:bad_reply] = 'An error occurred'
0
+    flash[:bad_reply] = 'An error occurred'.l
0
   ensure
0
     respond_to do |format|
0
       format.html do
0
@@ -100,7 +100,7 @@ class SbPostsController < BaseController
0
 
0
   def destroy
0
     @post.destroy
0
-    flash[:notice] = "Post: '#{CGI::escapeHTML @post.topic.title}' was deleted."
0
+    flash[:notice] = :sb_post_was_deleted.l_with_args(:title => CGI::escapeHTML(@post.topic.title))
0
     # check for posts_count == 1 because its cached and counting the currently deleted post
0
     @post.topic.destroy and redirect_to forum_path(params[:forum_id]) if @post.topic.sb_posts_count == 1
0
     respond_to do |format|

0
@@ -23,10 +23,10 @@ class SessionsController < BaseController
0
       end
0
 
0
       redirect_back_or_default(dashboard_user_path(current_user))
0
-      flash[:notice] = "Thanks! You're now logged in."
0
+      flash[:notice] = "Thanks! You're now logged in.".l
0
       current_user.track_activity(:logged_in)
0
     else
0
-      flash[:notice] = "Uh oh. We couldn't log you in with the username and password you entered. Try again?"      
0
+      flash[:notice] = "Uh oh. We couldn't log you in with the username and password you entered. Try again?".l
0
       redirect_to teaser_path and return if AppConfig.closed_beta_mode        
0
       render :action => 'new'
0
     end
0
@@ -36,7 +36,7 @@ class SessionsController < BaseController
0
     self.current_user.forget_me if logged_in?
0
     cookies.delete :auth_token
0
     reset_session
0
-    flash[:notice] = "You've been logged out. Hope you come back soon!"
0
+    flash[:notice] = "You've been logged out. Hope you come back soon!".l
0
     redirect_to new_session_path
0
   end
0
 

0
@@ -61,7 +61,7 @@ class SkillsController < BaseController
0
     
0
     respond_to do |format|
0
       if @skill.save
0
-        flash[:notice] = 'Skill was successfully created.'
0
+        flash[:notice] = 'Skill was successfully created.'.l
0
         
0
         format.html { redirect_to skill_url(@skill) }
0
         format.xml do

0
@@ -21,7 +21,7 @@ class TagsController < BaseController
0
   def show
0
     @tag = Tag.find_by_name(params[:id])
0
     if @tag.nil? 
0
-      flash[:notice] = "The tag #{params[:id]} does not exist."
0
+      flash[:notice] = :tag_does_not_exists.l_with_args(:tag => params[:id]) 
0
       redirect_to :action => :index and return
0
     end
0
     @related_tags = @tag.related_tags

0
@@ -89,7 +89,7 @@ class TopicsController < BaseController
0
   
0
   def destroy
0
     @topic.destroy
0
-    flash[:notice] = "Topic '#{CGI::escapeHTML @topic.title}' was deleted."
0
+    flash[:notice] = :topic_deleted.l_with_args(:topic => CGI::escapeHTML(@topic.title)) 
0
     respond_to do |format|
0
       format.html { redirect_to forum_path(@forum) }
0
       format.xml  { head 200 }

0
@@ -30,10 +30,10 @@ class UsersController < BaseController
0
     if @user and @user.activate
0
       self.current_user = @user
0
       redirect_to welcome_photo_user_path(@user)
0
-      flash[:notice] = "Thanks for activating your account!" 
0
+      flash[:notice] = "Thanks for activating your account!".l 
0
       return
0
     end
0
-    flash[:error] = "Account activation failed. Your account may already be active. Try logging in or e-mail #{AppConfig.support_email} for help."
0
+    flash[:error] = :account_activation_error.l_with_args (:email => AppConfig.support_email) 
0
     redirect_to signup_path     
0
   end
0
 
0
@@ -81,7 +81,7 @@ class UsersController < BaseController
0
     @user.role = Role[:member]
0
     @user.save!
0
     create_friendship_with_inviter(@user, params)
0
-    flash[:notice] = "Thanks for signing up! You should receive an e-mail confirmation shortly at #{@user.email}"
0
+    flash[:notice] = :email_signup_thanks.l_with_args(:email => @user.email) 
0
     redirect_to signup_completed_user_path(@user)
0
   rescue ActiveRecord::RecordInvalid
0
     render :action => 'new'
0
@@ -119,7 +119,7 @@ class UsersController < BaseController
0
       @user.track_activity(:updated_profile)
0
       
0
       @user.tag_with(params[:tag_list] || '')     
0
-      flash[:notice] = "Your changes were saved."
0
+      flash[:notice] = "Your changes were saved.".l
0
       unless params[:welcome] 
0
         redirect_to user_path(@user)
0
       else
0
@@ -133,9 +133,9 @@ class UsersController < BaseController
0
   def destroy
0
     unless @user.admin?
0
       @user.destroy
0
-      flash[:notice] = "The user was deleted."
0
+      flash[:notice] = "The user was deleted.".l
0
     else
0
-      flash[:error] = "You can't delete that user."
0
+      flash[:error] = "You can't delete that user.".l
0
     end
0
     respond_to do |format|
0
       format.html { redirect_to users_url }
0
@@ -147,7 +147,7 @@ class UsersController < BaseController
0
     @photo = Photo.find(params[:photo_id])
0
     @user.avatar = @photo
0
     if @user.save!
0
-      flash[:notice] = "Your changes were saved."
0
+      flash[:notice] = "Your changes were saved.".l
0
       redirect_to user_photo_path(@user, @photo)
0
     end
0
   rescue ActiveRecord::RecordInvalid
0
@@ -166,7 +166,7 @@ class UsersController < BaseController
0
     @user.attributes = params[:user]
0
 
0
     if @user.save!
0
-      flash[:notice] = "Your changes were saved."
0
+      flash[:notice] = "Your changes were saved.".l
0
       redirect_to user_path(@user)
0
     end
0
   rescue ActiveRecord::RecordInvalid
0
@@ -186,7 +186,7 @@ class UsersController < BaseController
0
     if @user.save!
0
       respond_to do |format|
0
         format.html { 
0
-          flash[:notice] = "Your changes were saved."
0
+          flash[:notice] = "Your changes were saved.".l
0
           redirect_to edit_pro_details_user_path(@user)   
0
         }
0
         format.js {
0
@@ -235,7 +235,7 @@ class UsersController < BaseController
0
   end
0
   
0
   def welcome_complete
0
-    flash[:notice] = "You've completed the #{AppConfig.community_name} walk-through. Now you can continue exploring!"
0
+    flash[:notice] = :walkthrough_complete.l_with_args(:site => AppConfig.community_name) 
0
     redirect_to user_path
0
   end
0
   
0
@@ -247,10 +247,10 @@ class UsersController < BaseController
0
         UserNotifier.deliver_reset_password(@user)
0
         @user.save
0
         redirect_to login_url
0
-        flash[:info] = "Your password has been reset and emailed to you."
0
+        flash[:info] = "Your password has been reset and emailed to you.".l
0
       end
0
     else
0
-      flash[:error] = "Sorry. We don't recognize that email address."
0
+      flash[:error] = "Sorry. We don't recognize that email address.".l
0
     end 
0
   end
0
 
0
@@ -262,10 +262,10 @@ class UsersController < BaseController
0
         UserNotifier.deliver_forgot_username(@user)
0
         @user.save
0
         redirect_to login_url
0
-        flash[:info] = "Your username was emailed to you."
0
+        flash[:info] = "Your username was emailed to you.".l
0
       end
0
     else
0
-      flash[:error] = "Sorry. We don't recognize that email address."
0
+      flash[:error] = "Sorry. We don't recognize that email address.".l
0
     end 
0
   end
0
 

0
@@ -8,4 +8,4 @@ CommunityEngine.check_for_pending_migrations
0
 if AppConfig.theme
0
   theme_view_path = "#{RAILS_ROOT}/themes/#{AppConfig.theme}/views"
0
   ActionController::Base.view_paths = ActionController::Base.view_paths.dup.unshift(theme_view_path)
0
-end
0
\ No newline at end of file
0
+end    
0
\ No newline at end of file

0
@@ -35,3 +35,13 @@ new_post_for_category: New {category}
0
 show_category: "{category}"
0
 singular_posts: "{count} post"
0
 plural_posts: "{count} posts"
0
+no_comments_found: Sorry, we couldn't find any comments for that {type}
0
+comment_save_error: Your comment couldn't be saved. #{errors}
0
+account_activation_error: Account activation failed. Your account may already be active. Try logging in or e-mail {email} for help.
0
+email_signup_thanks: Thanks for signing up! You should receive an e-mail confirmation shortly at {email}
0
+walkthrough_complete: You've completed the {site} walk-through. Now you can continue exploring!
0
+topic_deleted: Topic '{topic}' was deleted.
0
+tag_does_not_exist: The tag {tag} does not exist.
0
+sb_post_was_deleted: Post '{title}' was deleted.
0
+post_created_for_category: Your '{category}' post was successfully created.
0
+friendship_requested: Requested friendship with {friend}.