Skip to content

Commit

Permalink
Fix trad EN/FR
Browse files Browse the repository at this point in the history
  • Loading branch information
ionosphere committed Feb 19, 2024
1 parent d61f76c commit 55acb56
Show file tree
Hide file tree
Showing 17 changed files with 211 additions and 109 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ gem 'github-pages', '> 103', group: :jekyll_plugins

group :jekyll_plugins do
gem 'jekyll-octicons'
gem "jekyll-polyglot"
# need lazy-load support
gem 'jekyll-avatar'
gem 'jekyll-youtube'
Expand Down
6 changes: 0 additions & 6 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ kramdown:
math_engine: mathjax
syntax_highlighter: rouge

# polyglot
languages: ["en", "fr"]
default_lang: "en"
exclude_from_localization: ["javascript", "images", "css", "public"]
parallel_localization: true

unexisting_page:
en: "The page you're looking for doesn't seem to be there!"
fr: "La page demandée n'est pas présente ici !"
9 changes: 9 additions & 0 deletions _data/showcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,44 @@
video: https://www.youtube.com/embed/I7qKnWaY5tg
img: "/assets/img/projects/agopengps.png"
description: Self guidance system on existing tractor
description-fr: Autoguidage pour tracteur en 2eme monte
- name: Autoplant
video: https://www.youtube.com/embed/2Ybtjoabz_g?si=kwGgKt8rxNrkK9OI
img: "/assets/img/projects/agrogeovisio.png"
description: Self planting system on existing tractor
description-fr: "Planteuse autonome d'arbre (peuplier)"
- name: Ecoterrabot
video: https://www.youtube.com/embed/PbUobvAS0MM
img: "/assets/img/projects/ecoterra.png"
description: Autonomous precision weed picking robot
description-fr: Robot de desherbage autonome avec pince
- name: E-tract
video: https://www.youtube.com/embed/l4sHiCAmqXs?si=a8S8BQ6zDYBTy8JY
img: "/assets/img/projects/agrogeovisio.png"
description: Autonomous hoeing corn crop robot
description-fr: Desherbage autonome du maïs
- name: Intel Iris
video: https://www.youtube.com/embed/TBeyGvqpbxk
img: "/assets/img/projects/waziup.png"
description: Low-cost Autonomous Water Control
description-fr: "Systeme low cost de controle et de gestion d'irrigation"
- name: Farmbot
video: https://www.youtube.com/embed/qwSbWy_1f8w
img: "/assets/img/projects/farmbot.png"
description: All in one robot for small croping area
description-fr: Robot maraîcher tout-en-un
- name: Natuition
video: https://www.youtube.com/embed/ojdT-zIs6Po
img: "/assets/img/projects/natuition.png"
description: Autonomous precision weed picking robot on grass land
description-fr: Robot desherbeur autonome de surface enherbée
- name: "Le pré fabriqué"
video: https://www.youtube.com/embed/W_apNCuG31M?si=M99qh332Y8BKCK-S
img: "/assets/img/projects/leprefabrique.svg"
description: On premise tools for crop
description-fr: Outils de travail du sol et semoir open source et sur mesure
- name: Ekylibre
video: https://www.youtube.com/embed/odJCn2xkkWQ
img: "/assets/img/projects/ekylibre.svg"
description: all in one farm management information system
description-fr: "Solution web de gestion complète d'une exploitation agricole"
36 changes: 36 additions & 0 deletions _includes/fr-footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<footer>
<div class="container-lg p-responsive py-4 ">
<div class="d-flex flex-justify-between">
<ul class="list-style-none float-right text-small">
<li class="d-inline-block ml-lg-2"><a href="mailto:contact@osfarm.org">Contact Us</a></li>
</ul>

<a href="/" class="text-center">
<span class="sr-only">Acceuil</span>
{% octicon mark-github height:24 class:"fill-gray-light d-inline" aria-label:github-logo %}
</a>

<ul class="list-style-none float-left text-small">
<li class="d-inline-block mr-lg-2"><a href="https://github.com/osfarm">Sur GitHub</a></li>
<li class="d-none d-lg-inline-block mr-lg-2"><a href="/fr/why">Pourquoi</a></li>
<li class="d-none d-lg-inline-block mr-lg-2"><a href="/fr/community">Solutions</a></li>
</ul>
</div>

<p class="border-top text-center f5 mt-4 pt-4">&copy; 2023 - {{ site.time | date: '%Y' }} <span>OSFarm</span>, Inc. and contributors</p>
</div>

</footer>


<script src="{{ "/assets/vendor/anchor-js/anchor.min.js" | relative_url}}"></script>
<script src="{{ "/assets/vendor/jquery/dist/jquery.min.js" | relative_url}}"></script>
<script>anchors.add('.org-type h4');</script>
{% if page.url == "/community/" %}
<script src="{{ "/assets/js/community.js" | relative_url}}"></script>
{% elsif page.url == "/" %}
<script src="{{ "/assets/js/home.js" | relative_url}}"></script>
{% endif %}
</body>
</html>
<!-- Proudly powered by GitHub Pages ~ Generated {{ site.time }} -->
29 changes: 29 additions & 0 deletions _includes/fr-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="{{ "/assets/img/favicon.ico" | relative_url }}" type="image/x-icon">
<link rel="stylesheet" type="text/css" href="{{ "/assets/css/style.css" | relative_url }}">
<script src="https://code.highcharts.com/highcharts.js"></script>
<link rel="preload" as="font" href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i" crossorigin>
{% seo %}
</head>
<body{% if page.id %} id="{{ page.id }}"{% endif %} class="{{ page.layout }}">

<div class="page-header pt-4 pb-5">
<nav class="language-switcher">
<a href="{{ site.baseurl }}/" class="text-white">EN</a>
</nav>
<div class="container-lg">
<div class="text-center">
<a href="{{ "/fr/" | relative_url}}"><img class="logo py-3" src="{{ "/assets/img/logo_white.png" | relative_url}}" alt="OSFarm"></a>
<ul>
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/fr/why" | relative_url}}" class="text-white">Pourquoi</a></li>
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/fr/community/" | relative_url}}" class="text-white">Solutions</a></li>
<li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/fr/#contact-a-human" | relative_url}}" class="text-white">Contactez nous</a></li>
</ul>
</div>
</div>
<!-- .full-width here gets closed on support-page.html and home.html layouts -->
8 changes: 1 addition & 7 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@

<div class="page-header pt-4 pb-5">
<nav class="language-switcher">
{% if page.name contains "index" %}
<a href="{{ site.baseurl }}/" class="text-white">EN</a>
<a href="{{ site.baseurl | append: "/fr" }}" class="text-white">FR</a>
{% else %}
<a href="{{ site.baseurl | append: page.handle }}" class="text-white">EN</a>
<a href="{{ site.baseurl | append: "/fr" | append: page.handle }}" class="text-white">FR</a>
{% endif %}
<a href="{{ site.baseurl }}/fr/" class="text-white">FR</a>
</nav>
<div class="container-lg">
<div class="text-center">
Expand Down
5 changes: 5 additions & 0 deletions _layouts/fr-home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% include fr-header.html %}

{{ content }}

{% include fr-footer.html %}
25 changes: 25 additions & 0 deletions _layouts/fr-support-page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{% include fr-header.html %}
</div>
<div id="{{ page.title | replace: ' ','-' }}" class="container-lg p-responsive">
<div class="text-center my-3 my-md-6">
<h1 class="alt-h1">{{ page.title }}</h1>
<p class="alt-lead text-gray col-md-10 mx-auto">{{ page.description }}</p>
</div>
</div>

<div class="container-lg p-responsive">
{{ content }}
</div>

<!-- https://www.andreaverlicchi.eu/lazyload/ -->
<script type="text/javascript">
(function (w, d) {
var b = d.getElementsByTagName('body')[0];
var s = d.createElement("script"); s.async = true;
var v = !("IntersectionObserver" in w) ? "8.8.0" : "10.9.0";
s.src = "https://cdnjs.cloudflare.com/ajax/libs/vanilla-lazyload/" + v + "/lazyload.min.js";
w.lazyLoadOptions = {};
b.appendChild(s);
}(window, document));
</script>
{% include fr-footer.html %}
1 change: 0 additions & 1 deletion docs/en/why.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: Why
layout: support-page
permalink: /why/
description: "One stack to enroll them all"
redirect_from: "/508/"
lang: en
---
<div id="graphcontainer1" style="height: 500px"></div>
Expand Down
4 changes: 2 additions & 2 deletions docs/fr/agritech_adi.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: Agritech responsable - 15/11/2023 - 10H30
layout: support-page
layout: fr-support-page
description: « Rendez-vous de l’AgriTech responsable »
permalink: /agritech_adi/
permalink: /fr/agritech_adi/
lang: fr
---
[ADI Nouvelle Aquitaine](https://www.adi-na.fr/) organise le rendez-vous de l’AgriTech responsable le mercredi 15 novembre de 10h30 à 12h pour mieux connaître l’environnement AgriTech et créer un réseau de coopération autour de l’AgriTech responsable (répondant au juste besoin, réparable, interopérable, accessible financièrement,…)
Expand Down
30 changes: 15 additions & 15 deletions docs/fr/community.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: What's behind OSFarm ?
layout: support-page
description: Projects, Peoples, Organizations link with OSFarm. If you don't see your organization on this list, follow the instructions below !
permalink: /community/
title: Quels sont les projets dans OSFarm ?
layout: fr-support-page
description: Projets en lien avec OSFarm. Si vous souhaitez ajouter un projet, suivez les instructions en bas de la page !
permalink: /fr/community/
lang: fr
---
<div id="to-top" class="text-center border-top border-bottom mb-3 mb-md-5">
Expand All @@ -11,7 +11,7 @@ lang: fr
</div>
</div>

{% include project-table.html orgs=site.data.projects id="projects" name="Projects" %}
{% include project-table.html orgs=site.data.projects id="projects" name="Solutions" %}

<div id="add-org" class="border-top pt-4 pt-md-6">
<div class="clearfix gutter-spacious">
Expand All @@ -30,25 +30,25 @@ lang: fr
</li>
<li class="mb-2">Cliquer sur "Edit" (pencil) icon en haut à droite.</li>
<li class="mb-2">Ajouter votre projet dans la bonne section</li>
<li class="mb-2">Cliquer sur "propose file change" at the bottom of the page</li>
<li class="mb-2">Click "create pull request"</li>
<li class="mb-2">Provide a brief description of what you're proposing</li>
<li class="mb-2">Click "Create pull request"</li>
<li class="mb-2">Cliquer sur "propose file change" en bas de la page</li>
<li class="mb-2">Cliquer "create pull request"</li>
<li class="mb-2">Ajouter un commentaire à votre contribution</li>
<li class="mb-2">Cliquer "Create pull request"</li>
</ol>
</div>

<div class="col-md-6 float-left">
<h4 class="mb-2">Guidelines</h4>
<h4 class="mb-2">Politique</h4>
<p class="text-gray">
While there are many many interesting farming open source projects, we are limiting the list above to projects, who are:
Bien qu'il y ai des centaines de projets interessants, nous nous limitons au projets qui sont:
</p>
<ul class="mb-4 text-gray ml-3">
<li>In production state</li>
<li>With source code published</li>
<li>En phase de production</li>
<li>Dont le code source ou les données sont publiées</li>
</ul>
<h4 class="mb-2">Legalese</h4>
<h4 class="mb-2">Aspects legaux</h4>
<p class="text-gray">
Neither the inclusion of a logo or seal above should be construed to imply that OSFarm are endorsed, If you have any questions, or if would like your project's logo removed from the list above, please <a href="https://github.com/osfarm/osfarm.github.io/issues/new">let us know</a>.
Si vous remarquer l'utilisation de votre logo ou autre element sans votre accord, si vous avez une question, ou si vous souhaitez supprimer un projet de la liste, Merci de nous <a href="https://github.com/osfarm/osfarm.github.io/issues/new">le faire savoir</a>.
</p>
</div>

Expand Down
4 changes: 2 additions & 2 deletions docs/fr/france2030.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: France 2030
layout: support-page
layout: fr-support-page
description: « Innover pour réussir les transitions agroécologique et alimentaire »
permalink: /france2030/
permalink: /fr/france2030/
lang: fr
---
<p class="text-gray">
Expand Down
4 changes: 2 additions & 2 deletions docs/fr/osxp2023.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: OSXP 2023 - 07/12/2023 - 15H30
layout: support-page
layout: fr-support-page
description: « l’ecosysteme de solutions ouvertes pour le monde agricole »
permalink: /osxp2023/
permalink: /fr/osxp2023/
lang: fr
---
<p class="text-gray">
Expand Down
6 changes: 3 additions & 3 deletions docs/fr/sia2024.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
title: SIA 2024
layout: support-page
layout: fr-support-page
description: « Rendez-vous au SIA du 24/02/2024 au 03/03/2024 - Hall 4 »
permalink: /sia2024/
permalink: /fr/sia2024/
lang: fr
---
[La ferme digitale](https://www.lafermedigitale.fr/) réunis tous les ans plus de 140 partenaires et startups lors du salon de l'agriculture.

Cette année, nous aurons le plaisir de vous présenter, en avant première, nos premiers projets OSFarm.
Cette année, nous aurons le plaisir de vous présenter, en avant première, nos projets OSFarm sur le Stand d'Ekylibre et de Brad technologies - Hall 4.
9 changes: 4 additions & 5 deletions docs/why.md → docs/fr/why.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
---
title: Why
layout: support-page
permalink: /why/
description: "One stack to enroll them all"
redirect_from: "/508/"
title: Pourquoi
layout: fr-support-page
permalink: /fr/why/
description: "3 anneaux pour les embarquer tous"
lang: fr
---
<div id="graphcontainer1" style="height: 500px"></div>
Expand Down
Loading

0 comments on commit 55acb56

Please sign in to comment.