OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,598 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

4598 Commits (0b56d33bd2a7738ca9a988ae13083c3cb8f618e4)

Author SHA1 Message Date
Stanislav N 53cb6d1d76 Translated using Weblate (Russian) 
Currently translated at 65.8% (434 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
 2017-05-26 20:11:46 +00:00
RiotTranslate 765034dc19 Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 20:10:47 +00:00
Stanislav N 5f2012102c Translated using Weblate (Russian) 
Currently translated at 65.8% (434 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
 2017-05-26 20:10:47 +00:00
Krombel 08529ba5a8 Translated using Weblate (German) 
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-26 20:10:47 +00:00
Michael Telatynski db3d455a1d Merge pull request #939 from turt2live/patch-1 
Fix PM being AM
 2017-05-26 21:05:46 +01:00
Travis Ralston 65dd2d4db1 Fix PM being AM 
Fixes https://github.com/vector-im/riot-web/issues/4043

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-26 13:43:01 -06:00
RiotTranslate b5912d3c92 Merge branch 'develop' of git://github.com/matrix-org/matrix-react-sdk into develop 2017-05-26 18:52:03 +00:00
RiotTranslate e46b63dc5a [WEBLATE] fix merging issues 2017-05-26 18:51:55 +00:00
Matthew Hodgson 32207bd058 use develop js-sdk 2017-05-26 19:51:47 +01:00
Krombel c138e4d92e Translated using Weblate (German) 
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-26 18:40:57 +00:00
Amandine 9fcee811cb Translated using Weblate (French) 
Currently translated at 25.7% (170 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-26 18:40:56 +00:00
Amandine a77663d18b Translated using Weblate (French) 
Currently translated at 25.6% (169 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-26 18:18:16 +00:00
Krombel 1edad35c98 Translated using Weblate (German) 
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-26 18:18:14 +00:00
Matthew Hodgson e5ef9f3e3a Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep 
pass call state through dispatcher, for poor electron
 2017-05-26 19:09:10 +01:00
David Baker cddfe7e6ef Fix inconsistent quoting in topic messages 2017-05-26 19:00:44 +01:00
David Baker 563b85ceb8 Merge https://github.com/MTRNord/matrix-react-sdk/pull/115 2017-05-26 18:53:23 +01:00
David Baker f4184bc695 Merge pull request #934 from matrix-org/dbkr/translations 
Translations!
 2017-05-26 18:38:04 +01:00
David Baker 647c1b6169 Once more, with braces 2017-05-26 18:19:32 +01:00
David Baker 97aeb57a8b Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 18:15:32 +01:00
Luke Barnard 276d3cad9c Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix 
Remove suffix and prefix from login input username
 2017-05-26 18:07:10 +01:00
David Baker 62ffe929e4 Translate Add Threepid labels 2017-05-26 18:03:24 +01:00
David Baker cf0073a631 Missing translations in User Interface section 2017-05-26 17:59:19 +01:00
David Baker 23fbce66a2 Translate 'email' threepid label 2017-05-26 17:56:51 +01:00
David Baker 40680d55e0 Fix merge fail 2017-05-26 17:55:48 +01:00
David Baker c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
David Baker 84cef00f1f Mismatched oneUser / severalUsers 2017-05-26 17:16:23 +01:00
Matthew Hodgson fde553a809 Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp 
Kierangould/12hourtimestamp
 2017-05-26 16:52:09 +01:00
David Baker 0f8e560247 Add function to display i18n keys in UI 
Avoids having to load translations in riot-web tests
 2017-05-26 15:29:11 +01:00
David Baker e3e848d09e Fix missing full stop on translation key 2017-05-26 13:19:46 +01:00
David Baker bb344740dd Add test languages file 2017-05-26 13:09:29 +01:00
David Baker 0de0b8954d Trailing whitespace 2017-05-26 12:03:36 +01:00
David Baker e44f3cc709 Fix tests 
* Serve translation files from the karma server
 * Port UserSettingsStore to ES6 exports because the test runner
   gets confused by ES6 importing a commonjs module
 * Remove extra spaces in translations strings for MELS
 * Fix 'his/her' back to be 'their'
 * Change test to expect singular 'invitation' for a single person
   (there may be multiple invitations, but IMO this should be
   'rejected n invitations' and we can play with the wording later,
   I don't think the singular is any worse than the plural).
 * set language in the MELS tests (and wait for it to complete)
 * Don't bother setting lang in other tests for now
 2017-05-26 11:58:45 +01:00
Richard van der Hoff 72b1f03238 Merge pull request #931 from matrix-org/dbkr/dont_put_src_in_resolve_root 
Don't include src in the test resolve root
 2017-05-25 23:29:47 +01:00
David Baker dfc8cf3f54 Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations 2017-05-25 23:16:39 +01:00
David Baker ba8e37a84e Don't include src in the test resolve root 
Don't include src in resolve root for the karma test, as otherwise
modules from react sdk get pulled in instead of npm libraries like
'extend' which breaks everything in really subtle ways.
 2017-05-25 23:13:49 +01:00
David Baker 2d6bf5fa91 Remove messages with HTML formatting 
The translations strings are not HTML and it gets escaped.
 2017-05-25 20:04:28 +01:00
David Baker ab92cc2254 Question marks do not internationalise 2017-05-25 19:55:54 +01:00
David Baker e7fbf889fa Make current language more accurate 
Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.

Also fix style.
 2017-05-25 19:53:27 +01:00
David Baker be4944a4b6 Hopefully get translations with '.'s sorted 
attempt 2
 2017-05-25 19:43:34 +01:00
David Baker dac6a3360b Oops, don't change these reason strings. 2017-05-25 19:25:06 +01:00
David Baker 43d8ccf128 Hopefully sort out strings with appended '.'s 2017-05-25 19:21:18 +01:00
David Baker c3c2916449 Use array literals 2017-05-25 18:26:42 +01:00
David Baker 6c41be3c14 Missed OKs 2017-05-25 18:23:15 +01:00
David Baker 443ab1add7 Put back default strings on dialogs 
But make them work by calling _t in render rather than
getDefaultProps().

Also sort out some 'Warning!' strings
 2017-05-25 18:20:48 +01:00
David Baker 9112fc231a More translation string fixups 2017-05-25 17:35:18 +01:00
David Baker 6d67655f66 Add german for Change password 2017-05-25 17:22:04 +01:00
David Baker 85756c78b4 Change to object literal 2017-05-25 17:17:37 +01:00
David Baker feef7d49e9 More tabs 2017-05-25 16:55:24 +01:00
David Baker 3a379d09de Update translations 
Actually translate the language dropdown label & add the string.
Remove some unused ones.
 2017-05-25 16:52:15 +01:00
David Baker 39dbc4c6e1 Lots of changes to languageHandler 
* Replace callbacks with promises
 * Move plain functions to top level
 * De-duplicate bits that fetched languages.json
 * Take full language preference list from the browser if we
   can get it, rather than just the first.
 2017-05-25 16:45:32 +01:00