Merge branch 'master' of https://github.com/discourse/discourse

app/assets/javascripts/discourse/components/group-membership-button.js.es6

@@ -39,7 +39,7 @@ export default Ember.Component.extend({
       const groupName = this.get('model.name');
       const title = I18n.t('groups.request_membership_pm.title');
       const body = I18n.t('groups.request_membership_pm.body', { groupName });
-      this.transitionToRoute(`/new-message?groupname=${groupName}&title=${title}&body=${body}`);
+      this.sendAction("createNewMessageViaParams", groupName, title, body);
     }
   }
 });

app/assets/javascripts/discourse/templates/group-index.hbs

@@ -1,5 +1,6 @@
 {{#if model.members}}
-  {{group-membership-button model=model}}
+  {{group-membership-button model=model
+      createNewMessageViaParams='createNewMessageViaParams'}}
 
   {{#load-more selector=".group-members tr" action="loadMore"}}
     <table class='group-members'>

app/assets/javascripts/discourse/templates/groups.hbs

@@ -44,7 +44,7 @@
               <td class="groups-user-count">{{group.user_count}}</td>
 
               <td>
-                {{#group-membership-button model=group}}
+                {{#group-membership-button model=group createNewMessageViaParams='createNewMessageViaParams'}}
                   {{d-button icon="ban"
                       label=(if group.automatic 'groups.automatic_group' 'groups.closed_group')
                       disabled=true}}

config/locales/client.en.yml

@@ -401,7 +401,7 @@ en:
         delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
       request_membership_pm:
         title: "Membership Request"
-        body: "I would like to request membership in @%{groupName}."
+        body: "I would like to apply for membership in @%{groupName}."
       name_placeholder: "Group name, no spaces, same as username rule"
       public: "Allow users to join/leave the group freely (Requires group to be visible)"
       empty: