PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
32204 commits 1 branch 0 tags 338 MiB
Commit graph

2391 commits

Author SHA1 Message Date
daniel tygel
d4a89cc2df Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-05-31 09:09:27 -03:00
Michael Telatynski
dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 
# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:54:57 +01:00
Michael Telatynski
0d930c0553 change wording and i18n it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:46:51 +01:00
daniel tygel
f4e5039e70 add string to translate 2017-05-30 19:01:23 -03:00
daniel tygel
12f923bc81 add new string to translate 2017-05-30 18:56:52 -03:00
Matthew Hodgson
c15568e003 remove spurious string 2017-05-30 21:05:26 +01:00
Matthew Hodgson
e30e45a82c Merge branch 'develop' into new-guest-access 2017-05-30 21:05:07 +01:00
Marcel
54b8afec38 Fix use of wrong char 2017-05-30 21:47:38 +02:00
Marcel
4d7ac1b828 Fix missing string in the room settings 2017-05-30 21:46:07 +02:00
Matthew Hodgson
48a2ad93da fix {integrationsUrl} thinko 2017-05-30 20:32:12 +01:00
Matthew Hodgson
93a35dc07a Merge branch 'develop' into t3chguy/piwik 2017-05-30 15:58:55 +01:00
Marcel
70e7d81093 More i18n strings (#963) 
* Add i18n for E2E import and Export Dialogs

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add various previous missing i18n strings

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Translate CreateRoomButton

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ChatInviteDialog and fix missing to.

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ConfitmRedactDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeactivateAccountDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SessionRestoreErrorDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SetDisplayNameDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownDeviceDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AddressTile translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyButtons translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add Dropdown translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UserSelector translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CaptchaForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CasLogin translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CustomServerDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add InteractiveAuthEntryComponents translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add LoginFooter translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add RegistrationForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ServerConfig translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MAudioBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MImageBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MVideoBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add TextualBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UrlPreviewSettings translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AuxPanel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add PresenceLabel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* fix syntax error

* weird space :P

* missing ','

* fix missing value

* fix json fail

* remove acidential added file

* fix another json fail
 2017-05-30 15:09:57 +01:00
turt2live
d9d25e26d2 Say "X removed the room name" instead of showing nothing 
Addresses vector-im/riot-web#4072

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-29 23:21:14 -06:00
Michael Telatynski
7e02977c27 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 22:32:45 +01:00
Michael Telatynski
42e20c38f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-29 15:23:05 +01:00
Michael Telatynski
f5d336103e add opt out / un opt out toggle 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 14:36:50 +01:00
Matthew Hodgson
229eef4624 fix missing translation 2017-05-29 13:29:27 +01:00
Matthew Hodgson
1efc5c2b25 speed up SetMxIdDialog user check to 250ms as it was driving me MAD 
i18nize new bottomleftmenu buttons
 2017-05-28 23:28:40 +01:00
Michael Telatynski
8d64bf27af fix weird mangled key vals (and dups) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:38:37 +01:00
Michael Telatynski
c8732582d3 remove most duplicate keys in en_EN 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:35:30 +01:00
Michael Telatynski
b55503e67f i18n the forwarding aux panel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:27:57 +01:00
Matthew Hodgson
3302fc690f fix all missing translations picked up by check-i18n.pl 2017-05-27 18:20:44 +01:00
Matthew Hodgson
c61ca42261 oops, fix quoting 2017-05-27 17:41:54 +01:00
Matthew Hodgson
f442a665c8 fix more i18n punctuation fails 2017-05-27 17:36:02 +01:00
Matthew Hodgson
730258bd3c fix punctuation on e2e warning 2017-05-27 17:30:32 +01:00
Matthew Hodgson
f0f5bc83f2 fix more weirdly inconsistent fullstops 2017-05-27 15:54:52 +01:00
Matthew Hodgson
6d6b14a26c fix spurious missing translation ('Default') 2017-05-27 15:52:24 +01:00
Matthew Hodgson
398ad4798e fix string typo 2017-05-27 15:02:20 +01:00
Matthew Hodgson
355f4974af standardise i18n TextForEvent to include punctuation. 
fixes lots of missing & inconsistent strings, as somehow some of the i18n files had ended up with the raw strings being inconsistent in terms of punctuation, causing problems as per https://github.com/vector-im/riot-web/issues/4045
 2017-05-27 15:02:20 +01:00
Matthew Hodgson
b8b6a87423 fixing missing EN translation 2017-05-27 13:58:20 +01:00
Matthew Hodgson
81704a5b5e s/username/User name/ 2017-05-27 00:13:16 +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
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
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
be4944a4b6 Hopefully get translations with '.'s sorted 
attempt 2
 2017-05-25 19:43:34 +01:00
David Baker
43d8ccf128 Hopefully sort out strings with appended '.'s 2017-05-25 19:21:18 +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
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
d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00