translations, templates

gargantext-org-website/en/index.html

@@ -47,10 +47,10 @@ $partial("templates/sections/section-hero.html")$
             <div class="row align-items-center justify-content-around px-3">
                 <div class="col">
                     <h2 class=" section-title pb-3"><i class="fa fa-graduation-cap text-garg-gradient"
-                            aria-hidden="true"></i> <span class="text-garg-gradient"> Se former à GarganText</span></h2>
+                            aria-hidden="true"></i> <span class="text-garg-gradient"> GarganText training</span></h2>
                     <div class="section-content">
 
-                        <h3 class="my-5 pb-1 fs-4 border-bottom border-primary">Formations</h3>
+                        <h3 class="my-5 pb-1 fs-4 border-bottom border-primary">Training courses</h3>
 
                         <div class="row row-cols-1 row-cols-lg-2 g-4">
                             $for(learnFormations)$
@@ -58,7 +58,7 @@ $partial("templates/sections/section-hero.html")$
                             $endfor$
                         </div>
 
-                        <h3 class="my-5 pb-1 fs-4 border-bottom border-primary">Forum et documentation utilisateur</h3>
+                        <h3 class="my-5 pb-1 fs-4 border-bottom border-primary">User forum and documentation</h3>
 
                         <div class="row row-cols-1 row-cols-lg-2 g-4">
                             $for(learnDocumentation)$
@@ -66,7 +66,7 @@ $partial("templates/sections/section-hero.html")$
                             $endfor$
                         </div>
 
-                        <h3 class="my-5 pb-1 fs-4 border-bottom border-primary">Outils</h3>
+                        <h3 class="my-5 pb-1 fs-4 border-bottom border-primary">Tools</h3>
 
                         <div class="row row-cols-1 row-cols-lg-2 g-4">
                             $for(learnTools)$
@@ -89,12 +89,12 @@ $partial("templates/sections/section-hero.html")$
             <div class="row align-items-center justify-content-around px-3">
 
                 <h2 class="section-title pb-3"><i class="fa icon-ecosystem text-garg-gradient" aria-hidden="true"></i>
-                    <span class="text-garg-gradient"> Se connecter aux serveurs GarganText</span></h2>
+                    <span class="text-garg-gradient"> Connect to GarganText instances</span></h2>
                 <div class="section-content">
-                    <p>Pour participer à l’écosystème GarganText : connectez-vous à l’une des communautés disponibles.
+                    <p>To take part in the GarganText ecosystem: connect to one of the available communities.
                     </p>
                     <div class="my-4 fw-bold fs-5 border-bottom border-dark"><i class="fa fa-server "
-                            aria-hidden="true"></i> Choisissez parmi les serveurs thématiques :</div>
+                            aria-hidden="true"></i> Choose from themed servers:</div>
 
                     <div class="row row-cols-1 row-cols-lg-3 g-4 justify-content-center">
                         $for(servers)$

gargantext-org-website/en/tiles/learn/tools/02-istex.md

+---
+title: Istex - Page de recherche et de téléchargement de corpus au format GarganText
+description: Istex propose ici une page de recherche de publications pour constituer un corpus, puis le télécherger au format JSON pour GarganText.
+url: https://gargtools.iscpif.fr
+image: images/preview-istex.png
+---
\ No newline at end of file

gargantext-org-website/en/translation.yml

@@ -13,16 +13,18 @@ translation:
   
   # Header / Navigation
   NAV_DISCOVER          : Discover
-  NAV_LEARN             : Learn
+  NAV_LEARN             : Training
   NAV_CONNECT           : Connect
   NAV_SOURCE_CODE       : Source code
-  NAV_LANG_LINK         : <a class="nav-link flag flag-fr" aria-current="page" href="/fr" title="Version française">🇨🇵</a>
+  NAV_LANG_LINK         : <a class="nav-link flag flag-fr" aria-current="page" href="/fr" title="Version française">FR</a>
   SEE_MORE              : See more
   
   # Footer
-  NAV_LEGAL_INFO        : Legal
+  NAV_LEGAL_INFO        : Legal notice
 
   # Hero section
+  TEXT_CNRS             : Centre national de la recherche scientifique (CNRS)
+  TEXT_ISCPIF           : Institut des Systèmes Complexes de Paris Île-de-France (ISCPIF)
   LINE_1                : The complexity of your data
   LINE_2                : becomes your asset
   LINE_3                : Free. Reliable. Transparent and intelligible.

gargantext-org-website/fr/tiles/learn/tools/02-istex.md

+---
+title: Istex - Page de recherche et de téléchargement de corpus au format GarganText
+description: Istex propose ici une page de recherche de publications pour constituer un corpus, puis le télécherger au format JSON pour GarganText.
+url: https://gargtools.iscpif.fr
+image: images/preview-istex.png
+---
\ No newline at end of file

gargantext-org-website/fr/translation.yml

@@ -16,13 +16,15 @@ translation:
   NAV_LEARN             : Se former
   NAV_CONNECT           : Se connecter
   NAV_SOURCE_CODE       : Code source
-  NAV_LANG_LINK         : <a class="nav-link flag flag-en" aria-current="page" href="/en" title="English version">🇬🇧</a>
+  NAV_LANG_LINK         : <a class="nav-link flag flag-en" aria-current="page" href="/en" title="English version">EN</a>
   SEE_MORE              : Voir
   
   # Footer
   NAV_LEGAL_INFO        : Mentions légales
   
   # Hero section
+  TEXT_CNRS             : Centre national de la recherche scientifique (CNRS)
+  TEXT_ISCPIF           : Institut des Systèmes Complexes de Paris Île-de-France (ISCPIF)
   LINE_1                : La complexité de vos données
   LINE_2                : devient votre atout
   LINE_3                : Libre. Fiable. transparent et intelligible.

gargantext-org-website/site.hs

 --------------------------------------------------------------------------------
 {-# LANGUAGE OverloadedStrings #-}
-import           Data.Monoid (mappend)
-import           Hakyll
-import           Hakyll.Contrib.I18n
-                    ( Language
-                    , categoryField'
-                    , feedConfiguration
-                    , tagsField'
-                    , translate
-                    , translationCompiler
-                    , translationContext
-                    )
-import           Data.List (sortBy)
-import           Data.List.Split (splitOn)
-import           Data.Ord (comparing)
-import           Data.Text (pack)
-import           Data.Time.Clock (getCurrentTime)
-import           Data.Time.Format (formatTime, defaultTimeLocale)
-import           Network.URI (parseURI, uriAuthority, uriRegName)
-import           Debug.Trace (trace)
+import          Hakyll
+import          Hakyll.Contrib.I18n
+                ( Language
+                , categoryField'
+                , feedConfiguration
+                , tagsField'
+                , translate
+                , translationCompiler
+                , translationContext
+                )
+-- import          Hakyll.Web.Sass (sassCompiler)
+import          Data.List (sortBy)
+import          Data.List.Split (splitOn)
+import          Data.Monoid (mappend)
+import          Data.Ord (comparing)
+import          Data.Text (pack)
+import          Data.Time.Clock (getCurrentTime)
+import          Data.Time.Format (formatTime, defaultTimeLocale)
+import          Network.URI (parseURI, uriAuthority, uriRegName)
+import          Debug.Trace (trace)
 
 --------------------------------------------------------------------------------
 main :: IO ()
@@ -32,6 +33,11 @@ main = hakyllWith config $ do
     match "css/*" $ do
         route   idRoute
         compile compressCssCompiler
+    -- match "css/*.sass" $ do
+    --     route $ setExtension "css"
+    --     let compressCssItem = fmap compressCss
+    --     compile (compressCssItem <$> sassCompiler)
+
 
     -- Translations
     match "*/translation.yml" $ 
@@ -90,8 +96,8 @@ main = hakyllWith config $ do
 
             servers <- loadAll $ fromGlob $ lang ++ "/tiles/connect/*"
 
-            let discoverPresentationList = map (toFilePath . itemIdentifier) discoverPresentation
-            trace ("discoverPresentation items: " ++ show discoverPresentationList) $ return ()
+            -- let discoverPresentationList = map (toFilePath . itemIdentifier) discoverPresentation
+            -- trace ("discoverPresentation items: " ++ show discoverPresentationList) $ return ()
 
             currentYear <- unsafeCompiler getCurrentYear
             let indexCtx =

gargantext-org-website/templates/footer.html

 <footer class="bg-green justify-content-center align-items-center text-center p-4 mt-5">
     <div class="footer-bottom text-light text-center py-5 "><a href="https://gitlab.iscpif.fr/gargantext/main/raw/master/LICENSE" target="_blank" class="text-light">$translate("NAV_LEGAL_INFO")$ <i class="fa fa-external-link " aria-hidden="true"></i></a> - © GarganText $year$</div>
     <ul class="logos list-unstyled list-inline">
-        <li class="list-inline-item"><a href="https://www.cnrs.fr" target="_blank" class="footer-link"><img src="/images/logo-cnrs-white.png" alt="$translate("NAV_LABEL_CNRS")$" class="logo logo-iscpif"></a></li>
-        <a class="list-inline-item"><a href="https://iscpif.fr" target="_blank" class="footer-link"><img src="/images/logo-iscpif.png" alt="ISCPIF - Institut des systèmes complexes Paris Ile-de-France" class="logo logo-cnrs"></a></li>
+        <li class="list-inline-item"><a href="https://www.cnrs.fr" target="_blank" title="$translate("TEXT_CNRS")$" class="footer-link"><img src="/images/logo-cnrs-white.png" alt="$translate("TEXT_CNRS")$" class="logo logo-iscpif"></a></li>
+        <a class="list-inline-item"><a href="https://iscpif.fr" target="_blank" title="$translate("TEXT_ISCPIF")$" class="footer-link"><img src="/images/logo-iscpif.png" alt="$translate("TEXT_ISCPIF")$" class="logo logo-cnrs"></a></li>
     </ul>
 </footer>

gargantext-org-website/templates/sections/section-hero.html

@@ -23,8 +23,8 @@
                 <div class="hero-logo-wrapper position-relative m-auto">
                     <img src="/images/logo.svg" alt="$title$" width="160" alt="GarganText">
                     <ul class="logos-small position-absolute list-unstyled m-0">
-                        <li class=""><img src="/images/logo-cnrs-white.png" title="CNRS - Centre national de la recherche scientifique" alt="CNRS - Centre national de la recherche scientifique" class="logo logo-cnrs" width="45"></li>
-                        <li class="pt-2"><img src="/images/logo-iscpif.png" title="ISCPIF - Institut des systèmes complexes Paris Ile-de-France" alt="ISCPIF - Institut des systèmes complexes Paris Ile-de-France" class="logo logo-iscpif" width="40"></li>
+                        <li class=""><img src="/images/logo-cnrs-white.png" title="$translate("TEXT_CNRS")$" alt="$translate("TEXT_CNRS")$" class="logo logo-cnrs" width="45"></li>
+                        <li class="pt-2"><img src="/images/logo-iscpif.png" title="$translate("TEXT_ISCPIF")$" alt="$translate("TEXT_ISCPIF")$" class="logo logo-iscpif" width="40"></li>
                     </ul>
                 </div>
                 <h1 class="text-white py-4">