-
Notifications
You must be signed in to change notification settings - Fork 120
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
Convert estimate-self-assessment-penalties to use ERB templates for questions #2133
Merged
chrisroos
merged 6 commits into
master
from
convert-estimate-self-assessment-penalties-to-use-erb-templates-for-questions
Nov 19, 2015
Merged
Convert estimate-self-assessment-penalties to use ERB templates for questions #2133
chrisroos
merged 6 commits into
master
from
convert-estimate-self-assessment-penalties-to-use-erb-templates-for-questions
Nov 19, 2015
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
I think we might want to fix the ampersand escaping before merging this one. |
04be768
to
8f2a137
Compare
@chrisroos: I've addressed the ampersand-escaping issue using an interactive rebase in this new commit. I've also updated the regression test checksums and force-pushed. |
Looks good to me. |
I ran the following command: $ rails r script/convert-question-i18-yaml-to-erb-templates.rb lib/smart_answer_flows/estimate-self-assessment-penalties Writing template: which_year.govspeak.erb Writing template: how_submitted.govspeak.erb Writing template: when_submitted.govspeak.erb (WARNING: contains interpolation) Writing template: when_paid.govspeak.erb (WARNING: contains interpolation) Writing template: how_much_tax.govspeak.erb Deleting i18n YAML: estimate-self-assessment-penalties.yml Now insert `use_erb_templates_for_questions` at top of flow: estimate-self-assessment-penalties.rb
These were not dealt with automatically by the conversion script.
The change to ERB templates has introduced a few extra newlines in the question page HTML, but none of them affect the content viewable by the user. I verified that the changes were all only blank lines using the following command: $ git diff --ignore-blank-lines
Re-generating the checksums has removed the i18n YAML file and added the new question templates as I expected.
8f2a137
to
7fb68e1
Compare
I've rebased on master and force pushed in preparation for merging. |
chrisroos
added a commit
that referenced
this pull request
Nov 19, 2015
…nt-penalties-to-use-erb-templates-for-questions Convert estimate-self-assessment-penalties to use ERB templates for questions
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.