Skip to content

Commit

Permalink
Rename master to main in texts. (hedyorg#397)
Browse files Browse the repository at this point in the history 
* Rename master to main in texts.

* Change 'master' => 'main' in workflows

Co-authored-by: Rico Huijbers <[email protected]>
Co-authored-by: Felienne <[email protected]>
  • Loading branch information
@fpereiro @rix0rrr @Felienne
3 people authored May 23, 2021
1 parent aaf15a6 commit ebbc09d
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-alpha.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_run:
# Must be the same as in unittests.yml
workflows: ["Unit tests"]
branches: [master]
branches: [main]
types:
- completed
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unittests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Unit tests

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ Help Hedy with translations (in the code base, some coding experience needed)

If you would like to add a new translation, there are four places where files are located that need to be translated:

1) The folder [level-defaults](https://github.com/Felienne/hedy/blob/master/coursedata/level-defaults/) has a file for each language. That file controls what the landing page for each levels looks like. It is probably easiest to copy the [English file](https://github.com/Felienne/hedy/blob/master/coursedata/level-defaults/en.yaml), rename it and translate that. Tip: example variables can be translated too, that is probably helpful for learners!
1) The folder [level-defaults](https://github.com/Felienne/hedy/blob/main/coursedata/level-defaults/) has a file for each language. That file controls what the landing page for each levels looks like. It is probably easiest to copy the [English file](https://github.com/Felienne/hedy/blob/main/coursedata/level-defaults/en.yaml), rename it and translate that. Tip: example variables can be translated too, that is probably helpful for learners!

2) In the folder [texts](https://github.com/Felienne/hedy/tree/master/coursedata/texts) there is a file for each language too. That file translate UI-elements like menu headers, and, important, the error messages Hedy programmers will see. As above, copying the [English file](https://github.com/Felienne/hedy/blob/master/coursedata/texts/en.yaml) and translate that.
2) In the folder [texts](https://github.com/Felienne/hedy/tree/main/coursedata/texts) there is a file for each language too. That file translate UI-elements like menu headers, and, important, the error messages Hedy programmers will see. As above, copying the [English file](https://github.com/Felienne/hedy/blob/main/coursedata/texts/en.yaml) and translate that.

3) The [folder](https://github.com/Felienne/hedy/tree/master/coursedata/adventures) that control the assignments kids see in the user interface for each of the levels. While not mandatory, the assignments in this section are of help for kids to better explore each level. If you do not translate them, the English version will be shown.
3) The [folder](https://github.com/Felienne/hedy/tree/main/coursedata/adventures) that control the assignments kids see in the user interface for each of the levels. While not mandatory, the assignments in this section are of help for kids to better explore each level. If you do not translate them, the English version will be shown.

4) *optional* The folder [main](https://github.com/Felienne/hedy/tree/master/main) controls the web pages around Hedy. [start](https://github.com/Felienne/hedy/blob/master/main/start-en.md) holds the content of the start page, and there are page with press, contact info too. These do not necessariyl have to be translated, if you don't people will then see the English version, but kids can still program in their own native language.
4) *optional* The folder [main](https://github.com/Felienne/hedy/tree/main/main) controls the web pages around Hedy. [start](https://github.com/Felienne/hedy/blob/main/main/start-en.md) holds the content of the start page, and there are page with press, contact info too. These do not necessariyl have to be translated, if you don't people will then see the English version, but kids can still program in their own native language.


Translated all of that?

Two more small things to do!

1) Add your language to the [menu](https://github.com/Felienne/hedy/blob/master/main/menu.json).
1) Add your language to the [menu](https://github.com/Felienne/hedy/blob/main/main/menu.json).

2) Now go to [app.py](https://github.com/Felienne/hedy/blob/master/app.py) and add your language to this list:
2) Now go to [app.py](https://github.com/Felienne/hedy/blob/main/app.py) and add your language to this list:

```
ALL_LANGUAGES = {
Expand Down Expand Up @@ -117,9 +117,9 @@ When you execute this, the interpreter will use the specified level.
Pre-release environment
-----------------------

When you have your PR accepted into `master`, that version will be deployed on [hedy-alpha.herokuapp.com](https://hedy-alpha.herokuapp.com).
When you have your PR accepted into `main`, that version will be deployed on [hedy-alpha.herokuapp.com](https://hedy-alpha.herokuapp.com).

We do periodic deploys of `master` to the [production version](https://hedycode.com) of Hedy.
We do periodic deploys of `main` to the [production version](https://hedycode.com) of Hedy.

Editing YAML files with validation
----------------------------------
Expand Down
200 changes: 100 additions & 100 deletions STATUS.md
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,119 @@
# Status of Things
# Status of Things
This page presents an overview of content in different languages. If you want to translate hedy to a new language, this is a good list to follow.

Please add your name in the table when you want to work on a specific thing, so others can focus on stuff that has not been started on yet. Something will get a 'V' after the pull requests gets accepted and the content is merged to the master-branch. Or, with the youtube-content, when the video is recorded and ready for uploading. Or, with the youtube-subtitling, when the subtitles are accepted and online. Happy coding/writing!
## Contents
* [Website general](#Website-general)
* [Levels - practice page](#levels-practice-page)
* [Levels - docs](#Levels-docs)
* [Youtube videos](#Youtube-videos)
* [Youtube Subtitling](#Youtube-Subtitling)
[Back to top of page](#status-of-things)

## Landing page
Please add your name in the table when you want to work on a specific thing, so others can focus on stuff that has not been started on yet. Something will get a 'V' after the pull requests gets accepted and the content is merged to the `main` branch. Or, with the youtube-content, when the video is recorded and ready for uploading. Or, with the youtube-subtitling, when the subtitles are accepted and online. Happy coding/writing!

## Contents
* [Website general](#Website-general)
* [Levels - practice page](#levels-practice-page)
* [Levels - docs](#Levels-docs)
* [Youtube videos](#Youtube-videos)
* [Youtube Subtitling](#Youtube-Subtitling)

[Back to top of page](#status-of-things)

## Landing page
Content for the landing page is stored in the [main folder](main). There currently are three pages: contact, press and start. There is also a [json file](main/menu.json) that generates the menu. The landing page is currently available in Dutch and English.

| |NL|EN|ES|..|
|--|--|--|--|--|
|start| V | V | | |
|press| V | V | | |
|contact| V | V | | |
[Back to top of page](#status-of-things)
| |NL|EN|ES|..|
|--|--|--|--|--|
|start| V | V | | |
|press| V | V | | |
|contact| V | V | | |
[Back to top of page](#status-of-things)

## Coding Environment
Texts in the coding environment, such as error messages, are stored in [texts.json](static/texts.json).
Texts in the coding environment, such as error messages, are stored in [texts.json](static/texts.json).

| |NL|EN|ES|..|
|--|--|--|--|--|
|Texts| V | V | V | |
| |NL|EN|ES|..|
|--|--|--|--|--|
|Texts| V | V | V | |

In addition to the generic texts, the coding environment has three pages: code, explanation and videos.

### Code
Code texts are taken form the [levels file](static/levels.json), which also controls which levels are available in the interface. Only when a level is present in a given language, it will be possible to access it in the website.
| |NL|EN|ES|..|
|--|--|--|--|--|
|level 1| V | V | V | |
|level 2| V | V | V | |
|level 3| V | V | V | |
|level 4| V | V | V | |
|level 5| V | V | | |
|level 6| V | V | | |
|level 7| V | V | | |
|level 8| | | | |
|level 9| | | | |
|level 10| | | | |
|level 11| | | | |
|level 12| | | | |
|level 13| | | | |
[Back to top of page](#status-of-things)

### Levels - Explanation

| |NL|EN|ES|..|
|--|--|--|--|--|
|level 1| V | V | V | |
|level 2| V | V | V | |
|level 3| V | V | V | |
|level 4| V | V | V | |
|level 5| V | V | | |
|level 6| V | V | | |
|level 7| V | V | | |
|level 8| | | | |
|level 9| | | | |
|level 10| | | | |
|level 11| | | | |
|level 12| | | | |
|level 13| | | | |
[Back to top of page](#status-of-things)


### Levels - Explanation
To be found [here](/docs), in the md files. For example [en-level1.md](docs/en-level1.md) holds the page for level 1 in English.
| |NL|EN|ES|..|
|--|--|--|--|--|
|level 1| V | V | V | |
|level 2| V | | V | |
|level 3| V | | | |
|level 4| V | | | |
|level 5| V | | | |
|level 6| V | | | |
|level 7| | | | |
|level 8| | | | |
|level 9| | | | |
|level 10| | | | |
|level 11| | | | |
|level 12| | | | |
|level 13| | | | |
[Back to top of page](#status-of-things)

| |NL|EN|ES|..|
|--|--|--|--|--|
|level 1| V | V | V | |
|level 2| V | | V | |
|level 3| V | | | |
|level 4| V | | | |
|level 5| V | | | |
|level 6| V | | | |
|level 7| | | | |
|level 8| | | | |
|level 9| | | | |
|level 10| | | | |
|level 11| | | | |
|level 12| | | | |
|level 13| | | | |
[Back to top of page](#status-of-things)

### Levels - video page
To be found [here](/docs), in the md files. For example [video-nl-level3.md](docs/nl-level3.md) holds the video page for level 3 in Dutch (nl). We would love for people to record explanation videos in their own language!

| |NL|EN|ES|..|
|--|--|--|--|--|
|level 1| V | | | |
|level 2| V | | | |
|level 3| V | | | |
|level 4| V | | | |
|level 5| V | | | |
|level 6| V | | | |
|level 7| | | | |
|level 8| | | | |
|level 9| | | | |
|level 10| | | | |
|level 11| | | | |
|level 12| | | | |
|level 13| | | | |
[Back to top of page](#status-of-things)
### Youtube subtitling
| |NL|EN|ES|..|
|--|--|--|--|--|
|level 1| V | | | |
|level 2| V | | | |
|level 3| V | | | |
|level 4| V | | | |
|level 5| V | | | |
|level 6| V | | | |
|level 7| | | | |
|level 8| | | | |
|level 9| | | | |
|level 10| | | | |
|level 11| | | | |
|level 12| | | | |
|level 13| | | | |

[Back to top of page](#status-of-things)


### Youtube subtitling

Our videos now have no subtitles, but in lieu of videos in other languages, the English ones could also be subtitled. This task has not been started yet.

| |NL|EN|..|
|--|--|--|--|
|Philosophy| | | |
|level 1| | | |
|level 2| | | |
|level 3| | | |
|level 4| | | |
|level 5| | | |
|level 6| | | |
|level 7| | | |
|level 8| | | |
|level 9| | | |
|level 10| | | |
|level 11| | | |
|level 12| | | |
|level 13| | | |
[Back to top of page](#status-of-things)
| |NL|EN|..|
|--|--|--|--|
|Philosophy| | | |
|level 1| | | |
|level 2| | | |
|level 3| | | |
|level 4| | | |
|level 5| | | |
|level 6| | | |
|level 7| | | |
|level 8| | | |
|level 9| | | |
|level 10| | | |
|level 11| | | |
|level 12| | | |
|level 13| | | |
[Back to top of page](#status-of-things)

> Written with [StackEdit](https://stackedit.io/).
2 changes: 1 addition & 1 deletion templates/translate-fromto.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Translating '{{source_lang}}' to '{{target_lang}}'</h1>
</ol>

<p>
If you are curious to understand the role of all files in more depth, see <a href="https://github.com/Felienne/hedy/blob/master/CONTRIBUTING.md">our docs</a>.
If you are curious to understand the role of all files in more depth, see <a href="https://github.com/Felienne/hedy/blob/main/CONTRIBUTING.md">our docs</a>.
</p>
Use this website as follows: <br>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions templates/version-page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ <h1>Hedy version info</h1>
</tr>
<tr>
<th>Undeployed Changes</th>
<td><a href="https://github.com/Felienne/hedy/compare/{{commit}}...master">GitHub</a></td>
<td><a href="https://github.com/Felienne/hedy/compare/{{commit}}...main">GitHub</a></td>
</tr>
</table>
</body>
</html>
</html>

0 comments on commit ebbc09d

Please sign in to comment.