Skip to content

Commit 6a0b36a

Browse files
nukeopnukeop
committed
Resolve merge conflicts
1 parent c444db2 commit 6a0b36a

24 files changed

+72
-61
lines changed

‎CONTRIBUTING.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Contributing
2+
3+
## Adding translations
4+
5+
To translate the letter, copy `index.md` into `_translation/`
6+
and name it `index_lang.md` where `lang` is language code you are going to translate into.
7+
8+
Then you can start translating this file.
9+
10+
To display translation in the translations list, simply add `emoji` attribute to the document as follows:
11+
12+
For example: `_translations/index_de.md`
13+
14+
```md
15+
---
16+
layout: signed
17+
...
18+
emoji: 🇩🇪
19+
---
20+
21+
2021-03-23
22+
23+
Richard M. Stallman, ...
24+
```
25+
26+
There are lots of translation already, if you feel lost, be sure to check out how its done in other ones.
27+
28+
When you translated the text, added emoji attribut you can commit your change and make pull request.

‎_config.yml

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ url: "https://rms-support-letter.github.io"
55
github_username: rms-support-letter
66
repository: rms-support-letter/rms-support-letter.github.io
77

8+
collections:
9+
translations:
10+
output: true
11+
permalink: /:name:output_ext
12+
13+
814
# Build settings
915
theme: minima
1016

@@ -20,4 +26,5 @@ exclude:
2026
- vendor/gems/
2127
- vendor/ruby/
2228
- migrate.py
29+
- CONTRIBUTING.md
2330
- README*.md

‎_includes/signatures.html

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<p><b>Signed:</b></p>
2+
<ol>
3+
{% capture signs %}
4+
{% for sign_hash in site.data.signed %}
5+
{% assign signature = sign_hash[1] %}
6+
|{{signature.name | escape }}#{{signature.link | escape }}
7+
{% endfor %}
8+
{% endcapture %}
9+
{% assign sorted_signs = signs | split: '|' | sort %}
10+
{% for signature in sorted_signs %}
11+
{% assign sign_items = signature | split: '#' %}
12+
{% if sign_items[0] and sign_items[1] %}
13+
<li><a href="{{ sign_items[1] | strip }}">{{ sign_items[0] | strip }}</a></li>
14+
{% endif %}
15+
{% endfor %}
16+
</ol>

‎_includes/translations.html

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<div class="translations">
22
<p>Translations:</p>
33
<a class="translation" href='/'>🇺🇸</a>
4-
<a class="translation" href='/index_vi.html'>🇻🇳</a>
5-
<a class="translation" href='/index_zh_cn.html'>🇨🇳</a>
6-
<a class="translation" href='/index_tr.html'>🇹🇷</a>
7-
<a class="translation" href='/index_ro.html'>🇷🇴</a>
8-
<a class="translation" href='/index_es.html'>🇪🇸</a>
9-
<a class="translation" href='/index_pt_pt.html'>🇵🇹</a>
10-
<a class="translation" href='/index_pt_br.html'>🇧🇷</a>
11-
<a class="translation" href='/index_de.html'>🇩🇪</a>
12-
<a class="translation" href="/index_nl.html">🇳🇱</a>
13-
<a class="translation" href='/index_fr.html'>🇫🇷</a>
14-
<a class="translation" href='/index_pl.html'>🇵🇱</a>
15-
<a class="translation" href='/index_it.html'>🇮🇹</a>
16-
<a class="translation" href='/index_ko.html'>🇰🇷</a>
17-
<a class="translation" href='/index_ru.html'>🇷🇺</a>
18-
<a class="translation" href='/index_fa.html'>🇮🇷</a>
19-
<a class="translation" href='/index_ua.html'>🇺🇦</a>
20-
<a class="translation" href='/index_id.html'>🇮🇩</a>
21-
<a class="translation" href="/index_rs.html">🇷🇸</a>
22-
<a class="translation" href="/index_tl.html">🇵🇭</a>
4+
{% for translation in site.translations %}
5+
<a class="translation" href="{{ translation.url }}">{{ translation.emoji }}</a>
6+
{% endfor %}
237
</div>

‎_layouts/signed.html

+1-21
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,4 @@
88

99
{{ content }}
1010

11-
<p>
12-
<b>
13-
Signed:
14-
</b>
15-
</p>
16-
17-
<ol>
18-
{% capture signs %}
19-
{% for sign_hash in site.data.signed %}
20-
{% assign signature = sign_hash[1] %}
21-
|{{signature.name | escape }}#{{signature.link | escape }}
22-
{% endfor %}
23-
{% endcapture %}
24-
{% assign sorted_signs = signs | split: '|' | sort %}
25-
{% for signature in sorted_signs %}
26-
{% assign sign_items = signature | split: '#' %}
27-
{% if sign_items[0] and sign_items[1] %}
28-
<li><a href="{{ sign_items[1] | strip }}">{{ sign_items[0] | strip }}</a></li>
29-
{% endif %}
30-
{% endfor %}
31-
</ol>
11+
{% include signatures.html %}

‎_layouts/signed_rtl.html

+1-21
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,4 @@
1010
{{ content }}
1111
</div>
1212

13-
<p>
14-
<b>
15-
Signed:
16-
</b>
17-
</p>
18-
19-
<ol>
20-
{% capture signs %}
21-
{% for sign_hash in site.data.signed %}
22-
{% assign signature = sign_hash[1] %}
23-
|{{signature.name | escape }}#{{signature.link | escape }}
24-
{% endfor %}
25-
{% endcapture %}
26-
{% assign sorted_signs = signs | split: '|' | sort %}
27-
{% for signature in sorted_signs %}
28-
{% assign sign_items = signature | split: '#' %}
29-
{% if sign_items[0] and sign_items[1] %}
30-
<li><a href="{{ sign_items[1] | strip }}">{{ sign_items[0] | strip }}</a></li>
31-
{% endif %}
32-
{% endfor %}
33-
</ol>
13+
{% include signatures.html %}

‎index_de.md ‎_translations/index_de.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: de_DE
77
twitter:
88
card: summary_large_image
9+
emoji: 🇩🇪
910
---
1011

1112
2021-03-23

‎index_es.md ‎_translations/index_es.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: es_ES
77
twitter:
88
card: summary_large_image
9+
emoji: 🇪🇸
910
---
1011

1112
2021-03-23

‎index_fa.md ‎_translations/index_fa.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: fa_IR
77
twitter:
88
card: summary_large_image
9+
emoji: 🇮🇷
910
---
1011

1112
۱۴۰۰/۱/۳

‎index_fr.md ‎_translations/index_fr.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: fr_FR
77
twitter:
88
card: summary_large_image
9+
emoji: 🇫🇷
910
---
1011

1112
2021-03-23

‎index_id.md ‎_translations/index_id.md

File renamed without changes.

‎index_it.md ‎_translations/index_it.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: signed
3+
emoji: 🇮🇹
34
---
45

56
23-03-2021

‎index_ko.md ‎_translations/index_ko.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
77
locale: ko_KR
88
twitter:
99
card: summary_large_image
10+
emoji: 🇰🇷
1011
---
1112

1213
2021-03-23

‎index_nl.md ‎_translations/index_nl.md

File renamed without changes.

‎index_pl.md ‎_translations/index_pl.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: pl_PL
77
twitter:
88
card: summary_large_image
9+
emoji: 🇵🇱
910
---
1011

1112
2021-03-23

‎index_pt_br.md ‎_translations/index_pt_br.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: pt_BR
77
twitter:
88
card: summary_large_image
9+
emoji: 🇧🇷
910
---
1011

1112
2021-03-23

‎index_ro.md ‎_translations/index_ro.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: ro_RO
77
twitter:
88
card: summary_large_image
9+
emoji: 🇷🇴
910
---
1011

1112
2021-03-23

‎index_rs.md ‎_translations/index_rs.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
77
locale: sr_RS
88
twitter:
99
card: summary_large_image
10+
emoji: 🇷🇸
1011
---
1112

1213
2021-03-23

‎index_ru.md ‎_translations/index_ru.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
77
locale: ru_RU
88
twitter:
99
card: summary_large_image
10+
emoji: 🇷🇺
1011
---
1112

1213
2021-03-23

‎index_tl.md ‎_translations/index_tl.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
77
locale: tl
88
twitter:
99
card: summary_large_image
10+
emoji: 🇵🇭
1011
---
1112

1213
2021-03-23

‎index_tr.md ‎_translations/index_tr.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: tr_TR
77
twitter:
88
card: summary_large_image
9+
emoji: 🇹🇷
910
---
1011

1112
2021-03-23

‎index_ua.md ‎_translations/index_ua.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
77
locale: uk_UA
88
twitter:
99
card: summary_large_image
10+
emoji: 🇺🇦
1011
---
1112

1213
2021-03-23

‎index_vi.md ‎_translations/index_vi.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: vi_VN
77
twitter:
88
card: summary_large_image
9+
emoji: 🇻🇳
910
---
1011

1112
2021-03-23

‎index_zh_cn.md ‎_translations/index_zh_cn.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
66
locale: zh_CN
77
twitter:
88
card: summary_large_image
9+
emoji: 🇨🇳
910
---
1011

1112
2021-03-23

0 commit comments

Comments
 (0)