98e99d542b
i18n things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:49:28 +01:00
0f4dc5c072
first iter of manual update control
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:49:28 +01:00
375b435dfe
hide analytics settings if no piwik url
2017-06-02 13:34:01 +01:00
adfeff34ae
Merge pull request #1004 from matrix-org/t3chguy/hide_redactions
...
allow hiding redactions, restoring old behaviour
2017-06-02 12:27:52 +01:00
f54c182eb1
Add remaining strings for vector-im/riot-web#4151
2017-06-02 10:47:08 +01:00
d2d0ba952a
allow hiding redactions. no point onAccountData as it'd cause a full
...
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:23:07 +01:00
b1973d7998
undefined =/= ''
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:42:19 +01:00
f4db83a031
try empty string as falsey key
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:31:43 +01:00
6b4daf02a9
i18 missed things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:27:20 +01:00
0bafd6458a
Revert voodoo
2017-06-02 00:26:31 +01:00
46a9326607
special case default - CallMediaHandler can figure it out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:20:34 +01:00
3eb519b227
this is just endless
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:54:17 +01:00
beedeec163
copy the arrays so we're not making a mess
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:50:14 +01:00
0f2c89d525
lets actually make things work, eh?
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:39:54 +01:00
4e36c10c38
only unshift default if there is no deviceId===default
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:33:36 +01:00
dd4480f8c3
change device data structure to array of objects
...
so that we can set falsey values, for unsetting device
most dolphinately needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:26:43 +01:00
aa90d6b097
fix **AMAZING** C&P derp
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:00:25 +01:00
dbba1dedb6
i18nize all the things and change show logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:58:17 +01:00
04b86e5d1d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings
...
and i18nize webrtc stufffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/UserSettings.js
2017-06-01 22:56:31 +01:00
ee965a89a7
Merge pull request #986 from uhoreg/compact
...
enable useCompactLayout user setting an add a class when it's enabled
2017-06-01 21:32:54 +01:00
ced68f2719
Find a way to translate the name of RTE in user settings
...
I never said it was a *nice* way...
2017-06-01 15:53:08 +01:00
92d1a9a6ff
enable useCompactLayout user setting an add a class when it's enabled
...
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-05-31 22:00:30 -04:00
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
0d930c0553
change wording and i18n it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:46:51 +01:00
93a35dc07a
Merge branch 'develop' into t3chguy/piwik
2017-05-30 15:58:55 +01:00
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
7e02977c27
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:32:45 +01:00
a2229ced11
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
2017-05-29 21:56:45 +01:00
9b8dcaf274
make analytics setting use new thing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:11:37 +01:00
97d0c41d30
fix ugly special casing in generic settings renderer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:08:11 +01:00
f5d336103e
add opt out / un opt out toggle
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:36:50 +01:00
8935e9706e
Change variable name as mentioned by t3chguy
2017-05-27 21:21:23 +02:00
a30110b5d3
Fix vector-im/riot-web#4042
2017-05-27 21:11:00 +02:00
3703306a9e
oops
2017-05-27 18:35:18 +01:00
3302fc690f
fix all missing translations picked up by check-i18n.pl
2017-05-27 18:20:44 +01:00
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +01:00
ab92cc2254
Question marks do not internationalise
2017-05-25 19:55:54 +01:00
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
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
9112fc231a
More translation string fixups
2017-05-25 17:35:18 +01:00
3a379d09de
Update translations
...
Actually translate the language dropdown label & add the string.
Remove some unused ones.
2017-05-25 16:52:15 +01:00
5c359e63ab
Bulk change counterpart imports
...
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
8158ec6d54
touchups
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:25:17 +01:00
09d0ab7df5
attempt to make media selector work everywhere (TM)
...
loadDevices not only in electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 01:01:40 +01:00
a4b2bacc7e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings
2017-05-25 00:26:38 +01:00
b9ac1222ed
remove listener on unmount
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:55:37 +01:00
Michael Telatynski