first basic i18n support for webpage #70
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…asic i18n for now implements MessageSource to do so
breed
requested changes
Jul 12, 2023
breed
reviewed
Jul 14, 2023
| @@ -156,12 +161,20 @@ private CredentialAccount convertAccount2CredentialAccount(Account a) { | |||
|
|
|||
| @GetMapping("/oauth/authorize") | |||
| String getOauthAuthorize(@RequestParam String client_id, @RequestParam String redirect_uri, | |||
| @RequestParam(required = false, defaultValue = "") String error) throws IOException { | |||
| @RequestParam(required = false, defaultValue = "") String error, @RequestHeader("Accept" + | |||
| "-Language") String acceptLanguage) throws IOException { | |||
| try (var is = AppController.class.getResourceAsStream("/static/oauth/authorize.html")) { | |||
| var authorizePage = new String(is.readAllBytes()); | |||
There was a problem hiding this comment.
we should be using thyme here instead of getResourceAsStream
| Locale userLocale = Locale.forLanguageTag(acceptLanguage); | ||
| authorizePage = authorizePage.replace("authorize_error", | ||
| messageSource.getMessage("authorizeError", null, userLocale)); | ||
| authorizePage = authorizePage.replace("Email", messageSource.getMessage("email", null, userLocale)); |
There was a problem hiding this comment.
doing the replace() for authorize_error is sketchy but unlikely to collide with normal text. Email may appear in multiple places. that is why we need to use a thyme template
breed
approved these changes
Jul 20, 2023
…e behind the scenes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.