From 00bd64c7fb86d598eb9406e39f99fc711f58bf9b Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 9 May 2018 16:38:37 +0800 Subject: [PATCH] Rename message_controller to messages_controller --- ...e_controller.rb => messages_controller.rb} | 2 +- .../_message_count.html.erb | 6 +++--- .../_message_summary.html.erb | 0 .../_sent_message_summary.html.erb | 0 app/views/{message => messages}/delete.js.erb | 0 .../{message => messages}/inbox.html.erb | 0 app/views/{message => messages}/mark.js.erb | 0 app/views/{message => messages}/new.html.erb | 0 .../no_such_message.html.erb | 0 .../{message => messages}/outbox.html.erb | 0 app/views/{message => messages}/read.html.erb | 0 config/locales/en.yml | 2 +- config/routes.rb | 14 ++++++------- ...er_test.rb => messages_controller_test.rb} | 20 +++++++++---------- 14 files changed, 22 insertions(+), 22 deletions(-) rename app/controllers/{message_controller.rb => messages_controller.rb} (99%) rename app/views/{message => messages}/_message_count.html.erb (57%) rename app/views/{message => messages}/_message_summary.html.erb (100%) rename app/views/{message => messages}/_sent_message_summary.html.erb (100%) rename app/views/{message => messages}/delete.js.erb (100%) rename app/views/{message => messages}/inbox.html.erb (100%) rename app/views/{message => messages}/mark.js.erb (100%) rename app/views/{message => messages}/new.html.erb (100%) rename app/views/{message => messages}/no_such_message.html.erb (100%) rename app/views/{message => messages}/outbox.html.erb (100%) rename app/views/{message => messages}/read.html.erb (100%) rename test/controllers/{message_controller_test.rb => messages_controller_test.rb} (96%) diff --git a/app/controllers/message_controller.rb b/app/controllers/messages_controller.rb similarity index 99% rename from app/controllers/message_controller.rb rename to app/controllers/messages_controller.rb index b785c30b9..11a71c3ee 100644 --- 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 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 3a995c171..c6d84032d 100644 --- a/app/views/message/_message_count.html.erb +++ b/app/views/messages/_message_count.html.erb @@ -1,8 +1,8 @@

-<%= 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) %>

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 7cb67e0c8..dd2c6b3b5 100644 --- 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 67deae7ed..15d6c216c 100644 --- 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 3810c57c3..dd9df8f45 100644 --- 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 -- 2.43.2