Skip to content

re-re updates on Teach page #948

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

Merged
merged 223 commits into from
Mar 4, 2021
Merged

re-re updates on Teach page #948

merged 223 commits into from
Mar 4, 2021

Conversation

yinhwa
Copy link
Contributor

@yinhwa yinhwa commented Mar 4, 2021

Changes:

  1. merged teach branch - up to date with the current main branch
  2. added teaching resources submitted on src > templates > pages > teach.hbs & korean translation in ko.yml when applicable
  3. according addition of lines on i18n-tracking.yml and src > data > en.yml, es.yml, zh-Hans.yml, ko.yml files,
  4. changes in the "teach" section of main.css for a better readability of teaching resources list

@limzykenneth @montoyamoraga thank you again for your time and responses, and hope it works better this way! 😁😁

yukienomiya and others added 30 commits August 7, 2020 10:53
Grunt task that clone the p5.js repo, generate the data.json, move it in the p5.js-website repo, and finally generate the en.json.
Workflows that updates both the data.json file and the en.json everytime a new p5.js release gets published.
Grunt task that clone the p5.js repo, generate the data.json, move it in the p5.js-website repo, and finally generate the en.json.
Workflows that updates both the data.json file and the en.json everytime a new p5.js release gets published.
Add missing keys from the English file to the translation files.
Add empty paragraphs to already translated description elements. This is necessary so that the translated file's structure perfectly matches the one from the English version: even though the already translated description elements are all stored in a single paragraph, the overall number of paragraph will be the same across translations.
fixParagraphStructure added empty paragraphs to already translated description elements, in order to have the same number of paragraphs both in the English version and in the translated ones.
Fix class structure
Add classes translated in Spanish by @montoyamoraga

Co-Authored-By: aarón montoya-moraga <montoyamoraga@gmail.com>
ShenpaiSharma and others added 22 commits January 27, 2021 17:24
Corrected code for Inheritance which was not implementing inheritance using extends keyword
…rogramming-to-books

adds Aesthetic programming to books without translations
…an-translation

fix korean translation of bezier method reference
@limzykenneth
Copy link
Member

It seems the teach branch is very outdated. There's too many files to review so I'm going to skip that. As long as the site builds and looks correct to you, I don't mind this being merge as is. We can inspect any additional diff when it comes time to merge into main.

@montoyamoraga
Copy link
Member

oh i see, i hadn' noticed that, this is for merging @yinhwa's teach branch to this repo's teach branch, ok i agree with @limzykenneth, i merged it :)

@montoyamoraga montoyamoraga merged commit ded715d into processing:teach Mar 4, 2021
@yinhwa
Copy link
Contributor Author

yinhwa commented Mar 4, 2021

Hi @limzykenneth and @montoyamoraga thank you all for checking in!🥳 Thought would be easier to work on main branch directly since the teach branch hasnt been updated for so long 😅 but then i thought i should keep the teach branch stay updated as it seems to remain in the tree for some reason maybe🤔? And I think and hope that merging into main wont be too problematic. All I did for this commit was to pull the updates from main branch into teach branch and made some changes on the teach-relevant files :) anyhow much thanks to all your efforts and time 🙏🙏

@limzykenneth
Copy link
Member

@yinhwa Content you are ready to show on the live website should be merged into main as that's where content of the site is generated from but if you are still working on it, merging into teach is fine and we can do a branch to branch PR when you are ready to release the changes. Just let us know if you want the new changes to go live and you are not sure how to create the appropriate PR. 😃

@yinhwa
Copy link
Contributor Author

yinhwa commented Mar 9, 2021

@limzykenneth Cool 😁😁 thank you as always for the kind guideline! I'm just gonna review the contents, and will let you know when I think is ready to merge!

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.