Rewrite /private-messages to /messages

app/assets/javascripts/discourse/initializers/url-redirects.js.es6

@@ -5,5 +5,6 @@ export default {
     // URL rewrites (usually due to refactoring)
     Discourse.URL.rewrite(/^\/category\//, "/c/");
     Discourse.URL.rewrite(/^\/group\//, "/groups/");
+    Discourse.URL.rewrite(/\/private-messages\/$/, "/messages/");
   }
 };

app/assets/javascripts/discourse/routes/app-route-map.js.es6

@@ -66,7 +66,7 @@ export default function() {
     this.route('flaggedPosts', { path: '/flagged-posts' });
     this.route('deletedPosts', { path: '/deleted-posts' });
 
-    this.resource('userPrivateMessages', { path: '/private-messages' }, function() {
+    this.resource('userPrivateMessages', { path: '/messages' }, function() {
       this.route('mine');
       this.route('unread');
     });

config/locales/server.en.yml

@@ -530,7 +530,7 @@ en:
       email_body: "%{link}\n\n%{message}"
 
   flagging:
-    you_must_edit: '<p>Your post was flagged by the community. Please <a href="/my/private-messages">see your messages</a>.</p>'
+    you_must_edit: '<p>Your post was flagged by the community. Please <a href="/my/messages">see your messages</a>.</p>'
     user_must_edit: '<p>This post was flagged by the community and is temporarily hidden.</p>'
 
   archetypes:

config/locales/server.es.yml

@@ -457,7 +457,7 @@ es:
       email_title: 'El tema "%{title}" requiere la atención de un moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Tu post ha sido reportado por la comunidad. Por favor <a href="/my/private-messages">mira tus mensajes</a>.</p>'
+    you_must_edit: '<p>Tu post ha sido reportado por la comunidad. Por favor <a href="/my/messages">mira tus mensajes</a>.</p>'
     user_must_edit: '<p>Este post fue reportado por la comunidad y está oculto temporalmente.</p>'
   archetypes:
     regular:

config/locales/server.fa_IR.yml

@@ -410,7 +410,7 @@ fa_IR:
       email_title: 'این موضوع "%{title}" نیاز به توجه مدیر دارد. '
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>نوشته شما توسط انجمن پرچم گزاری شده. لطفا <a href="/my/private-messages"> پیامت را نگاه کن</a>.</p>'
+    you_must_edit: '<p>نوشته شما توسط انجمن پرچم گزاری شده. لطفا <a href="/my/messages"> پیامت را نگاه کن</a>.</p>'
     user_must_edit: '<p> این نوشته توسط انجمن پرچم گزاری شده و بطور موقت مخفی شده است.</p>'
   archetypes:
     regular:

config/locales/server.fi.yml

@@ -457,7 +457,7 @@ fi:
       email_title: 'Viestiketju"%{title}" kaipaa valvojan huomiota'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Viestisi on liputettu muiden käyttäjien toimesta. <a href="/my/private-messages">Käy lukemassa saapuneet viestisi</a>.</p>'
+    you_must_edit: '<p>Viestisi on liputettu muiden käyttäjien toimesta. <a href="/my/messages">Käy lukemassa saapuneet viestisi</a>.</p>'
     user_must_edit: '<p>Tämä viesti on liputettu ja siksi piilotettu väliaikaisesti.</p>'
   archetypes:
     regular:

config/locales/server.fr.yml

@@ -450,7 +450,7 @@ fr:
       email_title: 'Ce sujet "%{title}" requière l''attention d''un modérateur'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="/my/private-messages">regarder vos messages</a>.</p>'
+    you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="/my//my/messages">regarder vos messages</a>.</p>'
     user_must_edit: '<p>Ce message a été signalé par la communauté et temporairement masqué.</p>'
   archetypes:
     regular:

config/locales/server.he.yml

@@ -440,7 +440,7 @@ he:
       email_title: 'הנושא "%{title}" דורש תשומת לב של מנהל'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p> הפרסום שלך סומן על ידי הקהילה. אנא  <a href="/my/private-messages"> בדוק/בדקי את ההודעות שלך</a>.</p>'
+    you_must_edit: '<p> הפרסום שלך סומן על ידי הקהילה. אנא  <a href="/my/messages"> בדוק/בדקי את ההודעות שלך</a>.</p>'
     user_must_edit: '<p>פרסום זה סומן על ידי הקהילה וכרגע מוסתר באופן זמני.</p>'
   archetypes:
     regular:

config/locales/server.it.yml

@@ -423,7 +423,7 @@ it:
       email_title: 'L''argomento "%{title}" richiede l''attenzione di un moderatore'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Il tuo messaggio è stato segnalato dalla comunità. <a href="/my/private-messages">Controlla i tuoi messaggi</a>.</p>'
+    you_must_edit: '<p>Il tuo messaggio è stato segnalato dalla comunità. <a href="/my/y/messages">Controlla i tuoi messaggi</a>.</p>'
     user_must_edit: '<p>Questo messaggio è stato segnalato dalla comunità ed è stato temporaneamente nascosto.</p>'
   archetypes:
     regular:

config/locales/server.pt_BR.yml

@@ -447,7 +447,7 @@ pt_BR:
       email_title: 'O tópico "%{title}" requer atenção do moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Sua mensagem foi marcada pela comunidade. Por favor <a href="/my/private-messages">veja suas mensagens</a>.</p>'
+    you_must_edit: '<p>Sua mensagem foi marcada pela comunidade. Por favor <a href="/my/messages">veja suas mensagens</a>.</p>'
     user_must_edit: '<p>Conteúdo sinalizado escondido.</p>'
   archetypes:
     regular:

config/locales/server.ro.yml

@@ -459,7 +459,7 @@ ro:
       email_body: "%{link}\n\n%{message}"
 
   flagging:
-    you_must_edit: '<p>Postarea ta a fost marcată de către comunitate, te rugăm verifică <a href="/my/private-messages"> mesajele private</a>.</p>'
+    you_must_edit: '<p>Postarea ta a fost marcată de către comunitate, te rugăm verifică <a href="/my/messages"> mesajele private</a>.</p>'
     user_must_edit: '<p>Conţinutul marcat ascuns temporar.</p>'
 
   archetypes:

config/locales/server.zh_CN.yml

@@ -423,7 +423,7 @@ zh_CN:
       email_title: '"%{title}" 主题需要你的关注'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>你的帖子被社群成员标记了。请<a href="/my/private-messages">查看你的消息</a>。</p>'
+    you_must_edit: '<p>你的帖子被社群成员标记了。请<a href="/my/messages">查看你的消息</a>。</p>'
     user_must_edit: '<p>你的帖子已经被社群标记并被临时隐藏。</p>'
   archetypes:
     regular:

config/routes.rb

@@ -244,6 +244,8 @@ Discourse::Application.routes.draw do
   get "user_preferences" => "users#user_preferences_redirect"
   get "users/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
   get "users/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "users/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "users/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
   get "users/:username" => "users#show", as: 'user', constraints: {username: USERNAME_ROUTE_FORMAT}
   put "users/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT}
   put "users/:username/emails" => "users#check_emails", constraints: {username: USERNAME_ROUTE_FORMAT}