Commit fa7ca46d authored by JC Brand's avatar JC Brand

Text fixes based on feedback from translator

parent adc4e6eb
...@@ -523,8 +523,8 @@ ...@@ -523,8 +523,8 @@
if (text.length > 8000) { if (text.length > 8000) {
text = text.substring(0, 10) + '...'; text = text.substring(0, 10) + '...';
this.showStatusNotification( this.showStatusNotification(
__("A very large message has been received."+ __("A very large message has been received. "+
"This might be due to an attack meant to degrade the chat performance."+ "This might be due to an attack meant to degrade the chat performance. "+
"Output has been shortened."), "Output has been shortened."),
true, true); true, true);
} }
......
...@@ -1737,10 +1737,10 @@ ...@@ -1737,10 +1737,10 @@
if (notification.disconnected) { if (notification.disconnected) {
this.showDisconnectMessage(notification.disconnection_message); this.showDisconnectMessage(notification.disconnection_message);
if (notification.actor) { if (notification.actor) {
this.showDisconnectMessage(__('This action was done by %1$s.', notification.actor)); this.showDisconnectMessage(__('This action was done by %1$s', notification.actor));
} }
if (notification.reason) { if (notification.reason) {
this.showDisconnectMessage(__('The reason given is: "%1$s".', notification.reason)); this.showDisconnectMessage(__('The reason given is: "%1$s"', notification.reason));
} }
this.model.save('connection_status', converse.ROOMSTATUS.DISCONNECTED); this.model.save('connection_status', converse.ROOMSTATUS.DISCONNECTED);
return; return;
...@@ -1749,7 +1749,7 @@ ...@@ -1749,7 +1749,7 @@
this.$content.append(tpl_info({'message': message})); this.$content.append(tpl_info({'message': message}));
}); });
if (notification.reason) { if (notification.reason) {
this.showStatusNotification(__('The reason given is: "%1$s "', notification.reason), true); this.showStatusNotification(__('The reason given is: "%1$s"', notification.reason), true);
} }
if (notification.messages.length) { if (notification.messages.length) {
this.scrollDown(); this.scrollDown();
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
return; return;
} }
} else if (!_.includes(from_jid, '@')) { } else if (!_.includes(from_jid, '@')) {
// XXX: workaround for Prosody which doesn't give type "headline" // workaround for Prosody which doesn't give type "headline"
title = __("Notification from %1$s", from_jid); title = __("Notification from %1$s", from_jid);
} else if (message.getAttribute('type') === 'groupchat') { } else if (message.getAttribute('type') === 'groupchat') {
title = __("%1$s says", Strophe.getResourceFromJid(full_from_jid)); title = __("%1$s says", Strophe.getResourceFromJid(full_from_jid));
......
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
if (stanza.getAttribute("type") === "error") { if (stanza.getAttribute("type") === "error") {
_converse.connection._changeConnectStatus( _converse.connection._changeConnectStatus(
Strophe.Status.REGIFAIL, Strophe.Status.REGIFAIL,
__('Something went wrong while establishing a connection with "%1$s".'+ __('Something went wrong while establishing a connection with "%1$s". '+
'Are you sure it exists?', this.domain) 'Are you sure it exists?', this.domain)
); );
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment