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

Fix #7161: Removes expression evaluation braces from i18n translation-values #7183

Merged
merged 1 commit into from
Jul 20, 2019

Conversation

DubeySandeep
Copy link
Member

Explanation

Fixes #7161, removes expression evaluation braces from i18n translation-values.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@DubeySandeep
Copy link
Member Author

@kevinlee12, @vojtechjelinek, @nithusha21, @aks681, Can you please review this PR as a code owner?

Copy link
Contributor

@nithusha21 nithusha21 left a comment

Choose a reason for hiding this comment

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

LGTM. I didn't manually test as I'm away from my laptop right now. Can one of the other codeowners please manually test this change and give an update?

@codecov
Copy link

codecov bot commented Jul 20, 2019

Codecov Report

Merging #7183 into develop will increase coverage by 33.95%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           develop    #7183       +/-   ##
============================================
+ Coverage    53.79%   87.75%   +33.95%     
============================================
  Files          564      945      +381     
  Lines        20000    83588    +63588     
  Branches      2349     2349               
============================================
+ Hits         10759    73352    +62593     
- Misses        8796     9791      +995     
  Partials       445      445
Impacted Files Coverage Δ
core/domain/recommendations_services_test.py 100% <0%> (ø)
core/domain/learner_progress_domain_test.py 100% <0%> (ø)
core/domain/dependency_registry_test.py 100% <0%> (ø)
core/domain/topic_jobs_one_off_test.py 100% <0%> (ø)
extensions/rich_text_components/components.py 100% <0%> (ø)
core/domain/visualization_registry.py 95.65% <0%> (ø)
core/domain/feedback_services_test.py 100% <0%> (ø)
core/controllers/features_test.py 100% <0%> (ø)
core/controllers/admin_test.py 100% <0%> (ø)
core/domain/email_services_test.py 100% <0%> (ø)
... and 371 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7e37bbb...859093e. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jul 20, 2019

Codecov Report

Merging #7183 into develop will increase coverage by 33.95%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           develop    #7183       +/-   ##
============================================
+ Coverage    53.79%   87.75%   +33.95%     
============================================
  Files          564      945      +381     
  Lines        20000    83588    +63588     
  Branches      2349     2349               
============================================
+ Hits         10759    73352    +62593     
- Misses        8796     9791      +995     
  Partials       445      445
Impacted Files Coverage Δ
core/domain/recommendations_services_test.py 100% <0%> (ø)
core/domain/learner_progress_domain_test.py 100% <0%> (ø)
core/domain/dependency_registry_test.py 100% <0%> (ø)
core/domain/topic_jobs_one_off_test.py 100% <0%> (ø)
extensions/rich_text_components/components.py 100% <0%> (ø)
core/domain/visualization_registry.py 95.65% <0%> (ø)
core/domain/feedback_services_test.py 100% <0%> (ø)
core/controllers/features_test.py 100% <0%> (ø)
core/controllers/admin_test.py 100% <0%> (ø)
core/domain/email_services_test.py 100% <0%> (ø)
... and 371 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7e37bbb...859093e. Read the comment docs.

Copy link
Contributor

@vojtechjelinek vojtechjelinek left a comment

Choose a reason for hiding this comment

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

LGTM!

@@ -483,7 +483,7 @@ <h2 translate="I18N_ABOUT_PAGE_CREDITS_TAB_HEADING"></h2>
<li>Zoe Madden-Wood</li>
</ul>
</div>
<p translate="I18N_ABOUT_PAGE_CREDITS_TAB_TEXT_BOTTOM" translate-values="{listOfNames: '<[$ctrl.listOfNames]>'}">
<p translate="I18N_ABOUT_PAGE_CREDITS_TAB_TEXT_BOTTOM" translate-values="{listOfNames: $ctrl.listOfNames}">
Copy link
Member Author

Choose a reason for hiding this comment

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

To test:

  • Go to /about
  • Click the "Credits" tab
  • Scroll down and check the end message.
    image

@@ -309,7 +309,7 @@ <h2 class="activity-title protractor-test-exp-summary-tile-title">
<span ng-if="$ctrl.subscribersList.length > 1"
style="margin-top: 14px; display: inline-block;"
translate="I18N_TOTAL_SUBSCRIBERS_TEXT"
translate-values="{totalSubscribers: <[$ctrl.subscribersList.length]>}">>
translate-values="{totalSubscribers: $ctrl.subscribersList.length}">>
Copy link
Member Author

Choose a reason for hiding this comment

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

To test:

  • Create 3 accounts.
  • Make 1st account have 2 subscribers
  • Go to Subscribers tab of the creator's dashboard page.
    image

@@ -25,7 +25,7 @@
ng-click="toggleShowPreviousResponses()">
<span class="conversation-skin-responses-dropdown-text">
<span translate="I18N_PLAYER_PREVIOUS_RESPONSES"
translate-values="{previousResponses: <[getDisplayedCard().getInputResponsePairs().length - (isInteractionInline() ? 1 : 0)]>}">
translate-values="{previousResponses: getDisplayedCard().getInputResponsePairs().length - (isInteractionInline() ? 1 : 0)}">
Copy link
Member Author

@DubeySandeep DubeySandeep Jul 20, 2019

Choose a reason for hiding this comment

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

To test:

  • Create an exploration with interaction.
  • Go to preview mode.
  • Add a few responses.
  • Check the "Previous response ()" message.
    image

Copy link
Member Author

@DubeySandeep DubeySandeep left a comment

Choose a reason for hiding this comment

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

I have added a few "steps to reproduce" for testing.

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.

Status of feedback thread not displayed on learner dashboard.
5 participants