Resolve merge conflicts

This commit is contained in:
nukeop 2021-03-26 18:43:51 +01:00
parent c444db222f
commit 6a0b36a04e
24 changed files with 72 additions and 61 deletions

28
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,28 @@
# Contributing
## Adding translations
To translate the letter, copy `index.md` into `_translation/`
and name it `index_lang.md` where `lang` is language code you are going to translate into.
Then you can start translating this file.
To display translation in the translations list, simply add `emoji` attribute to the document as follows:
For example: `_translations/index_de.md`
```md
---
layout: signed
...
emoji: 🇩🇪
---
2021-03-23
Richard M. Stallman, ...
```
There are lots of translation already, if you feel lost, be sure to check out how its done in other ones.
When you translated the text, added emoji attribut you can commit your change and make pull request.

View File

@ -5,6 +5,12 @@ url: "https://rms-support-letter.github.io"
github_username: rms-support-letter
repository: rms-support-letter/rms-support-letter.github.io
collections:
translations:
output: true
permalink: /:name:output_ext
# Build settings
theme: minima
@ -20,4 +26,5 @@ exclude:
- vendor/gems/
- vendor/ruby/
- migrate.py
- CONTRIBUTING.md
- README*.md

16
_includes/signatures.html Normal file
View File

@ -0,0 +1,16 @@
<p><b>Signed:</b></p>
<ol>
{% capture signs %}
{% for sign_hash in site.data.signed %}
{% assign signature = sign_hash[1] %}
|{{signature.name | escape }}#{{signature.link | escape }}
{% endfor %}
{% endcapture %}
{% assign sorted_signs = signs | split: '|' | sort %}
{% for signature in sorted_signs %}
{% assign sign_items = signature | split: '#' %}
{% if sign_items[0] and sign_items[1] %}
<li><a href="{{ sign_items[1] | strip }}">{{ sign_items[0] | strip }}</a></li>
{% endif %}
{% endfor %}
</ol>

View File

@ -1,23 +1,7 @@
<div class="translations">
<p>Translations:</p>
<a class="translation" href='/'>🇺🇸</a>
<a class="translation" href='/index_vi.html'>🇻🇳</a>
<a class="translation" href='/index_zh_cn.html'>🇨🇳</a>
<a class="translation" href='/index_tr.html'>🇹🇷</a>
<a class="translation" href='/index_ro.html'>🇷🇴</a>
<a class="translation" href='/index_es.html'>🇪🇸</a>
<a class="translation" href='/index_pt_pt.html'>🇵🇹</a>
<a class="translation" href='/index_pt_br.html'>🇧🇷</a>
<a class="translation" href='/index_de.html'>🇩🇪</a>
<a class="translation" href="/index_nl.html">🇳🇱</a>
<a class="translation" href='/index_fr.html'>🇫🇷</a>
<a class="translation" href='/index_pl.html'>🇵🇱</a>
<a class="translation" href='/index_it.html'>🇮🇹</a>
<a class="translation" href='/index_ko.html'>🇰🇷</a>
<a class="translation" href='/index_ru.html'>🇷🇺</a>
<a class="translation" href='/index_fa.html'>🇮🇷</a>
<a class="translation" href='/index_ua.html'>🇺🇦</a>
<a class="translation" href='/index_id.html'>🇮🇩</a>
<a class="translation" href="/index_rs.html">🇷🇸</a>
<a class="translation" href="/index_tl.html">🇵🇭</a>
{% for translation in site.translations %}
<a class="translation" href="{{ translation.url }}">{{ translation.emoji }}</a>
{% endfor %}
</div>

View File

@ -8,24 +8,4 @@ layout: home
{{ content }}
<p>
<b>
Signed:
</b>
</p>
<ol>
{% capture signs %}
{% for sign_hash in site.data.signed %}
{% assign signature = sign_hash[1] %}
|{{signature.name | escape }}#{{signature.link | escape }}
{% endfor %}
{% endcapture %}
{% assign sorted_signs = signs | split: '|' | sort %}
{% for signature in sorted_signs %}
{% assign sign_items = signature | split: '#' %}
{% if sign_items[0] and sign_items[1] %}
<li><a href="{{ sign_items[1] | strip }}">{{ sign_items[0] | strip }}</a></li>
{% endif %}
{% endfor %}
</ol>
{% include signatures.html %}

View File

@ -10,24 +10,4 @@ layout: home
{{ content }}
</div>
<p>
<b>
Signed:
</b>
</p>
<ol>
{% capture signs %}
{% for sign_hash in site.data.signed %}
{% assign signature = sign_hash[1] %}
|{{signature.name | escape }}#{{signature.link | escape }}
{% endfor %}
{% endcapture %}
{% assign sorted_signs = signs | split: '|' | sort %}
{% for signature in sorted_signs %}
{% assign sign_items = signature | split: '#' %}
{% if sign_items[0] and sign_items[1] %}
<li><a href="{{ sign_items[1] | strip }}">{{ sign_items[0] | strip }}</a></li>
{% endif %}
{% endfor %}
</ol>
{% include signatures.html %}

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: de_DE
twitter:
card: summary_large_image
emoji: 🇩🇪
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: es_ES
twitter:
card: summary_large_image
emoji: 🇪🇸
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: fa_IR
twitter:
card: summary_large_image
emoji: 🇮🇷
---
۱۴۰۰/۱

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: fr_FR
twitter:
card: summary_large_image
emoji: 🇫🇷
---
2021-03-23

View File

@ -1,5 +1,6 @@
---
layout: signed
emoji: 🇮🇹
---
23-03-2021

View File

@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
locale: ko_KR
twitter:
card: summary_large_image
emoji: 🇰🇷
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: pl_PL
twitter:
card: summary_large_image
emoji: 🇵🇱
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: pt_BR
twitter:
card: summary_large_image
emoji: 🇧🇷
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: ro_RO
twitter:
card: summary_large_image
emoji: 🇷🇴
---
2021-03-23

View File

@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
locale: sr_RS
twitter:
card: summary_large_image
emoji: 🇷🇸
---
2021-03-23

View File

@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
locale: ru_RU
twitter:
card: summary_large_image
emoji: 🇷🇺
---
2021-03-23

View File

@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
locale: tl
twitter:
card: summary_large_image
emoji: 🇵🇭
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: tr_TR
twitter:
card: summary_large_image
emoji: 🇹🇷
---
2021-03-23

View File

@ -7,6 +7,7 @@ image: /assets/social-media-preview.png
locale: uk_UA
twitter:
card: summary_large_image
emoji: 🇺🇦
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: vi_VN
twitter:
card: summary_large_image
emoji: 🇻🇳
---
2021-03-23

View File

@ -6,6 +6,7 @@ image: /assets/social-media-preview.png
locale: zh_CN
twitter:
card: summary_large_image
emoji: 🇨🇳
---
2021-03-23