Fix GraphPresenter to work with both i18n & ERB #2139
Merged
+72
−10
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
|
Looks good to me. |
In #2103 I forgot that we still need to support flows/questions with their content in i18n YAML files vs ERB templates. In this commit I've renamed the `GraphPresenterTest` to `GraphPresenterWithErbRendererTest` and reinstated the earlier version of `GraphPresenterTest` to give suitable test coverage. I've also reinstated the i18n YAML file and used an explicit call to `Flow#use_erb_templates_for_questions` in `GraphPresenterWithErbRendererTest` to switch over to ERB rendering. I've avoided needing to handle `I18n::MissingInterpolationArgument` by passing in an empty `Hash` as the `state` when instantiating the `QuestionPresenter`.
floehopper
force-pushed
the
fix-graph-presenter
branch
from
cc76326 to
5a0f8a2
Compare
|
I've rebased this against master and force-pushed in preparation for merging. |
floehopper
added a commit
that referenced
this pull request
Nov 19, 2015
Fix GraphPresenter to work with both i18n & ERB
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.
In #2103 I forgot that we still need to support flows/questions with their
content in i18n YAML files vs ERB templates.
In this commit I've renamed the
GraphPresenterTesttoGraphPresenterWithErbRendererTestand reinstated the earlierversion of
GraphPresenterTestto give suitable test coverage.I've also reinstated the i18n YAML file and used an explicit call to
Flow#use_erb_templates_for_questionsinGraphPresenterWithErbRendererTesttoswitch over to ERB rendering.
I've avoided needing to handle
I18n::MissingInterpolationArgumentby passingin an empty
Hashas thestatewhen instantiating theQuestionPresenter.