UML-3676 new content about IaP #2961
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2961 +/- ##
============================================
+ Coverage 91.25% 91.91% +0.65%
- Complexity 1504 1779 +275
============================================
Files 309 389 +80
Lines 6393 8233 +1840
============================================
+ Hits 5834 7567 +1733
- Misses 542 649 +107
Partials 17 17
|
nickdavis2001
commented
Dec 2, 2024
| </h1> | ||
| </div> | ||
|
|
||
| <div class="govuk-grid-column-two-thirds"> | ||
| {% if feature_enabled('instructions_and_preferences') %} |
There was a problem hiding this comment.
Note - removed logic that shows different text if feature is NOT enabled, as it is always enabled now.
This reverts commit 7e189f4.
cooperaj
reviewed
Dec 5, 2024
There was a problem hiding this comment.
Shouldn't need to commit this.
nickdavis2001
commented
Dec 5, 2024
| {% elseif lpa.applicationHasRestrictions %} | ||
| {% trans %}This LPA has instructions{% endtrans %} | ||
| {% trans %}This LPA has instructions (sometimes known as “restrictions and conditions”){% endtrans %} |
There was a problem hiding this comment.
Yes this is what Sarah wants, with reason, even if it looks slightly odd
cooperaj
previously approved these changes
Dec 5, 2024
Co-authored-by: Adam Cooper <[email protected]>
cooperaj
approved these changes
Dec 5, 2024
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.
Purpose
Swap instructions and preferences around to preferences and instructions in many places, add content about it also being called "restrictions and conditions"
4 tickets : UML-3676, UML-3678, UML-3688, UML-3420
Approach
A number of mods to twig files and translation files. Note a couple of places I have removed code behind a no longer needed feature flag.
Checklist