Merge remote-tracking branch 'origin/master'

css/converse.css

@@ -2037,7 +2037,8 @@
         font-weight: normal;
         padding: 0;
         padding-bottom: 0.5em;
-        text-shadow: 0 1px 0 #FAFAFA; }
+        text-shadow: 0 1px 0 #FAFAFA;
+        word-wrap: break-word; }
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .available-chatroom,
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .open-chatroom {
         border: none;

css/inverse.css

@@ -2123,7 +2123,8 @@ body {
         font-weight: normal;
         padding: 0;
         padding-bottom: 0.5em;
-        text-shadow: 0 1px 0 #FAFAFA; }
+        text-shadow: 0 1px 0 #FAFAFA;
+        word-wrap: break-word; }
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .available-chatroom,
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .open-chatroom {
         border: none;
@@ -2633,6 +2634,9 @@ body {
     line-height: 22px;
     width: 100%; }
 
+#conversejs #converse-roster {
+  padding-bottom: 3em; }
+
 #conversejs #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom a.open-room {
   width: 80%; }
 

sass/_controlbox.scss

@@ -205,6 +205,7 @@
                         padding: 0;
                         padding-bottom: 0.5em;
                         text-shadow: 0 1px 0 $text-shadow-color;
+                        word-wrap: break-word;
                     }
                     .available-chatroom,
                     .open-chatroom {

sass/inverse/_roster.scss

+#conversejs #converse-roster {
+    padding-bottom: 3em;
+}

sass/inverse/inverse.scss

@@ -17,6 +17,7 @@
 @import "../controlbox";
 @import "controlbox";
 @import "../roster";
+@import "roster";
 @import "../bookmarks";
 @import "bookmarks";
 @import "../chatrooms";

src/converse-muc.js

@@ -28,6 +28,7 @@
             "tpl!chatroom_toolbar",
             "tpl!chatrooms_tab",
             "tpl!info",
+            "tpl!no_rooms",
             "tpl!occupant",
             "tpl!room_description",
             "tpl!room_item",
@@ -58,6 +59,7 @@
             tpl_chatroom_toolbar,
             tpl_chatrooms_tab,
             tpl_info,
+            tpl_no_rooms,
             tpl_occupant,
             tpl_room_description,
             tpl_room_item,
@@ -2633,8 +2635,9 @@
 
                 informNoRoomsFound () {
                     const chatrooms_el = this.el.querySelector('#available-chatrooms');
-                    // For translators: %1$s is a variable and will be replaced with the XMPP server name
-                    chatrooms_el.innerHTML = `<dt>${__('No rooms on %1$s', this.model.get('muc_domain'))}</dt>`;
+                    chatrooms_el.innerHTML = tpl_no_rooms({
+                        'no_rooms_text': __('No rooms found')
+                    });
                     const input_el = this.el.querySelector('input#show-rooms');
                     input_el.classList.remove('hidden')
                     this.removeSpinner();
@@ -2677,7 +2680,7 @@
                 },
 
                 updateRoomsList () {
-                    /* Send and IQ stanza to the server asking for all rooms
+                    /* Send an IQ stanza to the server asking for all rooms
                      */
                     _converse.connection.sendIQ(
                         $iq({

src/templates/no_rooms.html

+<dt class="centered">{{{ o.no_rooms_text }}}</dt>