Adjust submit labels to use built-in i18n handling #2257
Merged
Conversation
This file contains hidden or 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
Also use a diary comment object as the basis for the form
Normally when an en-GB.yml translation is missing, rails falls back to en.yml. But when
using the submit helpers, if the en-GB translation is missing, rails knows how to create
a fallback like 'Create {model_name}' without touching the en.yml file. This string might
then be different from what the test expects, e.g. 'Add Comment'.
So it's important to set the language headers, to avoid phantomjs from picking up your desktop
preferences in this specific case.
tomhughes
reviewed
Jun 12, 2019
| # We don't want this to happen during the tests! | ||
| setup do | ||
| page.driver.add_headers("Accept-Language" => "en") | ||
| end |
Member
There was a problem hiding this comment.
As much as we may want this I think it at least needs to be in a separate commit... I assume it got added accidentally with something else?
Collaborator
Author
There was a problem hiding this comment.
It was deliberately in this commit, since the change to the issue comments submit button exposed the problem with the language handling in the system tests. So I thought it was useful to put them both in the same commit to fully illustrate why I was doing it and what sort of test it affects - but I can break it into two commits if you prefer.
Member
There was a problem hiding this comment.
Ah ok. I hadn't actually even worked out which commit it came from, I was just surprised to see it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I noticed this while working on the diary entries, so now I'm rolling it out more widely. In many cases we've been avoiding using the built-in translation keys for submit buttons, and hard-coding translations based on the file the form is in (rather than based on the model for the form). This has made some form refactoring harder than it needs to be, as well as just being a bit of a waste of time. Sometimes this has been done just because of copying other places where it was done first.
There's ample opportunity to improve these labels in the future - too many saves and not enough updates in my opinion! But I'll leave the strings mostly unchanged for now.
@Nikerabbit this PR contains a few translation key renames:
diary_entries.show.save_button->helpers.submit.diary_comment.createmessages.new.send_button->helpers.submit.message.createoauth_clients.new.submit->helpers.submit.client_application.createoauth_clients.edit.submit->helpers.submit.client_application.updateredactions.new.submit->helpers.submit.redaction.createredactions.edit.submit->helpers.submit.redaction.updatetraces.new.upload_button->helpers.submit.trace.createtraces.edit.save_button->helpers.submit.trace.updateuser_blocks.new.submit->helpers.submit.user_block.createuser_blocks.edit.submit->helpers.submit.user_block.update