Merge remote-tracking branch 'upstream/pull/1858'

diff --git a/app/controllers/message_controller.rb b/app/controllers/messages_controller.rb
similarity index 88%
rename from app/controllers/message_controller.rb
rename to app/controllers/messages_controller.rb
index d167755d4bcf30dc3526ca21de7b094d3cc3ee70..11a71c3ee612d40c4b6396093ec436db4179ad2c 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -1,4 +1,4 @@
-class MessageController < ApplicationController
+class MessagesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
@@ -16,7 +16,7 @@ class MessageController < ApplicationController
   def new
     if request.post?
       if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
-        flash[:error] = t "message.new.limit_exceeded"
+        flash[:error] = t ".limit_exceeded"
       else
         @message = Message.new(message_params)
         @message.recipient = @user
@@ -24,7 +24,7 @@ class MessageController < ApplicationController
         @message.sent_on = Time.now.getutc
 
         if @message.save
-          flash[:notice] = t "message.new.message_sent"
+          flash[:notice] = t ".message_sent"
           Notifier.message_notification(@message).deliver_now
           redirect_to :action => "inbox", :display_name => current_user.display_name
         end
@@ -32,7 +32,7 @@ class MessageController < ApplicationController
     end
 
     @message ||= Message.new(message_params.merge(:recipient => @user))
-    @title = t "message.new.title"
+    @title = t ".title"
   end
 
   # Allow the user to reply to another message.
@@ -52,7 +52,7 @@ class MessageController < ApplicationController
 
       render :action => "new"
     else
-      flash[:notice] = t "message.reply.wrong_user", :user => current_user.display_name
+      flash[:notice] = t ".wrong_user", :user => current_user.display_name
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
@@ -62,14 +62,14 @@ class MessageController < ApplicationController
 
   # Show a message
   def read
-    @title = t "message.read.title"
+    @title = t ".title"
     @message = Message.find(params[:message_id])
 
     if @message.recipient == current_user || @message.sender == current_user
       @message.message_read = true if @message.recipient == current_user
       @message.save
     else
-      flash[:notice] = t "message.read.wrong_user", :user => current_user.display_name
+      flash[:notice] = t ".wrong_user", :user => current_user.display_name
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
@@ -79,7 +79,7 @@ class MessageController < ApplicationController
 
   # Display the list of messages that have been sent to the user.
   def inbox
-    @title = t "message.inbox.title"
+    @title = t ".title"
     if current_user && params[:display_name] == current_user.display_name
     else
       redirect_to :action => "inbox", :display_name => current_user.display_name
@@ -88,7 +88,7 @@ class MessageController < ApplicationController
 
   # Display the list of messages that the user has sent to other users.
   def outbox
-    @title = t "message.outbox.title"
+    @title = t ".title"
     if current_user && params[:display_name] == current_user.display_name
     else
       redirect_to :action => "outbox", :display_name => current_user.display_name
@@ -100,10 +100,10 @@ class MessageController < ApplicationController
     @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
     if params[:mark] == "unread"
       message_read = false
-      notice = t "message.mark.as_unread"
+      notice = t ".as_unread"
     else
       message_read = true
-      notice = t "message.mark.as_read"
+      notice = t ".as_read"
     end
     @message.message_read = message_read
     if @message.save && !request.xhr?
@@ -121,7 +121,7 @@ class MessageController < ApplicationController
     @message.from_user_visible = false if @message.sender == current_user
     @message.to_user_visible = false if @message.recipient == current_user
     if @message.save && !request.xhr?
-      flash[:notice] = t "message.delete.deleted"
+      flash[:notice] = t ".deleted"
 
       if params[:referer]
         redirect_to params[:referer]

diff --git a/app/views/message/_message_count.html.erb b/app/views/messages/_message_count.html.erb
similarity index 57%
rename from app/views/message/_message_count.html.erb
rename to app/views/messages/_message_count.html.erb
index 3a995c17144bb37e389a8de93c49e0d77dbbc83b..c6d84032dc83029183f134eab4841b0151007e63 100644 (file)
--- a/app/views/message/_message_count.html.erb
+++ b/app/views/messages/_message_count.html.erb
@@ -1,8 +1,8 @@
 <p id="inbox-count">
-<%= t "message.inbox.messages",
-      :new_messages => t("message.inbox.new_messages",
+<%= t "messages.inbox.messages",
+      :new_messages => t("messages.inbox.new_messages",
                          :count => current_user.new_messages.size),
-      :old_messages => t("message.inbox.old_messages",
+      :old_messages => t("messages.inbox.old_messages",
                          :count => current_user.messages.size - current_user.new_messages.size)
 %>
 </p>

diff --git a/app/views/message/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb
similarity index 100%
rename from app/views/message/_message_summary.html.erb
rename to app/views/messages/_message_summary.html.erb

diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb
similarity index 100%
rename from app/views/message/_sent_message_summary.html.erb
rename to app/views/messages/_sent_message_summary.html.erb

diff --git a/app/views/message/delete.js.erb b/app/views/messages/delete.js.erb
similarity index 100%
rename from app/views/message/delete.js.erb
rename to app/views/messages/delete.js.erb

diff --git a/app/views/message/inbox.html.erb b/app/views/messages/inbox.html.erb
similarity index 100%
rename from app/views/message/inbox.html.erb
rename to app/views/messages/inbox.html.erb

diff --git a/app/views/message/mark.js.erb b/app/views/messages/mark.js.erb
similarity index 100%
rename from app/views/message/mark.js.erb
rename to app/views/messages/mark.js.erb

diff --git a/app/views/message/new.html.erb b/app/views/messages/new.html.erb
similarity index 100%
rename from app/views/message/new.html.erb
rename to app/views/messages/new.html.erb

diff --git a/app/views/message/no_such_message.html.erb b/app/views/messages/no_such_message.html.erb
similarity index 100%
rename from app/views/message/no_such_message.html.erb
rename to app/views/messages/no_such_message.html.erb

diff --git a/app/views/message/outbox.html.erb b/app/views/messages/outbox.html.erb
similarity index 100%
rename from app/views/message/outbox.html.erb
rename to app/views/messages/outbox.html.erb

diff --git a/app/views/message/read.html.erb b/app/views/messages/read.html.erb
similarity index 100%
rename from app/views/message/read.html.erb
rename to app/views/messages/read.html.erb

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06f8bc9281ecf1315bf142bb0fc0d438a2272beb..51f8dbecd04ba2b7b0e69be7e1eba25fffb1ee8c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1057,7 +1057,7 @@ en:
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
-  message:
+  messages:
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"

diff --git a/config/routes.rb b/config/routes.rb
index 2d47210fb1aa594e361e69cbd7b1f3867292c5c5..ed5e6876be3138b45c74b8640e9f6f05ed9befb5 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -261,13 +261,13 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
-  get "/user/:display_name/inbox" => "message#inbox", :as => "inbox"
-  get "/user/:display_name/outbox" => "message#outbox", :as => "outbox"
-  match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message"
-  get "/message/read/:message_id" => "message#read", :as => "read_message"
-  post "/message/mark/:message_id" => "message#mark", :as => "mark_message"
-  match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message"
-  post "/message/delete/:message_id" => "message#delete", :as => "delete_message"
+  get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
+  get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
+  match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
+  get "/message/read/:message_id" => "messages#read", :as => "read_message"
+  post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
+  match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
+  post "/message/delete/:message_id" => "messages#delete", :as => "delete_message"
 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do

diff --git a/test/controllers/message_controller_test.rb b/test/controllers/messages_controller_test.rb
similarity index 96%
rename from test/controllers/message_controller_test.rb
rename to test/controllers/messages_controller_test.rb
index 3810c57c3d6713f87a78e360a7655f74de4003aa..dd9df8f451db8fb3c666f845b64f34e3ca615398 100644 (file)
--- a/test/controllers/message_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -1,44 +1,44 @@
 require "test_helper"
 
-class MessageControllerTest < ActionController::TestCase
+class MessagesControllerTest < ActionController::TestCase
   ##
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
       { :path => "/user/username/inbox", :method => :get },
-      { :controller => "message", :action => "inbox", :display_name => "username" }
+      { :controller => "messages", :action => "inbox", :display_name => "username" }
     )
     assert_routing(
       { :path => "/user/username/outbox", :method => :get },
-      { :controller => "message", :action => "outbox", :display_name => "username" }
+      { :controller => "messages", :action => "outbox", :display_name => "username" }
     )
     assert_routing(
       { :path => "/message/new/username", :method => :get },
-      { :controller => "message", :action => "new", :display_name => "username" }
+      { :controller => "messages", :action => "new", :display_name => "username" }
     )
     assert_routing(
       { :path => "/message/new/username", :method => :post },
-      { :controller => "message", :action => "new", :display_name => "username" }
+      { :controller => "messages", :action => "new", :display_name => "username" }
     )
     assert_routing(
       { :path => "/message/read/1", :method => :get },
-      { :controller => "message", :action => "read", :message_id => "1" }
+      { :controller => "messages", :action => "read", :message_id => "1" }
     )
     assert_routing(
       { :path => "/message/mark/1", :method => :post },
-      { :controller => "message", :action => "mark", :message_id => "1" }
+      { :controller => "messages", :action => "mark", :message_id => "1" }
     )
     assert_routing(
       { :path => "/message/reply/1", :method => :get },
-      { :controller => "message", :action => "reply", :message_id => "1" }
+      { :controller => "messages", :action => "reply", :message_id => "1" }
     )
     assert_routing(
       { :path => "/message/reply/1", :method => :post },
-      { :controller => "message", :action => "reply", :message_id => "1" }
+      { :controller => "messages", :action => "reply", :message_id => "1" }
     )
     assert_routing(
       { :path => "/message/delete/1", :method => :post },
-      { :controller => "message", :action => "delete", :message_id => "1" }
+      { :controller => "messages", :action => "delete", :message_id => "1" }
     )
   end