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].

README.md

@@ -12,7 +12,7 @@ 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://swcarpentry.slack.com/archives/C01G4HYGAQ6) Slack channel (if you are not a member of The Carpentries Slack you can join by filling [this form](https://swc-slack-invite.herokuapp.com/)).
+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
 

_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: 용어 사전
@@ -274,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>