From 27e0f7ac890b0a9cff59b78914a29660c4c1ac1a Mon Sep 17 00:00:00 2001 From: Tommi Date: Wed, 5 Jan 2022 20:29:51 +0100 Subject: [PATCH] French localization integration --- .ruby-version | 2 +- 404.html | 7 +- Gemfile.lock | 22 +- "Icon\r" | 0 _config.yml | 31 ++- _data/people.csv | 1 + _data/resources.csv | 7 +- _includes/comments.html | 26 +- _includes/contribute.html | 19 +- _includes/draft.html | 24 +- _includes/edit.html | 14 +- _includes/footer.html | 52 ++-- _includes/head.html | 28 +-- _includes/l10n.html | 19 +- _includes/nav.html | 64 ++--- _includes/post-tags.html | 11 - _includes/share.html | 62 ++--- _includes/theme-toggle.html | 20 -- _layouts/blankee.html | 24 -- _layouts/full.html | 4 +- _layouts/jar.html | 38 --- _layouts/page.html | 42 ++-- _layouts/post.html | 39 --- _layouts/white.html | 21 -- _layouts/wrapper.html | 17 +- _sass/_nav.scss | 100 ++++---- pages/But.md | 4 +- pages/Contribute.md | 12 +- pages/Delete.md | 12 +- pages/Learn.md | 10 +- pages/Links.md | 166 ++++++------- pages/Listen.md | 5 +- pages/Localization.md | 34 +-- pages/Path.md | 22 +- pages/Watch.md | 5 +- pages/What.md | 14 +- pages/Why.md | 150 ++++++------ fr/about.md => pages/fr/About.md | 2 +- {fr => pages/fr}/FAQ.md | 1 + {fr => pages/fr}/Home.html | 7 +- {fr => pages/fr}/Path.md | 5 +- {fr => pages/fr}/Quick.md | 3 +- {fr => pages/fr}/Why.md | 3 +- pages/index.html | 18 +- pages/it/Home.html | 52 ++-- style.scss | 403 ++++++++++++++----------------- 46 files changed, 732 insertions(+), 890 deletions(-) delete mode 100644 "Icon\r" delete mode 100644 _includes/post-tags.html delete mode 100644 _includes/theme-toggle.html delete mode 100644 _layouts/blankee.html delete mode 100644 _layouts/jar.html delete mode 100644 _layouts/post.html delete mode 100644 _layouts/white.html rename fr/about.md => pages/fr/About.md (99%) rename {fr => pages/fr}/FAQ.md (99%) rename {fr => pages/fr}/Home.html (90%) rename {fr => pages/fr}/Path.md (95%) rename {fr => pages/fr}/Quick.md (99%) rename {fr => pages/fr}/Why.md (99%) diff --git a/.ruby-version b/.ruby-version index b502146..fd2a018 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.2 +3.1.0 diff --git a/404.html b/404.html index 057f642..d5dd4fb 100644 --- a/404.html +++ b/404.html @@ -2,11 +2,10 @@ permalink: /404.html layout: full sitemap: false -title: "404" -link: "javascript:history.go(-1)" -image: "https://assets.tommi.space/logos/404.jpg" +title: 404 +link: 'javascript:history.go(-1)' --- -
+
Unfortunately, this page is now the same
as my social media accounts:
non-existing. diff --git a/Gemfile.lock b/Gemfile.lock index 74462a3..6ded4b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,19 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4.1) + activesupport (7.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) coderay (1.1.3) colorator (1.1.0) concurrent-ruby (1.1.9) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) ethon (0.15.0) ffi (>= 1.15.0) eventmachine (1.2.7) @@ -23,15 +22,15 @@ GEM html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (3.19.2) + html-proofer (3.19.3) addressable (~> 2.3) mercenary (~> 0.3) - nokogumbo (~> 2.0) + nokogiri (~> 1.12) parallel (~> 1.3) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (1.8.11) concurrent-ruby (~> 1.0) jekyll (4.2.1) @@ -56,7 +55,7 @@ GEM pry (~> 0.10) rb-readline (~> 0.5) jekyll-email-protect (1.1.0) - jekyll-feed (0.15.1) + jekyll-feed (0.16.0) jekyll (>= 3.7, < 5.0) jekyll-last-modified-at (1.3.0) jekyll (>= 3.7, < 5.0) @@ -90,12 +89,10 @@ GEM mercenary (0.4.0) method_source (1.0.0) mini_portile2 (2.6.1) - minitest (5.14.4) + minitest (5.15.0) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) parallel (1.21.0) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -111,7 +108,7 @@ GEM ffi (~> 1.0) rb-readline (0.5.5) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) @@ -124,7 +121,6 @@ GEM unicode-display_width (1.8.0) webrick (1.7.0) yell (2.2.2) - zeitwerk (2.5.1) PLATFORMS ruby diff --git "a/Icon\r" "b/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/_config.yml b/_config.yml index 9c3205c..16f1690 100644 --- a/_config.yml +++ b/_config.yml @@ -1,26 +1,25 @@ title: Quit Social Media email: hi@quitsocialmedia.club -description: >- # this means to ignore newlines until "baseurl:" +description: >- Why and how to quit Social Media. -baseurl: "" # the subpath of your site, e.g. /blog +baseurl: '' url: https://quitsocialmedia.club author: Tommi publisher: Tommi -twitter_username: xplosionmind github_username: xplosionmind git_repository: quitsocialmedia.club future: true profile: true livereload: true strict_front_matter: true -favicon: "/favicon.svg" -image: "/logos/qsm.png" -images: "/images" -assets: "/assets" -video: "/video" -audio: "/audio" -logos: "/logos" -fonts: "https://tommi.space/fonts" +favicon: /favicon.svg +image: /logos/qsm.png +images: /images +assets: /assets +video: /video +audio: /audio +logos: /logos +fonts: 'https://tommi.space/fonts' exclude: - riordinare/ keep_files: @@ -29,7 +28,7 @@ keep_files: social: name: xplosionmind -tagline: "Living a healthier life on the web" +tagline: Living a healthier life on the web twitter: username: xplosionmind card: summary @@ -59,10 +58,10 @@ permalink: /:title defaults: - scope: - path: "" + path: '' values: - layout: "page" - lang: "en" - image: "/logos/qsm.png" + layout: page + lang: en + image: /logos/qsm.png toc: true anchors: true diff --git a/_data/people.csv b/_data/people.csv index 67fb5b1..2b0b06b 100644 --- a/_data/people.csv +++ b/_data/people.csv @@ -2,3 +2,4 @@ name,surname,url,description,nationality,what,lang Tommi,,https://tommi.space/,Tommi’s personal website,it,main l10n,it en fr Veronica,Piccolo,https://www.isoc.it/users/veronica.piccolo,Veronica Piccolo’s profile on The Internet Society forum,it,help,it en Margherita,Moro,https://mondomarghe.jidomfree.com,Margherita’s personal website,it,help,it en +LeJun,,https://github.com/le-jun,LeJun’s GitHub profile,fr,French l10n,fr en diff --git a/_data/resources.csv b/_data/resources.csv index 212c25a..e1caaa1 100644 --- a/_data/resources.csv +++ b/_data/resources.csv @@ -6,10 +6,5 @@ AlternativeTo,https://alternativeto.net/,en,,0,0,0,1,0 Switching Software,https://switching.software/,en,,0,0,0,1,0 PrivacyTools,https://privacytools.io/,en,,0,0,0,1,0 PrivacyTools,https://privacytools-it.github.io/,it,,0,0,0,1,0 -Tommi's website,https://tommi.space,it,/about,0,0,0,1,0 +Tommi’s website,https://tommi.space,it,/about,0,0,0,1,0 Intervista a Jaron Lanier - Il Tascabile,https://www.iltascabile.com/scienze/intervista-lanier/,it,,0,1,0,0,0 -,,,,0,0,0,0,0 -,,,,0,0,0,0,0 -,,,,0,0,0,0,0 -,,,,0,0,0,0,0 -,,,,0,0,0,0,0 diff --git a/_includes/comments.html b/_includes/comments.html index d5a9bda..d931f0c 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,16 +1,10 @@ -{% unless page.comments == false %} -
-
-

{% case page.lang %}{% when 'it' %}Commenti{% else %}Comments{% endcase %}

- -
-
-
-{% endunless %} +{% if page.comments %} +
+

{% case page.lang %}{% when 'it' %}Commenti{% when 'fr' %}Commentaires{% else %}Comments{% endcase %}

+ +
+
+{% endif %} diff --git a/_includes/contribute.html b/_includes/contribute.html index 7f50ec7..0af3ba1 100644 --- a/_includes/contribute.html +++ b/_includes/contribute.html @@ -1,10 +1,13 @@ -
-
+
+
🤔 - {% if page.lang == 'it' %} - Ciò che è scritto in questa pagina ti lascia perplesso, contrariato, o ti sembra manchi qualcosa? Se la risposta è affermativa, sarebbe favoloso se potessi contribuire per migliorarne i contenuti 📈! - {% else %} - What is written in this page left you puzzled, vexed, or you feel something is missing? If the answer is affirmative, you really should contribute and make it better 📈! - {% endif %} + {% case page.lang %} + {% when 'it' %} + Ciò che è scritto in questa pagina ti lascia perplesso, contrariato, o ti sembra manchi qualcosa? Se la risposta è affermativa, sarebbe favoloso se potessi contribuire per migliorarne i contenuti 📈! + {% when 'fr' %} + Est-ce que les choses écrites ici ne vous convincez pas? Si la réponse est affirmative, vous pourriez contribuer et rendre ce site meilleur 📈! + {% else %} + What is written in this page left you puzzled, vexed, or you feel something is missing? If the answer is affirmative, you really should contribute and make it better 📈! + {% endcase %}
-
\ No newline at end of file +
diff --git a/_includes/draft.html b/_includes/draft.html index 9396e57..e924ec8 100644 --- a/_includes/draft.html +++ b/_includes/draft.html @@ -1,12 +1,16 @@ -
-