From be4944a4b68a58e2976cef472a1b9f3e04239de9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 May 2017 19:43:34 +0100 Subject: [PATCH] Hopefully get translations with '.'s sorted attempt 2 --- src/TextForEvent.js | 18 +++++++++--------- src/i18n/strings/de_DE.json | 2 +- src/i18n/strings/en_EN.json | 2 +- src/i18n/strings/fr.json | 2 +- src/i18n/strings/pt_BR.json | 2 +- src/i18n/strings/ru.json | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/TextForEvent.js b/src/TextForEvent.js index 88872807e3..2d53c5db9f 100644 --- a/src/TextForEvent.js +++ b/src/TextForEvent.js @@ -47,9 +47,9 @@ function textForMemberEvent(ev) { } case 'ban': return _t( - '%(senderName)s banned %(targetName)s. %(reason)s.', - {senderName: senderName, targetName: targetName, reason: reason} - ); + '%(senderName)s banned %(targetName)s.', + {senderName: senderName, targetName: targetName} + ) + ' ' + reason; case 'join': if (ev.getPrevContent() && ev.getPrevContent().membership == 'join') { if (ev.getPrevContent().displayname && ev.getContent().displayname && ev.getPrevContent().displayname != ev.getContent().displayname) { @@ -90,19 +90,19 @@ function textForMemberEvent(ev) { } } else if (ev.getPrevContent().membership === "ban") { - return _t('%(senderName)s unbanned %(targetName)s.', {senderName: senderName, targetName: targetName}) + '.'; + return _t('%(senderName)s unbanned %(targetName)s.', {senderName: senderName, targetName: targetName}); } else if (ev.getPrevContent().membership === "join") { return _t( '%(senderName)s kicked %(targetName)s.', {senderName: senderName, targetName: targetName} - ) + '. ' + reason; + ) + ' ' + reason; } else if (ev.getPrevContent().membership === "invite") { return _t( '%(senderName)s withdrew %(targetName)s\'s inivitation.', {senderName: senderName, targetName: targetName} - ) + '. ' + reason; + ) + ' ' + reason; } else { return _t('%(targetName)s left the room.', {targetName: targetName}); @@ -135,13 +135,13 @@ function textForMessageEvent(ev) { function textForCallAnswerEvent(event) { var senderName = event.sender ? event.sender.name : _t('Someone'); var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)'); - return _t('%(senderName)s answered the call', {senderName: senderName}) + '. ' + supported; + return _t('%(senderName)s answered the call', {senderName: senderName}) + ' ' + supported; } function textForCallHangupEvent(event) { var senderName = event.sender ? event.sender.name : _t('Someone'); var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)'); - return _t('%(senderName)s ended the call', {senderName: senderName}) + '. ' + supported; + return _t('%(senderName)s ended the call', {senderName: senderName}) + ' ' + supported; } function textForCallInviteEvent(event) { @@ -153,7 +153,7 @@ function textForCallInviteEvent(event) { type = "video"; } var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)'); - return _t('%(senderName)s placed a %(callType)s call.', {senderName: senderName, callType: type}) + '. ' + supported; + return _t('%(senderName)s placed a %(callType)s call.', {senderName: senderName, callType: type}) + ' ' + supported; } function textForThreePidInviteEvent(event) { diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 90395a08c0..dc1cc1dbb6 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -360,7 +360,7 @@ "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s", "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s änderte das Thema zu %(topic)s", "/ddg is not a command": "/ddg ist kein Kommando", - "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.", + "%(senderName)s ended the call": "%(senderName)s beendete den Anruf", "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl", "Failed to send request.": "Anfrage zu senden schlug fehl.", "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9c69233692..13a65e6a9c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -233,7 +233,7 @@ "Enable encryption": "Enable encryption", "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption", "Encrypted room": "Encrypted room", - "%(senderName)s ended the call.": "%(senderName)s ended the call.", + "%(senderName)s ended the call": "%(senderName)s ended the call", "End-to-end encryption information": "End-to-end encryption information", "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable", "Enter Code": "Enter Code", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index eba5b5a0fc..e393d27bda 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -137,7 +137,7 @@ "Enable encryption": "Enable encryption", "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption", "Encrypted room": "Encrypted room", - "%(senderName)s ended the call.": "%(senderName)s ended the call.", + "%(senderName)s ended the call": "%(senderName)s ended the call", "End-to-end encryption information": "End-to-end encryption information", "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable", "Enter Code": "Enter Code", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 5194f4cc6c..2aaca8b9d7 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -333,7 +333,7 @@ "/ddg is not a command": "/ddg não é um comando", "Drop here %(toAction)s": "Arraste aqui %(toAction)s", "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s", - "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.", + "%(senderName)s ended the call": "%(senderName)s finalizou a chamada", "Existing Call": "Chamada em andamento", "Failed to lookup current room": "Não foi possível buscar na sala atual", "Failed to send email": "Não foi possível enviar email", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index ea23d16d04..c211bace3b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -239,7 +239,7 @@ "/ddg is not a command": "/ddg не команда", "Drop here %(toAction)s": "Вставить здесь %(toAction)s", "Drop here to tag %(section)s": "Вставить здесь для тега %(section)s", - "%(senderName)s ended the call.": "%(senderName)s прекратил звонок.", + "%(senderName)s ended the call": "%(senderName)s прекратил звонок", "Existing Call": "Существующий вызов", "Failed to lookup current room": "Не удалось выполнить поиск текущий комнаты", "Failed to send request.": "Не удалось выслать запрос.",