Merge branch 'main' into main

.github/workflows/build-and-deploy.yaml

@@ -1,4 +1,4 @@
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 name: Build and Deploy Glossary Website
 
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.1
+      uses: actions/checkout@v3
       with:
           persist-credentials: false
 
@@ -22,7 +22,8 @@ jobs:
 
     - name: Deploy to site
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'carpentries/glosario' }}
-      uses: JamesIves/github-pages-deploy-action@4.1.5
+      uses: JamesIves/github-pages-deploy-action@v4
       with:
         branch: site
         folder: _gh-site
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/yaml-lint.yaml

@@ -4,16 +4,15 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.gitignore

@@ -3,6 +3,7 @@
 .Rproj.user
 .jekyll-cache
 .jekyll-metadata
+.vendor/
 Glossary.egg-info
 MANIFEST
 R/sysdata.rda

CODE_OF_CONDUCT.md

@@ -1,3 +1,7 @@
+---
+permalink: /conduct/
+---
+
 # The Carpentries Code of Conduct
 
 As contributors and maintainers of this project, we pledge to follow the [Carpentries Code of Conduct][coc].

Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gem 'github-pages', group: :jekyll_plugins
+
+gem "webrick", "~> 1.7"

README.md

@@ -10,6 +10,10 @@ Authors can also use the library's functions
 to insert consistent hyperlinks for terms and definitions in their lessons
 in any of several (human) languages.
 
+## Contributing
+
+You do not need to know any particular programming language to contribute to Glosario: anyone possessing a basic familiarity with the GitHub web interface can get involved! We have prepared a [detailed and accessible guide for contributing](https://docs.google.com/document/d/18gTFR1Pw2Mk3PeNTMS0IHgFnJy-F4PBCGJQ1aMrDHPE/edit?usp=sharing), which has been translated into several languages. Contributions are welcome in any language, not only those represented in that document. If you need help with your contribution, feel free to come ask questions on the [#glosario](https://carpentries.slack.com/archives/C01G4HYGAQ6) Slack channel (if you are not a member of The Carpentries Slack you can join by filling [this form](https://slack-invite.carpentries.org/)).
+
 ## Lessons
 
 R Markdown and Jupyter notebooks allow authors to place structured metadata in files.

_config.yml

@@ -137,6 +137,16 @@ languages:
        to znanje. Autori također mogu koristiti funkcije rječnika za umetanje
        dosljedne hiperveze za pojmove i definicije u svojim lekcijama na bilo kojem od
        nekoliko jezika.
+  - key: hu
+    name: Magyar
+    title: Szójegyzék
+    blurb: >
+       `glosario` egy nyílt forráskódú szójegyzék, amiben ezen fogalmak tartalmát adattudományban használnak.
+       Elérhető online, egyben programkönyvtár formájában is [R](https://github.com/carpentries/glosario-r/) nyelven
+       és [Python](https://github.com/carpentries/glosario-py/)ban is.   A tanórában elhangzott szavak hozzákapcsolhatóak a szójegyzékhez. 
+       Ezzel jelezve a tanóra tartalmát, a diákoktól elvárt óra elötti készülést és ezen felül mindezek hol találhatóak meg.  
+       A tanárok továbbiakban használhatják a programkönyvtárak beépített függvényeit amivel hyper-linkeket csatolhatnak az egyes fogalmakhoz, 
+       így hozzá illesztve a tanóra anyagának bármelyik részéhez az adott nyelvhez.
   - key: ko
     name: 한국어
     title: 용어 사전
@@ -159,13 +169,12 @@ languages:
     name: Nederlands
     title: Woordenlijst
     blurb: >
-      `glosario` is een openbron verklarende woordenlijst van terminologie die wordt gebruikt
-      in de informatica en online beschikbaar wordt gesteld, evenals een programmabibliotheek in
-      [R](https://github.com/carpentries/glosario-r/) en [Python](https://github.com/carpentries/glosario-py/).
-      Door woordenlijstsleutels op te nemen in de metadata van een les, kunnen auteurs aangeven welke informatie
-      in een les wordt behandeld, wat studenten moeten weten voordat de les begint en waar studenten de informatie
-      kunnen vinden. Auteurs kunnen de tekenfuncties van het programma ook gebruiken om consistente doorklik op
-      te nemen, voor termen en definities in een van de verschillende talen, in hun lessen.
+      `glosario` is een open source woordenlijst met termen uit de data science die online en als bibliotheek 
+      in [R](https://github.com/carpentries/glosario-r/) en [Python](https://github.com/carpentries/glosario-py/) 
+      beschikbaar is. Door termen uit de woordenlijst op te nemen in de metadata van een les, kunnen auteurs 
+      aangeven welke informatie in een les wordt behandeld, wat studenten moeten weten voordat de les begint en 
+      waar studenten de informatie kunnen vinden. Auteurs kunnen de functionaliteiten van de woordenlijst ook 
+      gebruiken om consistente hyperlinks naar termen en definities op te nemen in hun lessen in een of meerdere talen.
   - key: tn
     name: Setswana
     title: thanodi ya mafoko
@@ -275,3 +284,11 @@ languages:
     title: Glossary
     blurb: >-
       In translation
+  - key: zh
+    name: 中文
+    title: 术语表
+    blurb: >
+      `glosario`是开源的数据科学术语表，也可作为[R](https://github.com/carpentries/glosario-r/)
+      和[Python](https://github.com/carpentries/glosario-py/)的软件包使用。课程作者可
+      以在课程元数据中添加术语名词，让学习者提前了解课程的前提要求以及去哪里学习这些前提知识。
+      利用软件包，课程作者也可以在课程内容中插入不同语言的术语名词和解释的永久链接。

_layouts/glossary.html

@@ -41,7 +41,11 @@
         -
         <a href="{{'/license/' | relative_url}}">License</a>
         -
-        <a href="https://github.com/carpentries/glosario/">GitHub</a>
+        <a href="{{'/conduct/' | relative_url}}">Code of Conduct</a>
+        -
+        <a href="{{ site.repository_url }}">GitHub</a>
+        -
+        <a href="https://www.netlify.com">This site is powered by Netlify</a>
     </p>
 </footer>
 </body>

_layouts/page.html

@@ -35,7 +35,11 @@
         -
         <a href="{{'/license/' | relative_url}}">License</a>
         -
+        <a href="{{'/conduct/' | relative_url}}">Code of Conduct</a>
+        -
         <a href="{{ site.repository_url }}">GitHub</a>
+        -
+        <a href="https://www.netlify.com">This site is powered by Netlify</a>
       </p>
     </footer>
   </body>