From 6a0b36a04e832b319cab5b0fdc0014ed0ba40b88 Mon Sep 17 00:00:00 2001 From: nukeop Date: Fri, 26 Mar 2021 18:43:51 +0100 Subject: [PATCH] Resolve merge conflicts --- CONTRIBUTING.md | 28 +++++++++++++++++++ _config.yml | 7 +++++ _includes/signatures.html | 16 +++++++++++ _includes/translations.html | 22 ++------------- _layouts/signed.html | 22 +-------------- _layouts/signed_rtl.html | 22 +-------------- index_de.md => _translations/index_de.md | 1 + index_es.md => _translations/index_es.md | 1 + index_fa.md => _translations/index_fa.md | 1 + index_fr.md => _translations/index_fr.md | 1 + index_id.md => _translations/index_id.md | 0 index_it.md => _translations/index_it.md | 1 + index_ko.md => _translations/index_ko.md | 1 + index_nl.md => _translations/index_nl.md | 0 index_pl.md => _translations/index_pl.md | 1 + .../index_pt_br.md | 1 + index_ro.md => _translations/index_ro.md | 1 + index_rs.md => _translations/index_rs.md | 1 + index_ru.md => _translations/index_ru.md | 1 + index_tl.md => _translations/index_tl.md | 1 + index_tr.md => _translations/index_tr.md | 1 + index_ua.md => _translations/index_ua.md | 1 + index_vi.md => _translations/index_vi.md | 1 + .../index_zh_cn.md | 1 + 24 files changed, 72 insertions(+), 61 deletions(-) create mode 100644 CONTRIBUTING.md create mode 100644 _includes/signatures.html rename index_de.md => _translations/index_de.md (99%) rename index_es.md => _translations/index_es.md (99%) rename index_fa.md => _translations/index_fa.md (99%) rename index_fr.md => _translations/index_fr.md (99%) rename index_id.md => _translations/index_id.md (100%) rename index_it.md => _translations/index_it.md (97%) rename index_ko.md => _translations/index_ko.md (99%) rename index_nl.md => _translations/index_nl.md (100%) rename index_pl.md => _translations/index_pl.md (99%) rename index_pt_br.md => _translations/index_pt_br.md (99%) rename index_ro.md => _translations/index_ro.md (99%) rename index_rs.md => _translations/index_rs.md (99%) rename index_ru.md => _translations/index_ru.md (99%) rename index_tl.md => _translations/index_tl.md (99%) rename index_tr.md => _translations/index_tr.md (99%) rename index_ua.md => _translations/index_ua.md (99%) rename index_vi.md => _translations/index_vi.md (99%) rename index_zh_cn.md => _translations/index_zh_cn.md (99%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..ba7ae49f9 --- /dev/null +++ b/CONTRIBUTING.md @@ -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. diff --git a/_config.yml b/_config.yml index 2e15f6a49..e792809c6 100644 --- a/_config.yml +++ b/_config.yml @@ -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 \ No newline at end of file diff --git a/_includes/signatures.html b/_includes/signatures.html new file mode 100644 index 000000000..1ebed35cd --- /dev/null +++ b/_includes/signatures.html @@ -0,0 +1,16 @@ +

Signed:

+
    +{% 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] %} +
  1. {{ sign_items[0] | strip }}
    2. + {% endif %} +{% endfor %} +
\ No newline at end of file diff --git a/_includes/translations.html b/_includes/translations.html index a5e079850..7f3309988 100644 --- a/_includes/translations.html +++ b/_includes/translations.html @@ -1,23 +1,7 @@

Translations:

🇺🇸 - 🇻🇳 - 🇨🇳 - 🇹🇷 - 🇷🇴 - 🇪🇸 - 🇵🇹 - 🇧🇷 - 🇩🇪 - 🇳🇱 - 🇫🇷 - 🇵🇱 - 🇮🇹 - 🇰🇷 - 🇷🇺 - 🇮🇷 - 🇺🇦 - 🇮🇩 - 🇷🇸 - 🇵🇭 + {% for translation in site.translations %} + {{ translation.emoji }} + {% endfor %}
diff --git a/_layouts/signed.html b/_layouts/signed.html index a62c2d635..968a19fce 100644 --- a/_layouts/signed.html +++ b/_layouts/signed.html @@ -8,24 +8,4 @@ layout: home {{ content }} -

- - Signed: - -

- -
    - {% 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] %} -
  1. {{ sign_items[0] | strip }}
    2. - {% endif %} - {% endfor %} -
+{% include signatures.html %} diff --git a/_layouts/signed_rtl.html b/_layouts/signed_rtl.html index 15c93887c..b6ac006e4 100644 --- a/_layouts/signed_rtl.html +++ b/_layouts/signed_rtl.html @@ -10,24 +10,4 @@ layout: home {{ content }} -

- - Signed: - -

- -
    - {% 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] %} -
  1. {{ sign_items[0] | strip }}
    2. - {% endif %} - {% endfor %} -
+{% include signatures.html %} diff --git a/index_de.md b/_translations/index_de.md similarity index 99% rename from index_de.md rename to _translations/index_de.md index d4f15ce24..2972514ec 100644 --- a/index_de.md +++ b/_translations/index_de.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: de_DE twitter: card: summary_large_image +emoji: 🇩🇪 --- 2021-03-23 diff --git a/index_es.md b/_translations/index_es.md similarity index 99% rename from index_es.md rename to _translations/index_es.md index cfae1afa2..936ec2b3d 100644 --- a/index_es.md +++ b/_translations/index_es.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: es_ES twitter: card: summary_large_image +emoji: 🇪🇸 --- 2021-03-23 diff --git a/index_fa.md b/_translations/index_fa.md similarity index 99% rename from index_fa.md rename to _translations/index_fa.md index 1d8017ee3..d9af59559 100644 --- a/index_fa.md +++ b/_translations/index_fa.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: fa_IR twitter: card: summary_large_image +emoji: 🇮🇷 --- ۱۴۰۰/۱/۳ diff --git a/index_fr.md b/_translations/index_fr.md similarity index 99% rename from index_fr.md rename to _translations/index_fr.md index 0137876d1..a63fb387f 100644 --- a/index_fr.md +++ b/_translations/index_fr.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: fr_FR twitter: card: summary_large_image +emoji: 🇫🇷 --- 2021-03-23 diff --git a/index_id.md b/_translations/index_id.md similarity index 100% rename from index_id.md rename to _translations/index_id.md diff --git a/index_it.md b/_translations/index_it.md similarity index 97% rename from index_it.md rename to _translations/index_it.md index ccb2c97cd..45d75b8f6 100644 --- a/index_it.md +++ b/_translations/index_it.md @@ -1,5 +1,6 @@ --- layout: signed +emoji: 🇮🇹 --- 23-03-2021 diff --git a/index_ko.md b/_translations/index_ko.md similarity index 99% rename from index_ko.md rename to _translations/index_ko.md index c81064eef..26464a2e3 100644 --- a/index_ko.md +++ b/_translations/index_ko.md @@ -7,6 +7,7 @@ image: /assets/social-media-preview.png locale: ko_KR twitter: card: summary_large_image +emoji: 🇰🇷 --- 2021-03-23 diff --git a/index_nl.md b/_translations/index_nl.md similarity index 100% rename from index_nl.md rename to _translations/index_nl.md diff --git a/index_pl.md b/_translations/index_pl.md similarity index 99% rename from index_pl.md rename to _translations/index_pl.md index dd3e0bff2..540658a0d 100644 --- a/index_pl.md +++ b/_translations/index_pl.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: pl_PL twitter: card: summary_large_image +emoji: 🇵🇱 --- 2021-03-23 diff --git a/index_pt_br.md b/_translations/index_pt_br.md similarity index 99% rename from index_pt_br.md rename to _translations/index_pt_br.md index 9ad6e7462..455b65594 100644 --- a/index_pt_br.md +++ b/_translations/index_pt_br.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: pt_BR twitter: card: summary_large_image +emoji: 🇧🇷 --- 2021-03-23 diff --git a/index_ro.md b/_translations/index_ro.md similarity index 99% rename from index_ro.md rename to _translations/index_ro.md index bcbd933c8..5ca00c479 100644 --- a/index_ro.md +++ b/_translations/index_ro.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: ro_RO twitter: card: summary_large_image +emoji: 🇷🇴 --- 2021-03-23 diff --git a/index_rs.md b/_translations/index_rs.md similarity index 99% rename from index_rs.md rename to _translations/index_rs.md index 3011e41ba..0639d55ed 100644 --- a/index_rs.md +++ b/_translations/index_rs.md @@ -7,6 +7,7 @@ image: /assets/social-media-preview.png locale: sr_RS twitter: card: summary_large_image +emoji: 🇷🇸 --- 2021-03-23 diff --git a/index_ru.md b/_translations/index_ru.md similarity index 99% rename from index_ru.md rename to _translations/index_ru.md index 44d360e83..207dfe683 100644 --- a/index_ru.md +++ b/_translations/index_ru.md @@ -7,6 +7,7 @@ image: /assets/social-media-preview.png locale: ru_RU twitter: card: summary_large_image +emoji: 🇷🇺 --- 2021-03-23 diff --git a/index_tl.md b/_translations/index_tl.md similarity index 99% rename from index_tl.md rename to _translations/index_tl.md index c9b6346c0..037a5c910 100644 --- a/index_tl.md +++ b/_translations/index_tl.md @@ -7,6 +7,7 @@ image: /assets/social-media-preview.png locale: tl twitter: card: summary_large_image +emoji: 🇵🇭 --- 2021-03-23 diff --git a/index_tr.md b/_translations/index_tr.md similarity index 99% rename from index_tr.md rename to _translations/index_tr.md index 01ba7d111..8ba4e3de8 100644 --- a/index_tr.md +++ b/_translations/index_tr.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: tr_TR twitter: card: summary_large_image +emoji: 🇹🇷 --- 2021-03-23 diff --git a/index_ua.md b/_translations/index_ua.md similarity index 99% rename from index_ua.md rename to _translations/index_ua.md index 350c3f087..fcf7c8671 100644 --- a/index_ua.md +++ b/_translations/index_ua.md @@ -7,6 +7,7 @@ image: /assets/social-media-preview.png locale: uk_UA twitter: card: summary_large_image +emoji: 🇺🇦 --- 2021-03-23 diff --git a/index_vi.md b/_translations/index_vi.md similarity index 99% rename from index_vi.md rename to _translations/index_vi.md index 5e8de4b17..155a242bb 100644 --- a/index_vi.md +++ b/_translations/index_vi.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: vi_VN twitter: card: summary_large_image +emoji: 🇻🇳 --- 2021-03-23 diff --git a/index_zh_cn.md b/_translations/index_zh_cn.md similarity index 99% rename from index_zh_cn.md rename to _translations/index_zh_cn.md index 2b6330e7e..1d4e44453 100644 --- a/index_zh_cn.md +++ b/_translations/index_zh_cn.md @@ -6,6 +6,7 @@ image: /assets/social-media-preview.png locale: zh_CN twitter: card: summary_large_image +emoji: 🇨🇳 --- 2021-03-23