forked from matrix/element-web
Merge branch 'develop' into bwindels/redesign
This commit is contained in:
Bruno Windels
commit
ee137ce44c
|
|
@ -234,6 +234,10 @@ Before attempting to develop on Riot you **must** read the developer guide
|
|||
for `matrix-react-sdk` at https://github.com/matrix-org/matrix-react-sdk, which
|
||||
also defines the design, architecture and style for Riot too.
|
||||
|
||||
You should also familiarise yourself with the "Here be Dragons" guide to the
|
||||
tame & not-so-tame dragons (gotchas) which exist in the codebase:
|
||||
https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM
|
||||
|
||||
The idea of Riot is to be a relatively lightweight "skin" of customisations on
|
||||
top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
|
||||
higher and lower level React components useful for building Matrix communication
|
||||
|
|
|
|||
16
package.json
16
package.json
|
|
@ -100,8 +100,8 @@
|
|||
"concurrently": "^4.0.1",
|
||||
"cpx": "^1.3.2",
|
||||
"cross-env": "^4.0.0",
|
||||
"electron-builder": "^11.2.4",
|
||||
"electron-builder-squirrel-windows": "^11.2.1",
|
||||
"electron-builder": "^20.28.4",
|
||||
"electron-builder-squirrel-windows": "^11.6.1",
|
||||
"electron-devtools-installer": "^2.2.4",
|
||||
"emojione": "^2.2.7",
|
||||
"eslint": "^5.6.0",
|
||||
|
|
@ -150,12 +150,7 @@
|
|||
},
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"category": "Network",
|
||||
"electronVersion": "2.0.8",
|
||||
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
|
||||
"asar": false,
|
||||
"dereference": true,
|
||||
"//files": "We bundle everything, so we only need to include webapp/",
|
||||
"electronVersion": "3.0.3",
|
||||
"files": [
|
||||
"node_modules/**",
|
||||
"src/**",
|
||||
|
|
@ -172,8 +167,13 @@
|
|||
"StartupWMClass": "riot"
|
||||
}
|
||||
},
|
||||
"mac": {
|
||||
"category": "public.app-category.social-networking"
|
||||
},
|
||||
"win": {
|
||||
"target": {
|
||||
"target": "squirrel"
|
||||
}
|
||||
},
|
||||
"directories": {
|
||||
"buildResources": "electron_app/build",
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ echo "electron npm version"
|
|||
|
||||
cd electron_app
|
||||
npm version --no-git-tag-version "$release"
|
||||
git commit package.json package-lock.json -m "$tag"
|
||||
git commit package.json -m "$tag"
|
||||
|
||||
|
||||
cd ..
|
||||
|
|
|
|||
|
|
@ -22,18 +22,18 @@
|
|||
"Support for those using and running matrix-appservice-irc": "Supporto per chi usa e amministra matrix-appservice-irc",
|
||||
"Building services on Matrix": "Costruzione servizi su Matrix",
|
||||
"Support for those using the Matrix spec": "Supporto per chi utilizza le specifiche Matrix",
|
||||
"Design and implementation of E2E in Matrix": "Design e implementazione di E2E in Matrix",
|
||||
"Design and implementation of E2E in Matrix": "Progetto e implementazione di E2E in Matrix",
|
||||
"Implementing VR services with Matrix": "Implementazione servizi VR con Matrix",
|
||||
"Implementing VoIP services with Matrix": "Implementazione servizi VoIP con Matrix",
|
||||
"Discussion of the Identity Service API": "Discussione sull'Identity Service API",
|
||||
"Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri bridge",
|
||||
"Discussion of the Identity Service API": "Discussione API del servizio identità",
|
||||
"Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri ponti (bridge)",
|
||||
"Contributing code to Matrix and Riot": "Contributi di codice per Matrix e Riot",
|
||||
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s tramite %(browserName)s su %(osName)s",
|
||||
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat criptate e collaborazioni decentralizzate offerte da [matrix]",
|
||||
"Discussion of all things Matrix!": "Discussione su tutto quanto riguardi Matrix!",
|
||||
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat criptate e decentralizzate & collaborazione offerta da [matrix]",
|
||||
"Discussion of all things Matrix!": "Discussione su tutto riguardo Matrix!",
|
||||
"Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web",
|
||||
"Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.<br/> Questo permette di usare Matrix con un account esistente su un home server diverso.<br/><br/>È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti esistenti (Slack, IRC, Gitter, ecc.) o indipendenti. Controlla l'elenco!",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo del server home.<br/> Questo permette di usare Riot con un account Matrix esistente su un server home diverso.<br/><br/>È anche possibile impostare un diverso server identità, ma in tal caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.",
|
||||
"Co-ordination for Riot translators": "Coordinazione per i traduttori di Riot"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
"Chat with Riot Bot": "Riot Botと会話",
|
||||
"Get started with some tips from Riot Bot!": "Riot Botにヒントをもらって始めましょう！",
|
||||
"General discussion about Matrix and Riot": "MatrixとRiotの概略",
|
||||
"Discussion of all things Matrix!": "Matrixなんでも討論",
|
||||
"Discussion of all things Matrix!": "Matrixなんでも議論！",
|
||||
"Riot/Web & Desktop chat": "Riot/Web & デスクトップ版チャット",
|
||||
"Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk チャット",
|
||||
"Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-android-sdk チャット",
|
||||
|
|
@ -27,12 +27,13 @@
|
|||
"Support for those using and running matrix-appservice-irc": "matrix-appservice-ircを利用並びに運営している方へのサポート",
|
||||
"Building services on Matrix": "Matrixでのサービスの開発",
|
||||
"Support for those using the Matrix spec": "Matrixスペックを利用する方へのサポート",
|
||||
"Design and implementation of E2E in Matrix": "Matrixでのデザインとエンドツーエンドの実装",
|
||||
"Design and implementation of E2E in Matrix": "Matrixのデザインとエンドツーエンドの実装",
|
||||
"Implementing VR services with Matrix": "MatrixでのVRサービスの実装",
|
||||
"Implementing VoIP services with Matrix": "MatrixでのIP電話サービスの実装",
|
||||
"Discussion of the Identity Service API": "Identity Service APIの議論",
|
||||
"Support for those using, running and writing other bridges": "他のブリッジを利用、運営、作成している方へのサポート",
|
||||
"Contributing code to Matrix and Riot": "MatrixとRiotにコードを提供する",
|
||||
"Dev chat for the Riot/Web dev team": "Riot/Web開発者チームのための開発者チャット",
|
||||
"Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット"
|
||||
"Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット",
|
||||
"Co-ordination for Riot translators": "Riot 翻訳者による共同作業"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
"Riot is not supported on mobile web. Install the app?": ".i lo samfonxa na kakne lo nu pilno la kibro nu zunti .i .au pei kibycpa le samtci",
|
||||
"Riot Desktop on %(platformName)s": "la skami nu zunti ci'e la'o gy. %(platformName)s .gy.",
|
||||
"Unknown device": "lo na'e te djuno se pilno",
|
||||
"%(appName)s via %(browserName)s on %(osName)s": "la'o gy. %(appName)s .gy. xe be'i la'o gy. %(browserName)s .gy. ci'e la'o gy. %(osName)s .gy.",
|
||||
"You need to be using HTTPS to place a screen-sharing call.": ".i la .hytytypysys. sarcu lo nu co'a vidni jorne",
|
||||
"Custom Server Options": "lo macnu se cuxna be fi lo'i samse'u",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": ".i zukte lo nu macnu cuxna lo samse'u kei goi ko'a lo nu pilno lo drata samse'u pe la nacmeimei<br/>.i ko'a se cumki lo nu do pilno lo pilno poi zvati lo drata samse'u pe la nacmeimei<br/><br/>.i ji'a cumki fa lo nu do pilno lo drata ke prenu datni samse'u kei goi ko'a .i ku'i ko'a to'e rinka la'a lo nu do zvacpe ja se zvacpe",
|
||||
"Dismiss": "mipri",
|
||||
"powered by Matrix": ".i la nacmeimei cu cumgau",
|
||||
"Welcome to Riot.im": ".i fi'i lo pilno be la nu zunti",
|
||||
"Decentralised, encrypted chat & collaboration powered by [matrix]": ".i la nacmeimei cu cumgau lo mifra je na'e se midju nu tavla je ke kansa gunka",
|
||||
"Search the room directory": "sisku fi lo'i kumfa pe'a",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": ".i ci'e la nacmeimei cu kumfa pe'a fa so'i da noi jorne jo nai no'e jorne lo drata ciste no'u mu'a la .slak. jo'u lo te irci jo'u la .gityr. .i",
|
||||
"Chat with Riot Bot": "tavla la nu zunti kei sampre",
|
||||
"Get started with some tips from Riot Bot!": ".i .e'u la nu zunti kei sampre cu sidju ko",
|
||||
"General discussion about Matrix and Riot": "lo nu casnu be la nacmeimei .e la nu zunti",
|
||||
"Discussion of all things Matrix!": "lo nu casnu be ro me la nacmeimei",
|
||||
"Riot/Web & Desktop chat": "lo nu casnu be la kibro nu zunti .e la skami nu zunti",
|
||||
"Running Matrix services": "lo nu ralte lo samtcise'u pe la nacmeimei",
|
||||
"Community-run support for Synapse": "lo nu lo cecmu cu sidju fi tu'a la .sinaps.",
|
||||
"Discussion of the Identity Service API": "lo nu casnu lo prenu datni favgau cimde",
|
||||
"Contributing code to Matrix and Riot": "lo nu dunda lo samselpla la nacmeimei .a la nu zunti",
|
||||
"Co-ordination for Riot translators": "lo nu lo fanva pe la nu zunti cu kansa gunka",
|
||||
"Riot/iOS & matrix-ios-sdk chat": "lo nu casnu la plisyfonkemsamcmu nu zunti .e la'o gy. matrix-ios-sdk .gy.",
|
||||
"Riot/Android & matrix-android-sdk chat": "lo nu casnu la guglyfonkemsamcmu nu zunti .e la'o gy. matrix-android-sdk .gy.",
|
||||
"Matrix technical discussions": "lo nu casnu lo zbaske be la nacmeimei",
|
||||
"Announcements about Synapse releases": "lo notci be lo farvi tcini pe la nirna",
|
||||
"Support for those using and running matrix-appservice-irc": "lo nu sidju lo pilno ja admine be la'o gy. matrix-appservice-irc .gy.",
|
||||
"Building services on Matrix": "lo nu finti lo te selfu ji'u la nacmeimei",
|
||||
"Support for those using the Matrix spec": "lo nu sidju lo pilno be lo sarcu pe la nacmeimei",
|
||||
"Design and implementation of E2E in Matrix": "lo nu finti lo mulno mifra te platu .a lo samtcise'u be my. ji'u la nacmeimei",
|
||||
"Support for those using, running and writing other bridges": "lo nu sidju lo pilno ja admine ja finti be lo drata te jorne",
|
||||
"Dev chat for the Riot/Web dev team": "lo nu lo favgau be la kibro nu zunti cu casnu",
|
||||
"Dev chat for the Dendrite dev team": "lo nu lo favgau be la nirndendriti cu casnu",
|
||||
"Implementing VoIP services with Matrix": "lo nu finti lo samtcise'u be fi la .voip. ji'u la nacmeimei",
|
||||
"Implementing VR services with Matrix": "lo nu finti lo samtcise'u be fi lo na'e fatci munje ji'u la nacmeimei",
|
||||
"Admin support for Dendrite": "lo nu sidju lo admine be la nirndendriti"
|
||||
}
|
||||
|
|
@ -33,5 +33,7 @@
|
|||
"Contributing code to Matrix and Riot": "Matrix와 Riot에 코드 기여하기",
|
||||
"Dev chat for the Riot/Web dev team": "Riot/웹 개발 팀을 위한 개발자 대화",
|
||||
"Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!"
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!",
|
||||
"Co-ordination for Riot translators": "Riot 번역자 조합",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "사용자정의 서버 설정에서 다른 홈서버 URL를 지정해 다른 Matrix 서버에 접속할 수 있습니다. <br/>이렇게하면 다른 홈서버에서 기존의 Matrix 계정으로 Riot을 이용할 수 있습니다.<br/><br/>사용자정의 아이덴티티 서버도 설정할 수 있지만 이메일 주소로 이용자를 초대하거나 자신이 이메일 주소로 초대받을 수 없습니다."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Riot is not supported on mobile web. Install the app?": "Riot-i nuk mbulohet nën web për celularët. Të instalohet aplikacioni?",
|
||||
"Riot is not supported on mobile web. Install the app?": "Riot-i nuk mbulohet në web për celularë. Të instalohet aplikacioni?",
|
||||
"Riot Desktop on %(platformName)s": "Riot Desktop në %(platformName)s",
|
||||
"Unknown device": "Pajisje e panjohur",
|
||||
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s përmes %(browserName)s nën %(osName)s",
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
"Dismiss": "Mos e merr parasysh",
|
||||
"powered by Matrix": "bazuar në Matrix",
|
||||
"Welcome to Riot.im": "Mirë se vini te Riot.im",
|
||||
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralised, encrypted Fjalosje & bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në [matrix]",
|
||||
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Fjalosje & bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në [matrix]",
|
||||
"Search the room directory": "Kërkoni te drejtoria e dhomave",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Ka tashmë plot dhoma në Matrix, të lidhura me rrjete ekzistues (Slack, IRC, Gitter, etj) ose të pavarur. Hidhini një sy listës!",
|
||||
"Chat with Riot Bot": "Fjalosuni me Robotin Riot",
|
||||
|
|
@ -27,12 +27,13 @@
|
|||
"Support for those using and running matrix-appservice-irc": "Asistencë për ata që përdorin dhe xhirojnë matrix-appservice-irc",
|
||||
"Building services on Matrix": "Ndërtim shërbimesh mbi Matrix",
|
||||
"Support for those using the Matrix spec": "Asistencë për ata që përdorin specifikimet Matrix",
|
||||
"Design and implementation of E2E in Matrix": "Konceptimi dhe sendërtimi i E2E në Matrix",
|
||||
"Design and implementation of E2E in Matrix": "Konceptimi dhe sendërtimi i E2E-s në Matrix",
|
||||
"Implementing VR services with Matrix": "Sendërtim shërbimesh VR me Matrix-in",
|
||||
"Implementing VoIP services with Matrix": "Sendërtim shërbimesh VoIP me Matrix-in",
|
||||
"Discussion of the Identity Service API": "Diskutime mbi Identity Service API",
|
||||
"Discussion of the Identity Service API": "Diskutime mbi API-n Identity Service",
|
||||
"Support for those using, running and writing other bridges": "Asistencë për ata që përdorin, xhirojnë ose programojnë ura të tjera",
|
||||
"Contributing code to Matrix and Riot": "Kontribut me kod te Matrix dhe te Riot",
|
||||
"Dev chat for the Riot/Web dev team": "Fjalosje mbi zhvillimin, për ekipin e zhvilluesve të Riot/Web-i",
|
||||
"Dev chat for the Dendrite dev team": "Fjalosje zhvillimi, për ekipin e zhvilluesve të Dendrite-it"
|
||||
"Dev chat for the Dendrite dev team": "Fjalosje mbi zhvillimi, për ekipin e zhvilluesve të Dendrite-it",
|
||||
"Co-ordination for Riot translators": "Bashkërendim për përkthyes të Riot-it"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -289,12 +289,23 @@ async function loadApp() {
|
|||
// in case the Tinter.tint() in MatrixChat fires before the
|
||||
// CSS has actually loaded (which in practice happens)...
|
||||
|
||||
// This if fixes Tinter.setTheme to not fire on Firefox
|
||||
// in case it is the first time loading Riot.
|
||||
// `InstallTrigger` is a Object which only exists on Firefox
|
||||
// (it is used for their Plugins) and can be used as a
|
||||
// feature check.
|
||||
// Firefox loads css always before js. This is why we dont use
|
||||
// onload or it's EventListener as thoose will never trigger.
|
||||
if (typeof InstallTrigger !== 'undefined') {
|
||||
Tinter.setTheme(theme);
|
||||
} else {
|
||||
// FIXME: we should probably block loading the app or even
|
||||
// showing a spinner until the theme is loaded, to avoid
|
||||
// flashes of unstyled content.
|
||||
a.onload = () => {
|
||||
Tinter.setTheme(theme);
|
||||
};
|
||||
}
|
||||
} else {
|
||||
// Firefox requires this to not be done via `setAttribute`
|
||||
// or via HTML.
|
||||
|
|
|
|||
Loading…
Reference in New Issue