From b46e608022fa6d9a38abebd37c91b4a4722a67c0 Mon Sep 17 00:00:00 2001 From: mi4aux <63875263+mi4aux@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:08:12 +0200 Subject: [PATCH 1/5] Typo fix of variable name Typo fix of variable name (to have uniform variable naming, same camel case) --- app/src/RoomClient.js | 4 ++-- app/src/translations/cn.json | 4 ++-- app/src/translations/cs.json | 4 ++-- app/src/translations/de.json | 4 ++-- app/src/translations/dk.json | 4 ++-- app/src/translations/el.json | 4 ++-- app/src/translations/en.json | 4 ++-- app/src/translations/es.json | 4 ++-- app/src/translations/fr.json | 4 ++-- app/src/translations/hr.json | 4 ++-- app/src/translations/hu.json | 4 ++-- app/src/translations/it.json | 4 ++-- app/src/translations/nb.json | 4 ++-- app/src/translations/pl.json | 4 ++-- app/src/translations/pt.json | 4 ++-- app/src/translations/ro.json | 4 ++-- app/src/translations/uk.json | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 8d0e01f..4694a65 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -360,7 +360,7 @@ export default class RoomClient store.dispatch(requestActions.notify( { text : intl.formatMessage({ - id : 'devices.microPhoneMute', + id : 'devices.microphoneMute', defaultMessage : 'Muted your microphone' }) })); @@ -372,7 +372,7 @@ export default class RoomClient store.dispatch(requestActions.notify( { text : intl.formatMessage({ - id : 'devices.microPhoneUnMute', + id : 'devices.microphoneUnMute', defaultMessage : 'Unmuted your microphone' }) })); diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json index 572d84e..81d7ad6 100644 --- a/app/src/translations/cn.json +++ b/app/src/translations/cn.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "麦克风已断开", "devices.microphoneError": "麦克风发生错误", - "devices.microPhoneMute": "麦克风静音", - "devices.micophoneUnMute": "取消麦克风静音", + "devices.microphoneMute": "麦克风静音", + "devices.microphoneUnMute": "取消麦克风静音", "devices.microphoneEnable": "启用了麦克风", "devices.microphoneMuteError": "无法使麦克风静音", "devices.microphoneUnMuteError": "无法取消麦克风静音", diff --git a/app/src/translations/cs.json b/app/src/translations/cs.json index 1be5e7b..cfa99dc 100644 --- a/app/src/translations/cs.json +++ b/app/src/translations/cs.json @@ -128,8 +128,8 @@ "devices.microphoneDisconnected": "Mikrofon odpojen", "devices.microphoneError": "Při přístupu k vašemu mikrofonu se vyskytla chyba", - "devices.microPhoneMute": "Mikrofon ztišen", - "devices.micophoneUnMute": "Ztišení mikrofonu zrušeno", + "devices.microphoneMute": "Mikrofon ztišen", + "devices.microphoneUnMute": "Ztišení mikrofonu zrušeno", "devices.microphoneEnable": "Mikrofon povolen", "devices.microphoneMuteError": "Není možné ztišit váš mikrofon", "devices.microphoneUnMuteError": "Není možné zrušit ztišení vašeho mikrofonu", diff --git a/app/src/translations/de.json b/app/src/translations/de.json index d2fe938..84fca3f 100644 --- a/app/src/translations/de.json +++ b/app/src/translations/de.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Mikrofon nicht verbunden", "devices.microphoneError": "Fehler beim Zugriff auf dein Mikrofon", - "devices.microPhoneMute": "Mikrofon stummgeschaltet", - "devices.micophoneUnMute": "Mikrofon aktiviert", + "devices.microphoneMute": "Mikrofon stummgeschaltet", + "devices.microphoneUnMute": "Mikrofon aktiviert", "devices.microphoneEnable": "Mikrofon aktiviert", "devices.microphoneMuteError": "Kann Mikrofon nicht stummschalten", "devices.microphoneUnMuteError": "Kann Mikrofon nicht aktivieren", diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json index 1eccd1f..44808e1 100644 --- a/app/src/translations/dk.json +++ b/app/src/translations/dk.json @@ -133,8 +133,8 @@ "device.microphoneDisconnected": "Mikrofon frakoblet", "device.microphoneError": "Der opstod en fejl under adgang til din mikrofon", - "device.microPhoneMute": "Dæmp din mikrofon", - "device.micophoneUnMute": "Slå ikke lyden fra din mikrofon", + "device.microphoneMute": "Dæmp din mikrofon", + "device.microphoneUnMute": "Slå ikke lyden fra din mikrofon", "device.microphoneEnable": "Aktiveret din mikrofon", "device.microphoneMuteError": "Kan ikke slå din mikrofon fra", "device.microphoneUnMuteError": "Kan ikke slå lyden til på din mikrofon", diff --git a/app/src/translations/el.json b/app/src/translations/el.json index 9125308..d2d6c1e 100644 --- a/app/src/translations/el.json +++ b/app/src/translations/el.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Το μικρόφωνο αποσυνδέθηκε", "devices.microphoneError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στο μικρόφωνό σας", - "devices.microPhoneMute": "Το μικρόφωνό σας είναι σε σίγαση", - "devices.micophoneUnMute": "Ανοίξτε το μικρόφωνό σας", + "devices.microphoneMute": "Το μικρόφωνό σας είναι σε σίγαση", + "devices.microphoneUnMute": "Ανοίξτε το μικρόφωνό σας", "devices.microphoneEnable": "Ενεργοποίησε το μικρόφωνό σας", "devices.microphoneMuteError": "Δεν είναι δυνατή η σίγαση του μικροφώνου σας", "devices.microphoneUnMuteError": "Δεν είναι δυνατό το άνοιγμα του μικροφώνου σας", diff --git a/app/src/translations/en.json b/app/src/translations/en.json index 55a80dd..e45ae28 100644 --- a/app/src/translations/en.json +++ b/app/src/translations/en.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Microphone disconnected", "devices.microphoneError": "An error occured while accessing your microphone", - "devices.microPhoneMute": "Muted your microphone", - "devices.micophoneUnMute": "Unmuted your microphone", + "devices.microphoneMute": "Muted your microphone", + "devices.microphoneUnMute": "Unmuted your microphone", "devices.microphoneEnable": "Enabled your microphone", "devices.microphoneMuteError": "Unable to mute your microphone", "devices.microphoneUnMuteError": "Unable to unmute your microphone", diff --git a/app/src/translations/es.json b/app/src/translations/es.json index ef27cdc..14e73f7 100644 --- a/app/src/translations/es.json +++ b/app/src/translations/es.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Micrófono desconectado", "devices.microphoneError": "Hubo un error al acceder a su micrófono", - "devices.microPhoneMute": "Desactivar micrófono", - "devices.micophoneUnMute": "Activar micrófono", + "devices.microphoneMute": "Desactivar micrófono", + "devices.microphoneUnMute": "Activar micrófono", "devices.microphoneEnable": "Micrófono activado", "devices.microphoneMuteError": "No ha sido posible desactivar su micrófono", "devices.microphoneUnMuteError": "No ha sido posible activar su micrófono", diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json index d057178..3092d88 100644 --- a/app/src/translations/fr.json +++ b/app/src/translations/fr.json @@ -132,8 +132,8 @@ "devices.microphoneDisconnected": "Microphone déconnecté", "devices.microphoneError": "Une erreur est apparue lors de l'accès à votre microphone", - "devices.microPhoneMute": "Désactiver le microphone", - "devices.micophoneUnMute": "Réactiver le microphone", + "devices.microphoneMute": "Désactiver le microphone", + "devices.microphoneUnMute": "Réactiver le microphone", "devices.microphoneEnable": "Activer le microphone", "devices.microphoneMuteError": "Impossible de désactiver le microphone", "devices.microphoneUnMuteError": "Impossible de réactiver le microphone", diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json index 120b1a5..bf4b6ec 100644 --- a/app/src/translations/hr.json +++ b/app/src/translations/hr.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Mikrofon odspojen", "devices.microphoneError": "Greška prilikom pristupa mikrofonu", - "devices.microPhoneMute": "Mikrofon utišan", - "devices.micophoneUnMute": "Mikrofon pojačan", + "devices.microphoneMute": "Mikrofon utišan", + "devices.microphoneUnMute": "Mikrofon pojačan", "devices.microphoneEnable": "Mikrofon omogućen", "devices.microphoneMuteError": "Nije moguće utišati mikrofon", "devices.microphoneUnMuteError": "Nije moguće pojačati mikrofon", diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json index c7dedf1..991c0a3 100644 --- a/app/src/translations/hu.json +++ b/app/src/translations/hu.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Microphone kapcsolat bontva", "devices.microphoneError": "Hiba történt a mikrofon hangeszköz elérése közben", - "devices.microPhoneMute": "A mikrofon némítva lett", - "devices.micophoneUnMute": "A mikrofon némítása ki lett kapocsolva", + "devices.microphoneMute": "A mikrofon némítva lett", + "devices.microphoneUnMute": "A mikrofon némítása ki lett kapocsolva", "devices.microphoneEnable": "A mikrofon engedéylezve", "devices.microphoneMuteError": "Nem sikerült a mikrofonod némítása", "devices.microphoneUnMuteError": "Nem sikerült a mikrofonod némításának kikapcsolása", diff --git a/app/src/translations/it.json b/app/src/translations/it.json index 4529279..cc56426 100644 --- a/app/src/translations/it.json +++ b/app/src/translations/it.json @@ -132,8 +132,8 @@ "devices.microphoneDisconnected": "Microfono scollegato", "devices.microphoneError": "Errore con l'accesso al microfono", - "devices.microPhoneMute": "Microfono silenziato", - "devices.micophoneUnMute": "Microfono riattivato", + "devices.microphoneMute": "Microfono silenziato", + "devices.microphoneUnMute": "Microfono riattivato", "devices.microphoneEnable": "Microfono attivo", "devices.microphoneMuteError": "Impossibile silenziare il microfono", "devices.microphoneUnMuteError": "Impossibile riattivare il microfono", diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json index 1841857..a71e2ce 100644 --- a/app/src/translations/nb.json +++ b/app/src/translations/nb.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Mikrofon koblet fra", "devices.microphoneError": "Det skjedde noe feil med mikrofonen din", - "devices.microPhoneMute": "Dempet mikrofonen", - "devices.micophoneUnMute": "Aktiverte mikrofonen", + "devices.microphoneMute": "Dempet mikrofonen", + "devices.microphoneUnMute": "Aktiverte mikrofonen", "devices.microphoneEnable": "Aktiverte mikrofonen", "devices.microphoneMuteError": "Klarte ikke å dempe mikrofonen", "devices.microphoneUnMuteError": "Klarte ikke å aktivere mikrofonen", diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json index 3172ab8..4b6d365 100644 --- a/app/src/translations/pl.json +++ b/app/src/translations/pl.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Odłączono mikrofon", "devices.microphoneError": "Błąd dostępu do mikrofonu", - "devices.microPhoneMute": "Wyciszenie mikrofonu włączone", - "devices.micophoneUnMute": "Wyciszenie mikrofonu wyłączone", + "devices.microphoneMute": "Wyciszenie mikrofonu włączone", + "devices.microphoneUnMute": "Wyciszenie mikrofonu wyłączone", "devices.microphoneEnable": "Włączono mikrofon", "devices.microphoneMuteError": "Nie można wyciszyć mikrofonu", "devices.microphoneUnMuteError": "Nie można wyłączyć wyciszenia mikrofonu.", diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json index 4c30812..9513182 100644 --- a/app/src/translations/pt.json +++ b/app/src/translations/pt.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Microfone desiligado", "devices.microphoneError": "Ocorreu um erro no acesso ao microfone", - "devices.microPhoneMute": "Som microfone desativado", - "devices.micophoneUnMute": "Som mmicrofone ativado", + "devices.microphoneMute": "Som microfone desativado", + "devices.microphoneUnMute": "Som mmicrofone ativado", "devices.microphoneEnable": "Microfone ativado", "devices.microphoneMuteError": "Não foi possível cortar o som do microfone", "devices.microphoneUnMuteError": "Não foi possível ativar o som do microfone", diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json index 0fae5de..8d9eb9c 100644 --- a/app/src/translations/ro.json +++ b/app/src/translations/ro.json @@ -133,8 +133,8 @@ "devices.microphoneDisconnected": "Microfonul e deconectat", "devices.microphoneError": "A apărut o eroare la accesarea microfonului", - "devices.microPhoneMute": "Microfonul e dezactivat", - "devices.micophoneUnMute": "Retragerea dezactivării microfonului", + "devices.microphoneMute": "Microfonul e dezactivat", + "devices.microphoneUnMute": "Retragerea dezactivării microfonului", "devices.microphoneEnable": "Microfonul e activat", "devices.microphoneMuteError": "Încercarea de a dezactiva microfonului a eșuat", "devices.microphoneUnMuteError": "Încercarea de a retrage dezactivarea microfonului a eșuat", diff --git a/app/src/translations/uk.json b/app/src/translations/uk.json index 4c051ed..09594d4 100644 --- a/app/src/translations/uk.json +++ b/app/src/translations/uk.json @@ -126,8 +126,8 @@ "devices.microphoneDisconnected": "Мікрофон відключений", "devices.microphoneError": "Сталася помилка під час доступу до мікрофона", -"devices.microPhoneMute": "Вимкнено ваш мікрофон", -"devices.micophoneUnMute": "Не ввімкнено ваш мікрофон", +"devices.microphoneMute": "Вимкнено ваш мікрофон", +"devices.microphoneUnMute": "Не ввімкнено ваш мікрофон", "devices.microphoneEnable": "Увімкнено мікрофон", "devices.microphoneMuteError": "Не вдається вимкнути мікрофон", "devices.microphoneUnMuteError": "Неможливо ввімкнути мікрофон", From 9df750d7aaf2620adff92173023e803993dbee37 Mon Sep 17 00:00:00 2001 From: mi4aux <63875263+mi4aux@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:09:57 +0200 Subject: [PATCH 2/5] Replace static message with internationalized message by translation file --- app/src/components/MeetingDrawer/Chat/Message.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/components/MeetingDrawer/Chat/Message.js b/app/src/components/MeetingDrawer/Chat/Message.js index a60c245..724a053 100644 --- a/app/src/components/MeetingDrawer/Chat/Message.js +++ b/app/src/components/MeetingDrawer/Chat/Message.js @@ -6,6 +6,7 @@ import DOMPurify from 'dompurify'; import marked from 'marked'; import Paper from '@material-ui/core/Paper'; import Typography from '@material-ui/core/Typography'; +import { useIntl } from 'react-intl'; const linkRenderer = new marked.Renderer(); @@ -55,6 +56,8 @@ const styles = (theme) => const Message = (props) => { + const intl = useIntl(); + const { self, picture, @@ -88,7 +91,16 @@ const Message = (props) => } ) }} /> - {self ? 'Me' : name} - {time} + + { self ? + intl.formatMessage({ + id : 'room.me', + defaultMessage : 'Me' + }) + : + name + } - {time} + ); From aa22cde50175804f38db2891c69e100124699837 Mon Sep 17 00:00:00 2001 From: mi4aux <63875263+mi4aux@users.noreply.github.com> Date: Mon, 20 Apr 2020 22:13:40 +0200 Subject: [PATCH 3/5] Added missing npm dependencie "classnames" --- app/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/package.json b/app/package.json index fc6c575..1dab672 100644 --- a/app/package.json +++ b/app/package.json @@ -11,6 +11,7 @@ "@material-ui/core": "^4.5.1", "@material-ui/icons": "^4.5.1", "bowser": "^2.7.0", + "classnames": "^2.2.6", "create-torrent": "^4.4.1", "dompurify": "^2.0.7", "domready": "^1.0.8", From 665dc235ff3848039339869c9b84fc02607bd6d0 Mon Sep 17 00:00:00 2001 From: mi4aux <63875263+mi4aux@users.noreply.github.com> Date: Tue, 21 Apr 2020 20:19:15 +0200 Subject: [PATCH 4/5] Revert "Added missing npm dependencie "classnames"" This reverts commit aa22cde50175804f38db2891c69e100124699837. --- app/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/app/package.json b/app/package.json index 1dab672..fc6c575 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,6 @@ "@material-ui/core": "^4.5.1", "@material-ui/icons": "^4.5.1", "bowser": "^2.7.0", - "classnames": "^2.2.6", "create-torrent": "^4.4.1", "dompurify": "^2.0.7", "domready": "^1.0.8", From 9cc2999694ffe29ca0ea85c23d7a174c1426487b Mon Sep 17 00:00:00 2001 From: mi4aux <63875263+mi4aux@users.noreply.github.com> Date: Mon, 20 Apr 2020 22:13:40 +0200 Subject: [PATCH 5/5] Added missing npm dependencie "classnames" --- app/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/package.json b/app/package.json index fc6c575..1dab672 100644 --- a/app/package.json +++ b/app/package.json @@ -11,6 +11,7 @@ "@material-ui/core": "^4.5.1", "@material-ui/icons": "^4.5.1", "bowser": "^2.7.0", + "classnames": "^2.2.6", "create-torrent": "^4.4.1", "dompurify": "^2.0.7", "domready": "^1.0.8",