Rename message_controller to messages_controller
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 9 May 2018 08:38:37 +0000 (16:38 +0800)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 9 May 2018 08:38:37 +0000 (16:38 +0800)
14 files changed:
app/controllers/messages_controller.rb [moved from app/controllers/message_controller.rb with 99% similarity]
app/views/messages/_message_count.html.erb [moved from app/views/message/_message_count.html.erb with 57% similarity]
app/views/messages/_message_summary.html.erb [moved from app/views/message/_message_summary.html.erb with 100% similarity]
app/views/messages/_sent_message_summary.html.erb [moved from app/views/message/_sent_message_summary.html.erb with 100% similarity]
app/views/messages/delete.js.erb [moved from app/views/message/delete.js.erb with 100% similarity]
app/views/messages/inbox.html.erb [moved from app/views/message/inbox.html.erb with 100% similarity]
app/views/messages/mark.js.erb [moved from app/views/message/mark.js.erb with 100% similarity]
app/views/messages/new.html.erb [moved from app/views/message/new.html.erb with 100% similarity]
app/views/messages/no_such_message.html.erb [moved from app/views/message/no_such_message.html.erb with 100% similarity]
app/views/messages/outbox.html.erb [moved from app/views/message/outbox.html.erb with 100% similarity]
app/views/messages/read.html.erb [moved from app/views/message/read.html.erb with 100% similarity]
config/locales/en.yml
config/routes.rb
test/controllers/messages_controller_test.rb [moved from test/controllers/message_controller_test.rb with 96% similarity]

similarity index 99%
rename from app/controllers/message_controller.rb
rename to app/controllers/messages_controller.rb
index b785c30..11a71c3 100644 (file)
@@ -1,4 +1,4 @@
-class MessageController < ApplicationController
+class MessagesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
similarity index 57%
rename from app/views/message/_message_count.html.erb
rename to app/views/messages/_message_count.html.erb
index 3a995c1..c6d8403 100644 (file)
@@ -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>
index 7cb67e0..dd2c6b3 100644 (file)
@@ -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"
index 67deae7..15d6c21 100644 (file)
@@ -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
similarity index 96%
rename from test/controllers/message_controller_test.rb
rename to test/controllers/messages_controller_test.rb
index 3810c57..dd9df8f 100644 (file)
@@ -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