Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of github.com:havfo/multiparty-meeting into develop

auto_join_3.3
Håvar Aambø Fosstveit 2020-04-22 22:15:50 +02:00
parent fcc37f5d89 ff0a26a01f
commit 5124e44b5a
17 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/RoomClient.js
View File

@ -360,7 +360,7 @@ export default class RoomClient
store.dispatch(requestActions.notify( store.dispatch(requestActions.notify(
{ {
text : intl.formatMessage({ text : intl.formatMessage({
id : 'devices.microPhoneMute', id : 'devices.microphoneMute',
defaultMessage : 'Muted your microphone' defaultMessage : 'Muted your microphone'
}) })
})); }));
@ -372,7 +372,7 @@ export default class RoomClient
store.dispatch(requestActions.notify( store.dispatch(requestActions.notify(
{ {
text : intl.formatMessage({ text : intl.formatMessage({
id : 'devices.microPhoneUnMute', id : 'devices.microphoneUnMute',
defaultMessage : 'Unmuted your microphone' defaultMessage : 'Unmuted your microphone'
}) })
})); }));

14
app/src/components/MeetingDrawer/Chat/Message.js
View File

@ -6,6 +6,7 @@ import DOMPurify from 'dompurify';
import marked from 'marked'; import marked from 'marked';
import Paper from '@material-ui/core/Paper'; import Paper from '@material-ui/core/Paper';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
import { useIntl } from 'react-intl';
const linkRenderer = new marked.Renderer(); const linkRenderer = new marked.Renderer();
@ -55,6 +56,8 @@ const styles = (theme) =>
const Message = (props) => const Message = (props) =>
{ {
const intl = useIntl();
const { const {
self, self,
picture, picture,
@ -88,7 +91,16 @@ const Message = (props) =>
} }
) }} ) }}
/> />
<Typography variant='caption'>{self ? 'Me' : name} - {time}</Typography> <Typography variant='caption'>
{ self ?
intl.formatMessage({
id : 'room.me',
defaultMessage : 'Me'
})
:
name
} - {time}
</Typography>
</div> </div>
</Paper> </Paper>
); );

4
app/src/translations/cn.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "麦克风已断开", "devices.microphoneDisconnected": "麦克风已断开",
"devices.microphoneError": "麦克风发生错误", "devices.microphoneError": "麦克风发生错误",
"devices.microPhoneMute": "麦克风静音", "devices.microphoneMute": "麦克风静音",
"devices.micophoneUnMute": "取消麦克风静音", "devices.microphoneUnMute": "取消麦克风静音",
"devices.microphoneEnable": "启用了麦克风", "devices.microphoneEnable": "启用了麦克风",
"devices.microphoneMuteError": "无法使麦克风静音", "devices.microphoneMuteError": "无法使麦克风静音",
"devices.microphoneUnMuteError": "无法取消麦克风静音", "devices.microphoneUnMuteError": "无法取消麦克风静音",

4
app/src/translations/cs.json
View File

@ -130,8 +130,8 @@
"devices.microphoneDisconnected": "Mikrofon odpojen", "devices.microphoneDisconnected": "Mikrofon odpojen",
"devices.microphoneError": "Při přístupu k vašemu mikrofonu se vyskytla chyba", "devices.microphoneError": "Při přístupu k vašemu mikrofonu se vyskytla chyba",
"devices.microPhoneMute": "Mikrofon ztišen", "devices.microphoneMute": "Mikrofon ztišen",
"devices.micophoneUnMute": "Ztišení mikrofonu zrušeno", "devices.microphoneUnMute": "Ztišení mikrofonu zrušeno",
"devices.microphoneEnable": "Mikrofon povolen", "devices.microphoneEnable": "Mikrofon povolen",
"devices.microphoneMuteError": "Není možné ztišit váš mikrofon", "devices.microphoneMuteError": "Není možné ztišit váš mikrofon",
"devices.microphoneUnMuteError": "Není možné zrušit ztišení vašeho mikrofonu", "devices.microphoneUnMuteError": "Není možné zrušit ztišení vašeho mikrofonu",

4
app/src/translations/de.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Mikrofon nicht verbunden", "devices.microphoneDisconnected": "Mikrofon nicht verbunden",
"devices.microphoneError": "Fehler beim Zugriff auf dein Mikrofon", "devices.microphoneError": "Fehler beim Zugriff auf dein Mikrofon",
"devices.microPhoneMute": "Mikrofon stummgeschaltet", "devices.microphoneMute": "Mikrofon stummgeschaltet",
"devices.micophoneUnMute": "Mikrofon aktiviert", "devices.microphoneUnMute": "Mikrofon aktiviert",
"devices.microphoneEnable": "Mikrofon aktiviert", "devices.microphoneEnable": "Mikrofon aktiviert",
"devices.microphoneMuteError": "Kann Mikrofon nicht stummschalten", "devices.microphoneMuteError": "Kann Mikrofon nicht stummschalten",
"devices.microphoneUnMuteError": "Kann Mikrofon nicht aktivieren", "devices.microphoneUnMuteError": "Kann Mikrofon nicht aktivieren",

4
app/src/translations/dk.json
View File

@ -135,8 +135,8 @@
"device.microphoneDisconnected": "Mikrofon frakoblet", "device.microphoneDisconnected": "Mikrofon frakoblet",
"device.microphoneError": "Der opstod en fejl under adgang til din mikrofon", "device.microphoneError": "Der opstod en fejl under adgang til din mikrofon",
"device.microPhoneMute": "Dæmp din mikrofon", "device.microphoneMute": "Dæmp din mikrofon",
"device.micophoneUnMute": "Slå ikke lyden fra din mikrofon", "device.microphoneUnMute": "Slå ikke lyden fra din mikrofon",
"device.microphoneEnable": "Aktiveret din mikrofon", "device.microphoneEnable": "Aktiveret din mikrofon",
"device.microphoneMuteError": "Kan ikke slå din mikrofon fra", "device.microphoneMuteError": "Kan ikke slå din mikrofon fra",
"device.microphoneUnMuteError": "Kan ikke slå lyden til på din mikrofon", "device.microphoneUnMuteError": "Kan ikke slå lyden til på din mikrofon",

4
app/src/translations/el.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Το μικρόφωνο αποσυνδέθηκε", "devices.microphoneDisconnected": "Το μικρόφωνο αποσυνδέθηκε",
"devices.microphoneError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στο μικρόφωνό σας", "devices.microphoneError": "Παρουσιάστηκε σφάλμα κατά την πρόσβαση στο μικρόφωνό σας",
"devices.microPhoneMute": "Το μικρόφωνό σας είναι σε σίγαση", "devices.microphoneMute": "Το μικρόφωνό σας είναι σε σίγαση",
"devices.micophoneUnMute": "Ανοίξτε το μικρόφωνό σας", "devices.microphoneUnMute": "Ανοίξτε το μικρόφωνό σας",
"devices.microphoneEnable": "Ενεργοποίησε το μικρόφωνό σας", "devices.microphoneEnable": "Ενεργοποίησε το μικρόφωνό σας",
"devices.microphoneMuteError": "Δεν είναι δυνατή η σίγαση του μικροφώνου σας", "devices.microphoneMuteError": "Δεν είναι δυνατή η σίγαση του μικροφώνου σας",
"devices.microphoneUnMuteError": "Δεν είναι δυνατό το άνοιγμα του μικροφώνου σας", "devices.microphoneUnMuteError": "Δεν είναι δυνατό το άνοιγμα του μικροφώνου σας",

4
app/src/translations/en.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Microphone disconnected", "devices.microphoneDisconnected": "Microphone disconnected",
"devices.microphoneError": "An error occured while accessing your microphone", "devices.microphoneError": "An error occured while accessing your microphone",
"devices.microPhoneMute": "Muted your microphone", "devices.microphoneMute": "Muted your microphone",
"devices.micophoneUnMute": "Unmuted your microphone", "devices.microphoneUnMute": "Unmuted your microphone",
"devices.microphoneEnable": "Enabled your microphone", "devices.microphoneEnable": "Enabled your microphone",
"devices.microphoneMuteError": "Unable to mute your microphone", "devices.microphoneMuteError": "Unable to mute your microphone",
"devices.microphoneUnMuteError": "Unable to unmute your microphone", "devices.microphoneUnMuteError": "Unable to unmute your microphone",

4
app/src/translations/es.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Micrófono desconectado", "devices.microphoneDisconnected": "Micrófono desconectado",
"devices.microphoneError": "Hubo un error al acceder a su micrófono", "devices.microphoneError": "Hubo un error al acceder a su micrófono",
"devices.microPhoneMute": "Desactivar micrófono", "devices.microphoneMute": "Desactivar micrófono",
"devices.micophoneUnMute": "Activar micrófono", "devices.microphoneUnMute": "Activar micrófono",
"devices.microphoneEnable": "Micrófono activado", "devices.microphoneEnable": "Micrófono activado",
"devices.microphoneMuteError": "No ha sido posible desactivar su micrófono", "devices.microphoneMuteError": "No ha sido posible desactivar su micrófono",
"devices.microphoneUnMuteError": "No ha sido posible activar su micrófono", "devices.microphoneUnMuteError": "No ha sido posible activar su micrófono",

4
app/src/translations/fr.json
View File

@ -134,8 +134,8 @@
"devices.microphoneDisconnected": "Microphone déconnecté", "devices.microphoneDisconnected": "Microphone déconnecté",
"devices.microphoneError": "Une erreur est apparue lors de l'accès à votre microphone", "devices.microphoneError": "Une erreur est apparue lors de l'accès à votre microphone",
"devices.microPhoneMute": "Désactiver le microphone", "devices.microphoneMute": "Désactiver le microphone",
"devices.micophoneUnMute": "Réactiver le microphone", "devices.microphoneUnMute": "Réactiver le microphone",
"devices.microphoneEnable": "Activer le microphone", "devices.microphoneEnable": "Activer le microphone",
"devices.microphoneMuteError": "Impossible de désactiver le microphone", "devices.microphoneMuteError": "Impossible de désactiver le microphone",
"devices.microphoneUnMuteError": "Impossible de réactiver le microphone", "devices.microphoneUnMuteError": "Impossible de réactiver le microphone",

4
app/src/translations/hr.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Mikrofon odspojen", "devices.microphoneDisconnected": "Mikrofon odspojen",
"devices.microphoneError": "Greška prilikom pristupa mikrofonu", "devices.microphoneError": "Greška prilikom pristupa mikrofonu",
"devices.microPhoneMute": "Mikrofon utišan", "devices.microphoneMute": "Mikrofon utišan",
"devices.micophoneUnMute": "Mikrofon pojačan", "devices.microphoneUnMute": "Mikrofon pojačan",
"devices.microphoneEnable": "Mikrofon omogućen", "devices.microphoneEnable": "Mikrofon omogućen",
"devices.microphoneMuteError": "Nije moguće utišati mikrofon", "devices.microphoneMuteError": "Nije moguće utišati mikrofon",
"devices.microphoneUnMuteError": "Nije moguće pojačati mikrofon", "devices.microphoneUnMuteError": "Nije moguće pojačati mikrofon",

4
app/src/translations/hu.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Microphone kapcsolat bontva", "devices.microphoneDisconnected": "Microphone kapcsolat bontva",
"devices.microphoneError": "Hiba történt a mikrofon hangeszköz elérése közben", "devices.microphoneError": "Hiba történt a mikrofon hangeszköz elérése közben",
"devices.microPhoneMute": "A mikrofon némítva lett", "devices.microphoneMute": "A mikrofon némítva lett",
"devices.micophoneUnMute": "A mikrofon némítása ki lett kapocsolva", "devices.microphoneUnMute": "A mikrofon némítása ki lett kapocsolva",
"devices.microphoneEnable": "A mikrofon engedéylezve", "devices.microphoneEnable": "A mikrofon engedéylezve",
"devices.microphoneMuteError": "Nem sikerült a mikrofonod némítása", "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", "devices.microphoneUnMuteError": "Nem sikerült a mikrofonod némításának kikapcsolása",

4
app/src/translations/it.json
View File

@ -134,8 +134,8 @@
"devices.microphoneDisconnected": "Microfono scollegato", "devices.microphoneDisconnected": "Microfono scollegato",
"devices.microphoneError": "Errore con l'accesso al microfono", "devices.microphoneError": "Errore con l'accesso al microfono",
"devices.microPhoneMute": "Microfono silenziato", "devices.microphoneMute": "Microfono silenziato",
"devices.micophoneUnMute": "Microfono riattivato", "devices.microphoneUnMute": "Microfono riattivato",
"devices.microphoneEnable": "Microfono attivo", "devices.microphoneEnable": "Microfono attivo",
"devices.microphoneMuteError": "Impossibile silenziare il microfono", "devices.microphoneMuteError": "Impossibile silenziare il microfono",
"devices.microphoneUnMuteError": "Impossibile riattivare il microfono", "devices.microphoneUnMuteError": "Impossibile riattivare il microfono",

4
app/src/translations/nb.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Mikrofon koblet fra", "devices.microphoneDisconnected": "Mikrofon koblet fra",
"devices.microphoneError": "Det skjedde noe feil med mikrofonen din", "devices.microphoneError": "Det skjedde noe feil med mikrofonen din",
"devices.microPhoneMute": "Dempet mikrofonen", "devices.microphoneMute": "Dempet mikrofonen",
"devices.micophoneUnMute": "Aktiverte mikrofonen", "devices.microphoneUnMute": "Aktiverte mikrofonen",
"devices.microphoneEnable": "Aktiverte mikrofonen", "devices.microphoneEnable": "Aktiverte mikrofonen",
"devices.microphoneMuteError": "Klarte ikke å dempe mikrofonen", "devices.microphoneMuteError": "Klarte ikke å dempe mikrofonen",
"devices.microphoneUnMuteError": "Klarte ikke å aktivere mikrofonen", "devices.microphoneUnMuteError": "Klarte ikke å aktivere mikrofonen",

4
app/src/translations/pl.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Odłączono mikrofon", "devices.microphoneDisconnected": "Odłączono mikrofon",
"devices.microphoneError": "Błąd dostępu do mikrofonu", "devices.microphoneError": "Błąd dostępu do mikrofonu",
"devices.microPhoneMute": "Wyciszenie mikrofonu włączone", "devices.microphoneMute": "Wyciszenie mikrofonu włączone",
"devices.micophoneUnMute": "Wyciszenie mikrofonu wyłączone", "devices.microphoneUnMute": "Wyciszenie mikrofonu wyłączone",
"devices.microphoneEnable": "Włączono mikrofon", "devices.microphoneEnable": "Włączono mikrofon",
"devices.microphoneMuteError": "Nie można wyciszyć mikrofonu", "devices.microphoneMuteError": "Nie można wyciszyć mikrofonu",
"devices.microphoneUnMuteError": "Nie można wyłączyć wyciszenia mikrofonu.", "devices.microphoneUnMuteError": "Nie można wyłączyć wyciszenia mikrofonu.",

4
app/src/translations/pt.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Microfone desiligado", "devices.microphoneDisconnected": "Microfone desiligado",
"devices.microphoneError": "Ocorreu um erro no acesso ao microfone", "devices.microphoneError": "Ocorreu um erro no acesso ao microfone",
"devices.microPhoneMute": "Som microfone desativado", "devices.microphoneMute": "Som microfone desativado",
"devices.micophoneUnMute": "Som mmicrofone ativado", "devices.microphoneUnMute": "Som mmicrofone ativado",
"devices.microphoneEnable": "Microfone ativado", "devices.microphoneEnable": "Microfone ativado",
"devices.microphoneMuteError": "Não foi possível cortar o som do microfone", "devices.microphoneMuteError": "Não foi possível cortar o som do microfone",
"devices.microphoneUnMuteError": "Não foi possível ativar o som do microfone", "devices.microphoneUnMuteError": "Não foi possível ativar o som do microfone",

4
app/src/translations/ro.json
View File

@ -135,8 +135,8 @@
"devices.microphoneDisconnected": "Microfonul e deconectat", "devices.microphoneDisconnected": "Microfonul e deconectat",
"devices.microphoneError": "A apărut o eroare la accesarea microfonului", "devices.microphoneError": "A apărut o eroare la accesarea microfonului",
"devices.microPhoneMute": "Microfonul e dezactivat", "devices.microphoneMute": "Microfonul e dezactivat",
"devices.micophoneUnMute": "Retragerea dezactivării microfonului", "devices.microphoneUnMute": "Retragerea dezactivării microfonului",
"devices.microphoneEnable": "Microfonul e activat", "devices.microphoneEnable": "Microfonul e activat",
"devices.microphoneMuteError": "Încercarea de a dezactiva microfonului a eșuat", "devices.microphoneMuteError": "Încercarea de a dezactiva microfonului a eșuat",
"devices.microphoneUnMuteError": "Încercarea de a retrage dezactivarea microfonului a eșuat", "devices.microphoneUnMuteError": "Încercarea de a retrage dezactivarea microfonului a eșuat",