Fix problem with reload not working correctly when auto is set for language #68
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
hidakatsuya
reviewed
Sep 12, 2024
Comment on lines
15
to
23
| return if custom_message_setting.latest_messages_applied?(current_user_language) | ||
| # NOTE: ApplicationController#set_localization sets the appropriate language in I18n.locale | ||
| return if custom_message_setting.latest_messages_applied?(I18n.locale) | ||
|
|
||
| MessageCustomize::Locale.reload!([current_user_language]) | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def current_user_language | ||
| User.current.language.presence || Setting.default_language |
There was a problem hiding this comment.
This method is still being used in the following locations.
As a result, when no message customization settings are registered, visiting the message customization settings screen (/custom_message_settings/edit) causes the following error:
NameError (undefined local variable or method `current_user_language' for an instance of CustomMessageSettingsController):
plugins/redmine_message_customize/app/controllers/custom_message_settings_controller.rb:57:in `set_lang'
How about fixing it like this?
diff --git a/lib/message_customize/application_controller_patch.rb b/lib/message_customize/application_controller_patch.rb
index 10b8abe..666210d 100644
--- a/lib/message_customize/application_controller_patch.rb
+++ b/lib/message_customize/application_controller_patch.rb
@@ -20,7 +20,7 @@ module MessageCustomize
private
def current_user_language
- User.current.language.presence || Setting.default_language
+ I18n.locale
end
end
endThere was a problem hiding this comment.
@hidakatsuya
Thanks for the feedback.
How about fixing it like this?
...
You're right, that makes sense. I'll go with current_user_language as it's clearer and easier to maintain.
f8d6844 fixes this problem.
hidakatsuya
approved these changes
Sep 17, 2024
| @@ -26,8 +26,28 @@ def test_reload_if_messages_are_not_latest | |||
| assert_equal custom_message_setting.updated_on.to_i.to_s, I18n.backend.send(:translations)[:en][:redmine_message_customize_timestamp] | |||
| end | |||
|
|
|||
| def test_reload_if_user_language_is_auto_and_browser_language_messages_are_not_latest | |||
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.
Issue:
There is a problem where, if a user's language setting is set to auto and the browser's language differs from the default language, the customized settings are not loaded correctly.
Reproduction steps:
Fix:
Use
I18n.localeinstead ofUser.current.language.presence || Setting.default_language.I18n.localehas terms set with appropriate priority by ApplicationController#set_localication and others. https://github.com/redmica/redmica/blob/master/app/controllers/application_controller.rb#L247-L261