Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load config.json before loading language so default can apply #10551

Merged
merged 1 commit into from Aug 14, 2019

Conversation

@t3chguy
Copy link
Collaborator

t3chguy commented Aug 14, 2019

Fixes #10548

Signed-off-by: Michael Telatynski 7t3chguy@gmail.com

@t3chguy t3chguy requested a review from vector-im/riot-web Aug 14, 2019
@dbkr
dbkr approved these changes Aug 14, 2019
Copy link
Member

dbkr left a comment

I think this looks reasonable - trying to think of anything we do that involves displaying i18ned strings before this point, but I don't think there would be.

@dbkr dbkr merged commit 3b908f4 into develop Aug 14, 2019
5 checks passed
5 checks passed
buildkite/riot-web Build #771 passed (3 minutes, 54 seconds)
Details
buildkite/riot-web/eslint-lint Passed (58 seconds)
Details
buildkite/riot-web/i18n Passed (1 minute, 40 seconds)
Details
buildkite/riot-web/karma-tests Passed (2 minutes, 29 seconds)
Details
buildkite/riot-web/pipeline Passed (9 seconds)
Details
@t3chguy

This comment has been minimized.

Copy link
Collaborator Author

t3chguy commented Aug 14, 2019

Err, I left my debug lines in there. Whooops

@turt2live

This comment has been minimized.

Copy link
Member

turt2live commented Aug 14, 2019

fixed in 9ed647d

Thanks for noticing @t3chguy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.