Merge remote-tracking branch 'origin/develop' into develop

scripts/gen-i18n.js

@@ -158,6 +158,7 @@ function getTranslationsJs(file) {
                     } catch (e) {
                         console.log();
                         console.error(`ERROR: ${file}:${node.loc.start.line} ${tKey}`);
+                        console.error(e);
                         process.exit(1);
                     }
                 }

src/TextForEvent.js

@@ -228,14 +228,12 @@ function textForRoomAliasesEvent(ev) {
             removedAddresses: removedAliases.join(', '),
         });
     } else {
-        const args = {
-            senderName: senderName,
-            addedAddresses: addedAliases.join(', '),
-            removedAddresses: removedAliases.join(', '),
-        };
         return _t(
-            '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.',
-            args,
+            '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
+                senderName: senderName,
+                addedAddresses: addedAliases.join(', '),
+                removedAddresses: removedAliases.join(', '),
+            },
         );
     }
 }