Merge branch 'main' into author-roles

Author: davidcarlisle

.gitattributes

@@ -1,6 +0,0 @@
-*.jpg filter=lfs diff=lfs merge=lfs -text
-*.jpeg filter=lfs diff=lfs merge=lfs -text
-*.webp filter=lfs diff=lfs merge=lfs -text
-*.ico filter=lfs diff=lfs merge=lfs -text
-*.png filter=lfs diff=lfs merge=lfs -text
-*.gif filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -23,3 +23,5 @@ vendor
 .sass-cache
 _site
 package.json
+.ruby-version
+Gemfile.lock

AUTHORS.md

@@ -10,7 +10,7 @@ The following people have made contributions to learnlatex.org:
 
 | Name                 | Role |
 |---                   |---|
-| Takuto Asakura       | _Japanese translation _ |
+| Takuto Asakura       | _Japanese translation_ |
 | Barbara Beeton       | _Initial content discussions_ |
 | Denis Bitouzé        | _Improvements to lists description_ |
 | David Carlisle       | _Initial content discussions, editor and server integration_ |
@@ -30,7 +30,7 @@ The following people have made contributions to learnlatex.org:
 | Jonathan P. Spratte  | _Initial content discussions, tables lesson, German translation_ |
 | Fernando S. Delgado Trujillo | _Spanish translation_ |
 | Vivek Tripathi       | _Hindi translation_ |
-| Moritz Wemheuer      | _Bibtex and Biblatex documentation _ |
+| Moritz Wemheuer      | _Bibtex and Biblatex documentation_ |
 | Joseph Wright        | _Initial concept, Project lead_ |
 | Dung Vu              | _Vietnamese translation_ |
 | Daniel Zhang         | _Chinese translations_ (×2) |

CONTRIBUTING.md

@@ -85,3 +85,22 @@ in `_data/languages.yml` will need to be extended to include the
 language.
 
 See also the [specific guidelines for translators](TRANSLATIONS.md).
+
+## Running the site on your computer
+
+You can run a local copy of the learnlatex.org site on your computer, to test 
+your contributions before submitting them to GitHub. For this you need:
+
+- [Ruby](https://www.ruby-lang.org/) (version 2.7.0 or higher) and RubyGems
+- [Jekyll](https://jekyllrb.com/)
+
+The provided `Gemfile` will take care of building the site and running it locally.
+
+After you have installed the above dependencies, open a terminal, `cd` to the folder of the site's code in your computer, and execute
+
+```bash
+bundle exec jekyll serve
+```
+
+to build and run the site.
+You can add the option `--incremental` at the end to make rebuiling the pages faster.

Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "github-pages", group: :jekyll_plugins

TRANSLATIONS.md

@@ -26,22 +26,21 @@ the top level of the repository as your fork will not be running at learnlatex.o
 
 ## Adding your language
 
-Once the initial site is working, you can make add the new language
+Once the initial site is working, you can add the new language
 files by taking the ISO 639-1 two letter language code for your
 language, which we shall assume is `zz`.  It may be necessary to use a
 two part name denoting the script, for example `zh-Hans` or `zh-Hant`
 (Simplified and Traditional Chinese) as specified in RFC 4646. We hope
-to avoid regional variants. For example the `en` ages mostly follow US
+to avoid regional variants. For example the `en` pages mostly follow US
 usage of English but we do not envisage separate `en-US` and `en-gb`
 pages.
 
 
-1. Make a new directory `zz` as a copy of the english pages in `en`, including the subdirectory `en/includes`
-2. Add the two letter code `zz` to the `langs:` array in the `_config.yml` file.
-3. Change all instances of `en/` in `zz/index.md` to `zz/`
-4. Translate the fixed strings in `zz/includes/buttons.js` into your language.
+1. Make a new directory `zz` as a copy of the English pages in `en`, including the subdirectory `en/includes`
+2. Change all instances of `en/` in `zz/index.md` to `zz/`
+3. Translate the fixed strings in `zz/includes/buttons.js` into your language.
    This is for the buttons used in examples such as "Open in Overleaf".
-5. Add a new enty in `_data/languages.yml` This should specify the
+4. Add a new entry in `_data/languages.yml`. This should specify the
    code, the name of your language in the language and in English, for example
    the French entry is
 
@@ -50,7 +49,7 @@ pages.
      label-regional: Français
      label-english: French
    ```
-6. Update each section of `_data/translations.yml` with the an entry for
+5. Update each section of `_data/translations.yml` with an entry for
    each of the fixed strings in the site. So for example the entry for "Next Lesson"
    should be amended to have a `zz:` entry:
 
@@ -66,7 +65,7 @@ pages.
      vi: "Bài tiếp theo"
      zz: "YOUR TRANSLATION HERE"
    ```
-   
+
 Note that if you want your translation to use localised digits for lesson numbers
 you may optionally add an entry to the `navigational-elements_digits` array
 with a string consisting of a comma separated list of numbers 0--20.
@@ -108,7 +107,7 @@ The variable names should not be changed but the values should be changed to you
 ## Lesson text.
 
 We ask that translations are fairly literal translations of the
-english text.  The intention is that the structure of the course and
+English text.  The intention is that the structure of the course and
 order and depth that subjects are introduced are the same for all the
 languages hosted on the site.
 

_config.yml

@@ -32,69 +32,3 @@ compress_html:
   profile: false
   startings: [html, head, body]
 
-
-# LANGUAGES, LABELS, LAYOUTS
-# Settings for multilingual set up:
-# In alphabetical order by language code.
-# In ascending order by path specifity.
-# https://jekyllrb.com/docs/configuration/front-matter-defaults/
-defaults:
-  -
-    scope:
-      path: ""
-    values:
-      lang: "en"
-  -
-    scope:
-      path: "de"
-    values:
-      lang: "de"
-      label: "Deutsch"
-  -
-    scope:
-      path: "en"
-    values:
-      lang: "en"
-      label: "English"
-  -
-    scope:
-      path: "es"
-    values:
-      lang: "es"
-      label: "Español"
-  -
-    scope:
-      path: "fr"
-    values:
-      lang: "fr"
-      label: "Français"
-  -
-    scope:
-      path: "pt"
-    values:
-      lang: "pt"
-      label: "Português"
-  -
-    scope:
-      path: "vi"
-    values:
-      lang: "vi"
-      label: "Tiếng Việt"
-  -
-    scope:
-      path: "tr"
-    values:
-      lang: "tr"
-      label: "Türkçe"
-  -
-    scope:
-      path: "mr"
-    values:
-      lang: "mr"
-      label: "मराठी"
-  -
-    scope:
-      path: "ca"
-    values:
-      lang: "ca"
-      label: "Català"

_data/languages.yml

@@ -23,6 +23,22 @@
   label-regional: Français
   label-english: French
 
+- language-code: hi
+  label-regional: हिंदी 
+  label-english: Hindi
+  
+- language-code: it
+  label-regional: Italiano
+  label-english: Italian
+
+- language-code: ja
+  label-regional: 日本語
+  label-english: Japanese
+
+- language-code: lt
+  label-regional: Lietuviškai
+  label-english: Lithuanian
+  
 - language-code: mr
   label-regional: मराठी
   label-english: Marathi
@@ -35,8 +51,17 @@
   label-regional: Tiếng Việt
   label-english: Vietnamese
 
+- language-code: zh-hans
+  label-regional: 中文（简体）
+  label-english: Simplified Chinese
+
+- language-code: zh-hant
+  label-regional: 中文（繁體）
+  label-english: Traditional Chinese
+
 # - language-code: tr
 #   label-regional: Türkçe
 #   label-english: Turkish
 
 
+