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.

Sign up for GitHub

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

Jump to bottom

#157731616 Make translations of exercises and ingredients easier #26

Merged
merged 1 commit into from
Jun 28, 2018
Merged

#157731616 Make translations of exercises and ingredients easier #26

merged 1 commit into from
Jun 28, 2018

Conversation

hariclerry
Copy link

@hariclerry hariclerry commented Jun 22, 2018 •
edited
Loading

What does this PR do?

This PR Makes translations of exercises and ingredients easier

Description of Task to be completed?

The user should be able to select which languages to show. They should not be shown only their current language.

How should this be manually tested?

  1. Follow the setup instructions in README.rst
  2. Log in as an admin(Use default Username: admin, Password: admin)
  3. From the dashboard, click on the exercise tab, select exercise overview link from the drop-down menu.
  4. From the overview page, you show be able to see a select language option button, choose the language to view the list of exercises added for that particular language.
  5. Repeat the above steps for ingredients but using the ingredients overview link under the nutrition tab.

Screen Shots

Exercise overview Page

exercises

Ingredient overview Page

nutrition

Any background context you want to provide?

This feature was not available.

What are the relevant pivotal tracker stories?

#157731616

@hariclerry
Copy link
Author

Hey guys, can you please review my PR and let me know what you think. Am still fixing a few issues though.

@hariclerry hariclerry changed the title feat(make-translation-easier) Make translations of exercises and ingr… #157731616 Make translations of exercises and ingredients easier Jun 22, 2018
@peterwade153
Copy link

Clean work

@coveralls
Copy link

Pull Request Test Coverage Report for Build 398

  • 11 of 19 (57.89%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.05%) to 92.975%
Changes Missing Coverage Covered Lines Changed/Added Lines %
wger/exercises/views/exercises.py 5 9 55.56%
wger/nutrition/views/ingredient.py 6 10 60.0%
Totals Coverage Status
Change from base Build 355: -0.05%
Covered Lines: 12467
Relevant Lines: 13409
💛 - Coveralls

@coveralls
Copy link

coveralls commented Jun 22, 2018 •
edited
Loading

Pull Request Test Coverage Report for Build 472

  • 21 of 31 (67.74%) changed or added relevant lines in 3 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.05%) to 91.464%
Changes Missing Coverage Covered Lines Changed/Added Lines %
wger/exercises/views/exercises.py 7 12 58.33%
wger/nutrition/views/ingredient.py 8 13 61.54%
Totals Coverage Status
Change from base Build 444: -0.05%
Covered Lines: 12623
Relevant Lines: 13801
💛 - Coveralls

@tibetegya tibetegya temporarily deployed to wg-rogue-one-pr-26 June 22, 2018 07:37 Inactive
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from df17817 to 028d6e5 Compare June 23, 2018 20:40
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 23, 2018 20:41 Inactive
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from 028d6e5 to 2be2c48 Compare June 23, 2018 21:31
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 23, 2018 21:32 Inactive
@hariclerry hariclerry added the ready Used for PRs that your feel are completed and ready to be merged. label Jun 24, 2018
peterwade153
peterwade153 reviewed Jun 25, 2018
View reviewed changes
wger/exercises/tests/test_exercise.py Outdated
@@ -552,4 +552,4 @@ def test_exercise_read_only(self):
client = APIClient()
response = client.post('/api/v2/exercises/', data=data)
# Test for method not allowed
self.assertEqual(response.status_code, 405)
self.assertEqual(response.status_code, 405)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add new line

@hariclerry hariclerry added the invalid This doesn't seem right label Jun 25, 2018
@emugaya emugaya removed invalid This doesn't seem right ready Used for PRs that your feel are completed and ready to be merged. labels Jun 25, 2018
@tibetegya
Copy link
Contributor

I think the task is incomplete please use ready for complete tasks only

@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from 2be2c48 to 052592a Compare June 26, 2018 11:51
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 26, 2018 11:51 Inactive
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from 052592a to d7bbfe9 Compare June 26, 2018 13:00
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 26, 2018 13:00 Inactive
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from d7bbfe9 to 77e2875 Compare June 26, 2018 13:03
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 26, 2018 13:03 Inactive
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from 77e2875 to 13a4c37 Compare June 26, 2018 13:14
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 26, 2018 13:14 Inactive
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from 13a4c37 to f228813 Compare June 26, 2018 14:38
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 26, 2018 14:38 Inactive
@hariclerry hariclerry added the ready Used for PRs that your feel are completed and ready to be merged. label Jun 26, 2018
King-Benx
King-Benx suggested changes Jun 27, 2018
View reviewed changes
Copy link

@King-Benx King-Benx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Harriet, please maintain the pep8 standards by running autopep8 against your work

@hariclerry
Copy link
Author

@King-Benx, I did.

@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from f228813 to 9c7a5a1 Compare June 27, 2018 07:17
@hariclerry hariclerry temporarily deployed to wg-rogue-one-pr-26 June 27, 2018 07:17 Inactive
@hariclerry
feat(make-translation-easier) Make translations of exercises and ingr…
d9845be 
…edients easier

This commit makes translations of exercises and ingredients easier

Before, the lists of exercises and ingredients are displayed
according to the user preferred language, so this commit adds
options for a user to filter lists of exercises and ingredients
according to the various language they are created in.

[Delivers #157731616]
@hariclerry hariclerry force-pushed the ft-translate-exercises-and-ingredients-157731616 branch from 9c7a5a1 to d9845be Compare June 28, 2018 06:58
@emugaya emugaya merged commit eb0d897 into develop Jun 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterwade153 peterwade153 peterwade153 left review comments

@King-Benx King-Benx King-Benx requested changes

@emugaya emugaya Awaiting requested review from emugaya

@tibetegya tibetegya Awaiting requested review from tibetegya

@dondrzzy dondrzzy Awaiting requested review from dondrzzy

Assignees
No one assigned
Labels
ready Used for PRs that your feel are completed and ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@hariclerry @peterwade153 @coveralls @tibetegya @King-Benx @emugaya