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

Learner dashboard 3.2 #3759

Merged
merged 71 commits into from
Aug 28, 2017
Merged

Learner dashboard 3.2 #3759

Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
f7af522
Init work.
arunabh98 Jul 26, 2017
2e6a78d
Learner dashboard milestone 3.1
arunabh98 Jul 26, 2017
58bf6b3
Fix lint errors.
arunabh98 Jul 26, 2017
ab3adf9
Add tests.
arunabh98 Jul 26, 2017
af9c34c
Partially address review comments.
arunabh98 Jul 29, 2017
bb5692c
Combine handlers.
arunabh98 Jul 30, 2017
d0526be
Add tests.
arunabh98 Jul 30, 2017
747d7ec
Remove the old handlers.
arunabh98 Jul 30, 2017
24b58a6
Fix function name.
arunabh98 Jul 30, 2017
20534ab
Address review comments 2.
arunabh98 Aug 2, 2017
98eba4c
Remove redundant code.
arunabh98 Aug 2, 2017
82819c2
Address another review comment.
arunabh98 Aug 2, 2017
d74947d
Fix nerge conflicts.
arunabh98 Aug 2, 2017
6a044ea
Add play later to option.
arunabh98 Aug 3, 2017
1861d4c
Add play later icon.
arunabh98 Aug 3, 2017
eeeeab2
Merge branch 'learner-dashboard-sixth-milestone' into learner-dashboa…
arunabh98 Aug 3, 2017
3aaade0
Add learner dashboard icons to library.
arunabh98 Aug 5, 2017
26dca72
Add remove modal.
arunabh98 Aug 12, 2017
6e37110
Add playlist to dashboard.
arunabh98 Aug 13, 2017
55d0131
Fix merge conflicts.
arunabh98 Aug 13, 2017
ac24e6d
Add backend feedback.
arunabh98 Aug 15, 2017
35506ca
Remove unncessary code.
arunabh98 Aug 15, 2017
e792b12
Fix rights manager.
arunabh98 Aug 15, 2017
8e02036
Merge remote-tracking branch 'upstream/develop' into learner-dashboar…
arunabh98 Aug 15, 2017
1f9287e
Add list.
arunabh98 Aug 15, 2017
08c77d4
Fix big in sortable list.
arunabh98 Aug 15, 2017
3a2669c
Further progress.
arunabh98 Aug 17, 2017
8baaeab
Fix part of e2e test.
arunabh98 Aug 17, 2017
84e1588
Fix lint errors.
arunabh98 Aug 17, 2017
0fa0688
Add new line.
arunabh98 Aug 17, 2017
004900e
Remove newline.
arunabh98 Aug 17, 2017
9b507b0
Remove unnecessary changes.
arunabh98 Aug 17, 2017
dc2f6f7
Add new line.
arunabh98 Aug 17, 2017
95be238
Fix rights manager.
arunabh98 Aug 17, 2017
fe3dc66
Streamline exploration tile.
arunabh98 Aug 17, 2017
4e77eb6
Add collections and search to playlist.
arunabh98 Aug 17, 2017
c16db90
Fix lint errors.
arunabh98 Aug 17, 2017
b51066c
Fix more lint errors.
arunabh98 Aug 17, 2017
577544a
Fix errors.
arunabh98 Aug 17, 2017
c50e398
Fix lint errors.
arunabh98 Aug 17, 2017
5a5c5e7
Address review comments.
arunabh98 Aug 19, 2017
e349e45
Address review comments.
arunabh98 Aug 20, 2017
dfce5d3
Same for collections.
arunabh98 Aug 20, 2017
c96d704
Address more review comments.
arunabh98 Aug 21, 2017
924268d
Address all review comments.
arunabh98 Aug 23, 2017
3f866f0
Fix lint errors.
arunabh98 Aug 23, 2017
0a2c049
Add e2e test for plurals.
arunabh98 Aug 24, 2017
881d846
Address review comments 2.
arunabh98 Aug 25, 2017
43ac635
Add hindi translations.
arunabh98 Aug 25, 2017
6fa3718
Partially address review comments.
arunabh98 Aug 25, 2017
7d96b5c
Address more review comments.
arunabh98 Aug 25, 2017
45a4cb3
Add domain object.
arunabh98 Aug 25, 2017
f5c8882
Add service.
arunabh98 Aug 25, 2017
4c63a1c
Fix lint errors.
arunabh98 Aug 25, 2017
2dd1286
Fix a bug.
arunabh98 Aug 25, 2017
ada0a9d
Fix lint errors.
arunabh98 Aug 25, 2017
aff0b0c
Add directive for icons.
arunabh98 Aug 26, 2017
aea81d2
Fix lint errors.
arunabh98 Aug 26, 2017
2667e96
Fix more lint errors.
arunabh98 Aug 26, 2017
883b938
Remove unnecessary code.
arunabh98 Aug 26, 2017
2f0fcfc
Remove unnecessary code 2.
arunabh98 Aug 26, 2017
43d193e
Address review comments 3.
arunabh98 Aug 26, 2017
5523dbe
Fix e2e tests.
arunabh98 Aug 27, 2017
a4b64b8
Remve unintended changes.
arunabh98 Aug 27, 2017
fec579a
Address review comments 4.
arunabh98 Aug 27, 2017
e0d7e7d
Fix lint errors.
arunabh98 Aug 27, 2017
c53fc5b
Fix more lint errors.
arunabh98 Aug 27, 2017
6897721
Merge remote-tracking branch 'upstream/develop' into learner-dashboar…
arunabh98 Aug 27, 2017
921c586
Changed another translation file to account for the new keys.
arunabh98 Aug 27, 2017
1299523
Address review comments 4
arunabh98 Aug 27, 2017
ae86749
Address review comments 5.
arunabh98 Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,10 @@
"I18N_LANGUAGE_FOOTER_VIEW_IN": "Oppia ansehen auf:",
"I18N_LEARNER_DASHBOARD_COMPLETED_SECTION": "Vervollständigt",
"I18N_LEARNER_DASHBOARD_COMPLETED_TO_INCOMPLETE_COLLECTIONS": "<[numberMoved]> der vervollständigten Sammlungen wurden in den Abschnitt „In Bearbeitung“ verschoben, da neue Erforschungen zu ihnen hinzugefügt wurden!",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTION": "<[numberDeleted]> der vervollständigten Sammlungen wurde kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTIONS": "<[numberDeleted]> der vervollständigten Sammlungen wurden kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATION": "<[numberDeleted]> der vervollständigten Erforschungen wurde kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATIONS": "<[numberDeleted]> der vervollständigten Erforschungen wurden kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTION": "<[numberDeleted]> der in Bearbeitung befindlichen Sammlungen wurde kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTIONS": "<[numberDeleted]> der in Bearbeitung befindlichen Sammlungen wurden kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATION": "<[numberDeleted]> der in Bearbeitung befindlichen Erforschungen wurde kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATIONS": "<[numberDeleted]> der in Bearbeitung befindlichen Erforschungen wurden kürzlich gelöscht. Das tut uns leid.",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTIONS": "{numberDeleted, plural, one{1 der vervollständigten Sammlungen wurde kürzlich gelöscht. Das tut uns leid.} other{# der vervollständigten Sammlungen wurden kürzlich gelöscht. Das tut uns leid.}}",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATIONS": "{numberDeleted, plural, one{1 der vervollständigten Erforschungen wurde kürzlich gelöscht. Das tut uns leid.} other{# der vervollständigten Erforschungen wurden kürzlich gelöscht. Das tut uns leid.}}",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTIONS": "{numberDeleted, plural, one{1 der in Bearbeitung befindlichen Sammlungen wurde kürzlich gelöscht. Das tut uns leid.} other{# der in Bearbeitung befindlichen Sammlungen wurden kürzlich gelöscht. Das tut uns leid.}}",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATIONS": "{numberDeleted, plural, one{1 der in Bearbeitung befindlichen Erforschungen wurde kürzlich gelöscht. Das tut uns leid.} other{# der in Bearbeitung befindlichen Erforschungen wurden kürzlich gelöscht. Das tut uns leid.}}",
"I18N_LEARNER_DASHBOARD_EMPTY_COMPLETED_COLLECTIONS": "Es sieht so aus, als ob du noch keine Sammlungen vervollständigt hast. Schau in der Bibliothek nach, um eine neue aufregende Sammlung zu starten!",
"I18N_LEARNER_DASHBOARD_EMPTY_COMPLETED_EXPLORATIONS": "Es sieht so aus, als ob du noch keine Erforschungen vervollständigt hast. Schau in der Bibliothek nach, um eine neue aufregende Erforschung zu starten!",
"I18N_LEARNER_DASHBOARD_EMPTY_FEEDBACK_THREADS": "Es sieht so aus, als ob du keine aktiven Rückmeldungs-Threads hast. Deine Rückmeldung hilft uns bei der Verbesserung der Qualität unserer Lektionen. Fahre mit der Maus über die Bibliothek, um etwas Aufregendes zu lernen und deine geschätzte Rückmeldung zu hinterlassen!",
Expand Down
22 changes: 14 additions & 8 deletions assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,16 @@
"I18N_LANGUAGE_FOOTER_VIEW_IN": "View Oppia in:",
"I18N_LEARNER_DASHBOARD_COMPLETED_SECTION": "Completed",
"I18N_LEARNER_DASHBOARD_COMPLETED_TO_INCOMPLETE_COLLECTIONS": "<[numberMoved]> of the collections you completed have been moved to the 'in progress' section as new explorations have been added to them!",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTION": "<[numberDeleted]> of the collections which you completed has been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTIONS": "<[numberDeleted]> of the collections which you completed have been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATION": "<[numberDeleted]> of the explorations which you completed has been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATIONS": "<[numberDeleted]> of the explorations which you completed have been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTION": "<[numberDeleted]> of the collections in progress has been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTIONS": "<[numberDeleted]> of the collections in progress have been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATION": "<[numberDeleted]> of the explorations in progress has been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATIONS": "<[numberDeleted]> of the explorations in progress have been recently deleted. We are sorry for the inconvenience",
"I18N_LEARNER_DASHBOARD_DELETED_COLLECTIONS_FROM_PLAYLIST": "{numberDeleted, plural, one{1 of the collections in your 'Play Later' list has been deleted by the owner. We are sorry for the inconvenience} other{# of the collections in your 'Play Later' list have been deleted by the owner. We are sorry for the inconvenience}}",
Copy link
Member

Choose a reason for hiding this comment

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

Please consider doing these in hi.json, too, to make sure they're functioning correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTIONS": "{numberDeleted, plural, one{1 of the collections which you completed has been deleted by the owner. We are sorry for the inconvenience} other{# of the collections which you completed have been deleted by the owner. We are sorry for the inconvenience}}",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATIONS": "{numberDeleted, plural, one{1 of the explorations which you completed has been deleted by the owner. We are sorry for the inconvenience} other{# of the explorations which you completed have been deleted by the owner. We are sorry for the inconvenience}}",
"I18N_LEARNER_DASHBOARD_DELETED_EXPLORATIONS_FROM_PLAYLIST": "{numberDeleted, plural, one{1 of the explorations in your 'Play Later' list has been deleted by the owner. We are sorry for the inconvenience} other{# of the explorations in your 'Play Later' list have been deleted by the owner. We are sorry for the inconvenience}}",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTIONS": "{numberDeleted, plural, one{1 of the collections in progress has been deleted by the owner. We are sorry for the inconvenience} other{# of the collections in progress have been deleted by the owner. We are sorry for the inconvenience}}",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATIONS": "{numberDeleted, plural, one{1 of the explorations in progress has been deleted by the owner. We are sorry for the inconvenience} other{# of the explorations in progress have been deleted by the owner. We are sorry for the inconvenience}}",
"I18N_LEARNER_DASHBOARD_EMPTY_COLLECTION_PLAYLIST": "It looks like there aren't any collections in your 'Play Later' list. Head over to the library and build your own curated playlist!",
"I18N_LEARNER_DASHBOARD_EMPTY_COMPLETED_COLLECTIONS": "It looks like you haven't completed any collections yet. Head over to the library to start an exciting new collection!",
"I18N_LEARNER_DASHBOARD_EMPTY_COMPLETED_EXPLORATIONS": "It looks like you haven't completed any explorations yet. Head over to the library to start an exciting new exploration!",
"I18N_LEARNER_DASHBOARD_EMPTY_EXPLORATION_PLAYLIST": "It looks like there aren't any explorations in your 'Play Later' list. Head over to the library and build your own curated playlist!",
"I18N_LEARNER_DASHBOARD_EMPTY_FEEDBACK_THREADS": "It looks like you don't have any active feedback threads. Your feedback helps us improve the quality of our lessons. Head over to the library to learn something exciting and submit your valuable feedback!",
"I18N_LEARNER_DASHBOARD_EMPTY_INCOMPLETE_COLLECTIONS": "It looks like you haven't started any collections yet. Head over to the library to start an exciting new collection!",
"I18N_LEARNER_DASHBOARD_EMPTY_INCOMPLETE_EXPLORATIONS": "It looks like you haven't started any explorations yet. Head over to the library to start an exciting new exploration!",
Expand All @@ -224,6 +224,8 @@
"I18N_LEARNER_DASHBOARD_INCOMPLETE_SECTION": "In Progress",
"I18N_LEARNER_DASHBOARD_INTRO_MESSAGE_PART_ONE": "It looks like you haven't tried any of our explorations yet.",
"I18N_LEARNER_DASHBOARD_INTRO_MESSAGE_PART_TWO": "Let's get started on this exciting journey!",
"I18N_LEARNER_DASHBOARD_PLAYLIST_SECTION": "Play Later",
"I18N_LEARNER_DASHBOARD_REARRANGE_LEARNER_PLAYLIST_MESSAGE": "Drag and rearrange the activities in the order in which you want to play them!",
"I18N_LEARNER_DASHBOARD_REMOVE_ACTIVITY_MODAL_BODY": "Are you sure you want to remove '<[entityTitle]>' from your '<[sectionNameI18nId | translate]>' list?",
"I18N_LEARNER_DASHBOARD_REMOVE_ACTIVITY_MODAL_HEADER": "Remove from '<[sectionNameI18nId | translate]>' list?",
"I18N_LEARNER_DASHBOARD_REMOVE_BUTTON": "Remove",
Expand All @@ -237,6 +239,9 @@
"I18N_LEARNER_DASHBOARD_SUGGESTION_SUGGESTED_STATE_CONTENT_HEADER": "Suggested:",
"I18N_LEARNER_DASHBOARD_SUGGESTION_TEXT": "Suggestion",
"I18N_LEARNER_DASHBOARD_VIEW_SUGGESTION": "View Suggestion",
"I18N_LIBRARY_ACTIVITY_COMPLETED_ICON": "You have completed this",
"I18N_LIBRARY_ACTIVITY_IN_LEARNER_PLAYLIST": "Already added to playlist",
"I18N_LIBRARY_ADD_TO_LEARNER_PLAYLIST": "Add to playlist",
"I18N_LIBRARY_ALL_CATEGORIES": "All Categories",
"I18N_LIBRARY_ALL_CATEGORIES_SELECTED": "All categories selected",
"I18N_LIBRARY_ALL_LANGUAGES": "All Languages",
Expand Down Expand Up @@ -287,6 +292,7 @@
"I18N_LIBRARY_GROUPS_SCIENCE" : "Science",
"I18N_LIBRARY_GROUPS_SOCIAL_SCIENCE": "Social Science",
"I18N_LIBRARY_GROUPS_TOP_RATED_EXPLORATIONS": "Top-Rated Explorations",
"I18N_LIBRARY_INCOMPLETE_ACTIVITY_ICON": "You're partway through this activity.",
"I18N_LIBRARY_LAST_UPDATED": "Last updated",
"I18N_LIBRARY_LOADING": "Loading",
"I18N_LIBRARY_MAIN_HEADER": "Imagine what you could learn today...",
Expand Down
12 changes: 4 additions & 8 deletions assets/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,10 @@
"I18N_LANGUAGE_FOOTER_VIEW_IN": "Afficher Oppia en :",
"I18N_LEARNER_DASHBOARD_COMPLETED_SECTION": "Terminé",
"I18N_LEARNER_DASHBOARD_COMPLETED_TO_INCOMPLETE_COLLECTIONS": "<[numberMoved]> des collections que vous avez terminées ont été déplacées vers la section 'en cours' parce que de nouvelles explorations leur ont été ajoutées !",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTION": "Suppression récente de <[numberDeleted]> des collections que vous avez terminées. Veuillez nous excuser pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTIONS": "Suppression récente de <[numberDeleted]> des collections que vous avez terminées. Veuillez nous excuser pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATION": "Suppression récente de <[numberDeleted]> des explorations que vous avez terminées. Veuillez nous excuser pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATIONS": "Suppression récente de <[numberDeleted]> des explorations que vous avez terminées. Veuillez nous excuser pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTION": "Suppression récente de <[numberDeleted]> des collections en cours. Veuillez nous excuser du dérangement",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTIONS": "Suppression récente de <[numberDeleted]> des collections en cours. Veuillez nous excuser pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATION": "Suppression récente de <[numberDeleted]> des explorations en cours. Veuillez nous excuser du pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATIONS": "Suppression récente de <[numberDeleted]> des explorations en cours. Veuillez nous excuser du pour le désagrément",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_COLLECTIONS": "{numberDeleted, plural, one{Suppression récente de 1 des collections que vous avez terminées. Veuillez nous excuser pour le désagrément} other{Suppression récente de # des collections que vous avez terminées. Veuillez nous excuser pour le désagrément}}",
"I18N_LEARNER_DASHBOARD_DELETED_COMPLETED_EXPLORATIONS": "{numberDeleted, plural, one{Suppression récente de 1 des explorations que vous avez terminées. Veuillez nous excuser pour le désagrément} other{Suppression récente de # des explorations que vous avez terminées. Veuillez nous excuser pour le désagrément}}",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_COLLECTIONS": "{numberDeleted, plural, one{Suppression récente de 1 des collections en cours. Veuillez nous excuser du dérangement} other{Suppression récente de # des collections en cours. Veuillez nous excuser pour le désagrément}}",
"I18N_LEARNER_DASHBOARD_DELETED_INCOMPLETE_EXPLORATIONS": "{numberDeleted, plural, one{Suppression récente de 1 des explorations en cours. Veuillez nous excuser du pour le désagrément} other{Suppression récente de # des explorations en cours. Veuillez nous excuser du pour le désagrément}}",
"I18N_LEARNER_DASHBOARD_EMPTY_COMPLETED_COLLECTIONS": "Il semble que vous n'ayez pas encore terminé de collection. Allez voir à la bibliothèque pour commencer une nouvelle collection excitante !",
"I18N_LEARNER_DASHBOARD_EMPTY_COMPLETED_EXPLORATIONS": "Il semble que vous n'ayez pas encore terminé d'exploration. Allez voir à la bibliothèque pour commencer une nouvelle exploration excitante !",
"I18N_LEARNER_DASHBOARD_EMPTY_FEEDBACK_THREADS": "Il semblerait que vous n’avez pas de fil de commentaire actif. Votre avis nous aide à améliorer la qualité de nos leçons. Parcourez la bibliothèque pour apprendre quelque chose d’intéressant et envoyez votre avis précieux !",
Expand Down
Loading