Skip to content
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

Adjusting wording in "Friendly Date Ranges" bonfire #7978

Merged
merged 1 commit into from Apr 10, 2016
Merged

Adjusting wording in "Friendly Date Ranges" bonfire #7978

merged 1 commit into from Apr 10, 2016

Conversation

ghost
Copy link

@ghost ghost commented Apr 8, 2016

Adjust wording on lines 268-269 to clarify differences between test cases for "Friendly Date Ranges" bonfire in advanced-bonfires.json. This closes #7967.

"Do not display information that is redundant or that can be inferred by the user: if the date range ends in less than a year from when it begins, do not display the ending year. If the range ends in the same month that it begins, do not display the ending year or month.",
"Additionally, if the date range begins in the current year and ends within one year, the year should not be displayed at the beginning of the friendly range.",
"Do not display information that is redundant or that can be inferred by the user: if the date range ends in less than a year from when it begins, do not display the <em>ending year<em>. If the range ends in the same month that it begins, do not display the <em>ending year or month<em>.",
"Additionally, if the date range begins in the <em>current year<em> and ends within one year, the year should not be displayed at the <em>beginning<em> of the friendly range.",

This comment was marked as off-topic.

This comment was marked as off-topic.

@erictleung erictleung added status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. status: blocked Is waiting on followup from either the Opening Poster of the issue or PR, or a maintainer. labels Apr 8, 2016
@camperbot
Copy link
Contributor

@josectello updated the pull request.

@erictleung
Copy link
Member

Hmm I just realized my suggestion was a little inconsistent in what is emphasized. If you don't mind @josectello, could you change it to what is below? I tried bolding the changes but it might be a little hard to see. Also from #7967, there are a comment on changing the order of the sentence flow better. Can you more around the sentences to match the order as well? Let me know if you have any questions. Thanks!

Do not display information that is redundant or that can be inferred by the user. If the date range ends in <em>less than a year</em> from when it begins, do not display the <em>ending year</em>.

Additionally, if the date range begins in the <em>current year</em> and ends within one year, the year should not be displayed at the <em>beginning</em> of the friendly range.

If the range ends in the <em>same month</em> that it begins, do not display the <em>ending year or month</em>.

@camperbot
Copy link
Contributor

@josectello updated the pull request.

@ghost
Copy link
Author

ghost commented Apr 9, 2016

@erictleung No worries, thanks for the input. Let me know if anything else needs adjusting.

…tween test cases for "Friendly Date Ranges" challenge.
@erictleung
Copy link
Member

@josectello LGTM 👍

@erictleung erictleung merged commit 6012fca into freeCodeCamp:staging Apr 10, 2016
@BerkeleyTrue BerkeleyTrue removed status: blocked Is waiting on followup from either the Opening Poster of the issue or PR, or a maintainer. status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. labels Apr 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants