Skip to content

Commit ac0ea58

Browse files
committed
Merge remote-tracking branch 'upstream/main' into main
2 parents b11a7ef + be4ff32 commit ac0ea58

65 files changed

Lines changed: 1425 additions & 2842 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bundle/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ permalink: /CONTRIBUTING
1010
Thanks for considering contributing to learnlatex.org: feedback, fixes and
1111
ideas are all useful.
1212

13-
## ChangeLog, commit messages and authors
13+
## Commit messages and authors
1414

15-
Please note any significant change to the content of questions in
16-
[`CHANGELOG.md`](CHANGELOG.md), including which lesson is changed in the
17-
format `L-<number>`.
1815

1916
Commit messages where the content of a single lesson is changed should start
2017
with `L-<name>`. Changes to the _content_ of lessons should always be made in
@@ -62,15 +59,14 @@ the site useful. There are a few things to watch out for
6259

6360
## Language
6461

65-
At present, we have full content only in English, but the longer-term plan is to
66-
add additional languages: notice that the content is within a `/en/` tree. There
67-
are sample translations under `de`, `fr` and `pt` but only the page titles are
68-
translated until the English version is more stable.
62+
We already have have full content in several languages. Some
63+
in-progress partial translations are also visible in the git sources
64+
of this site and in several forks.
6965

7066
For the avoidance of doubt, we are using US English spelling (and idiom)
7167
on the site, as this is the most widely-understood approach.
7268

73-
See [STYLEGUIDE.md](STYLEGUIDE.md) for other points of style for the English
69+
See [The Style Guide](STYLEGUIDE.md) for other points of style for the English
7470
version.
7571

7672
If you do plan to contribute a translation then please contact the
@@ -83,7 +79,9 @@ may be added that need not be translations of the English text, but
8379
have information specific to the language being used.
8480

8581
The translation should be placed in a two-letter directory using the
86-
ISO 639-1 language code. The yml `langs` array in `_config.yml` will
87-
need to be extended to include the language.
82+
ISO 639-1 language code, of if necessary, also use the script code such
83+
as `zh-Hans` for Chinese using the simplified script. The YAML array
84+
in `_data/languages.yml` will need to be extended to include the
85+
language.
8886

8987
See also the [specific guidelines for translators](TRANSLATIONS.md).

LICENSE renamed to LICENSE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
---
2+
lang: en
3+
title: LICENSE
4+
permalink: /LICENSE
5+
---
6+
7+
```raw
8+
19
Attribution-ShareAlike 4.0 International
210
311
=======================================================================
@@ -426,3 +434,5 @@ public licenses.
426434
427435
Creative Commons may be contacted at creativecommons.org.
428436
437+
```
438+
{: .noedit :}

TRANSLATIONS.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ pages.
6868
zz: "YOUR TRANSLATION HERE"
6969
```
7070

71-
7. Update `_data/map.yml` with a `zz:` entry for each page.
7271

7372
At this point your language should appear in the drop down menu to
7473
select languages, and the navigation between pages. Obviously the main
@@ -99,8 +98,8 @@ The variable names should not be changed but the values should be changed to you
9998

10099
* `title` is used on this page for the title,
101100
* `description`, is used below the title
102-
* `toc-anchor-text` and `toc-description`are used in the annotated
103-
table of contents for the top level leaernlatex.org/zz page.
101+
* `toc-anchor-text` and `toc-description` are used in the annotated
102+
table of contents for the top level learnlatex.org/zz page.
104103

105104
## Lesson text.
106105

_data/languages.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
#
44
# (in preferred order)
55

6+
- language-code: ca
7+
label-regional: Català
8+
label-english: Catalan
9+
610
- language-code: de
711
label-regional: Deutsch
812
label-english: German
@@ -35,6 +39,3 @@
3539
label-regional: Tiếng&nbsp;Việt
3640
label-english: Vietnamese
3741

38-
- language-code: ca
39-
label-regional: Català
40-
label-english: Catalan

0 commit comments

Comments
 (0)