Merge branch 'master' of git://git.openstreetmap.org/rails into openID

[rails.git] / app / controllers / oauth_clients_controller.rb

diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb
index 00606c1ecb2e873018f031bd5ab31ae1746f4886..f90302894a359d00b7e5c29f09cd8b84e6e34ae3 100644 (file)
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -2,8 +2,9 @@ class OauthClientsController < ApplicationController
   layout 'site'
 
   before_filter :authorize_web
   layout 'site'
 
   before_filter :authorize_web

+  before_filter :set_locale

   before_filter :require_user
   before_filter :require_user

-  
+

   def index
     @client_applications = @user.client_applications
     @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
   def index
     @client_applications = @user.client_applications
     @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'


@@ -16,13 +17,13 @@ class OauthClientsController < ApplicationController
   def create
     @client_application = @user.client_applications.build(params[:client_application])
     if @client_application.save
   def create
     @client_application = @user.client_applications.build(params[:client_application])
     if @client_application.save

-      flash[:notice] = "Registered the information successfully"
+      flash[:notice] = t'oauth_clients.create.flash'

       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "new"
     end
   end
       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "new"
     end
   end

-  
+

   def show
     @client_application = @user.client_applications.find(params[:id])
   rescue ActiveRecord::RecordNotFound
   def show
     @client_application = @user.client_applications.find(params[:id])
   rescue ActiveRecord::RecordNotFound


@@ -33,11 +34,11 @@ class OauthClientsController < ApplicationController
   def edit
     @client_application = @user.client_applications.find(params[:id])
   end
   def edit
     @client_application = @user.client_applications.find(params[:id])
   end

-  
+

   def update
     @client_application = @user.client_applications.find(params[:id])
     if @client_application.update_attributes(params[:client_application])
   def update
     @client_application = @user.client_applications.find(params[:id])
     if @client_application.update_attributes(params[:client_application])

-      flash[:notice] = "Updated the client information successfully"
+      flash[:notice] = t'oauth_clients.update.flash'

       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "edit"
       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "edit"


@@ -47,7 +48,7 @@ class OauthClientsController < ApplicationController
   def destroy
     @client_application = @user.client_applications.find(params[:id])
     @client_application.destroy
   def destroy
     @client_application = @user.client_applications.find(params[:id])
     @client_application.destroy

-    flash[:notice] = "Destroyed the client application registration"
+    flash[:notice] = t'oauth_clients.destroy.flash'

     redirect_to :action => "index"
   end
 end
     redirect_to :action => "index"
   end
 end