Merge pull request #15 from Melkor333/multilang_content

Multilang content

12 files changed, 148 insertions, 31 deletions

diff --git a/exampleSite/data/de/content.yaml b/exampleSite/data/de/content.yaml
new file mode 100644
index 0000000..72d54c1
--- /dev/null
+++ b/exampleSite/data/de/content.yaml
@@ -0,0 +1,116 @@
+BasicInfo:
+  FirstName: Inês
+  LastName: Almeida
+  Photo: img/avatar.jpg
+  Contacts:
+    - Icon: fas fa-phone
+      Info: +44 123 456 789
+    - Icon: fas fa-envelope
+      Info: contact@ines-almeida.com
+    - Icon: fas fa-globe
+      Info: ines-almeida.com
+    - Icon: fas fa-map-marker-alt
+      Info: Portugal
+
+Profile: Deutscher Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+
+Experience:
+  - Employer: Super Coole Firma
+    Place: Oxford, UK
+    Positions:
+      - Title: Software Entwicklerin
+        Date: Jan 2020 - Jetzt
+        Details:
+          - Arcu vitae elementum curabitur vitae nunc sed velit
+          - Viverra aliquet eget sit amet tellus cras adipiscing
+          - Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat
+          - Nisl tincidunt eget nullam non nisi est
+          - Sed viverra tellus in hac.
+          - Lorem ipsum dolor sit amet, consectetur adipiscing elit
+        Badges: ['Python', 'Django', 'OOP', 'Javascript', 'HTML', 'CSS', 'Agile']
+      - Title: Software Testerin
+        Date: Mar 2019 - Jan 2020
+        Details:
+          - Nisl tincidunt eget nullam non nisi est
+          - Sed viverra tellus in hac.
+          - Lorem ipsum dolor sit amet, consectetur adipiscing elit
+        Badges: ['Python', 'BDD', 'Selenium', 'OOP', 'Agile']
+  - Employer: Eine andere Supertolle Firma
+    Place: Lisbon, PT
+    Positions:
+      - Title: Flow Cytometry Resource Specialist
+        Date: Jan 2018 - Mar 2019
+        Details:
+          - Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat
+          - Nisl tincidunt eget nullam non nisi est
+          - Sed viverra tellus in hac.
+          - Lorem ipsum dolor sit amet, consectetur adipiscing elit
+        Badges: ['Python', 'HTML', 'CSS', 'C#/Unity']
+  - Employer: Institute of Neural Engineering
+    Place: Graz, AT
+    Positions:
+      - Title: Master's Thesis Research Intern
+        Date: Oct 2016 - Jun 2017
+        Details:
+          - Arcu vitae elementum curabitur vitae nunc sed velit
+          - Viverra aliquet eget sit amet tellus cras adipiscing
+          - Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat
+          - Nisl tincidunt eget nullam non nisi est
+        Badges: ['Python', 'MATLAB', 'Data Processing', 'Paradigm Design']
+
+Education:
+  - Course: BSc & MSc in Biomedical Engineering and Biophysics
+    Place: University of Lisbon
+    Date: Sep 2012 - Nov 2017
+    Details: Specialised in data analysis
+
+Skills:
+  - Family: Programming
+    Items:
+      - Python
+      - HTML (including Jinja)
+      - Javascript
+      - CSS
+      - SASS
+      - SQL
+      - C#
+      - Bash
+      - MATLAB
+  - Family: Frameworks
+    Items:
+      - Django
+      - Flask
+      - Hugo
+      - React
+  - Family: Developer Tools
+    Items:
+      - Git
+      - Docker
+      - Jenkins
+      - AWS
+  - Family: Misc
+    Items:
+      - Adobe Tools
+      - LaTeX
+
+Languages:
+  - Name: Portuguese
+    Level: Native
+  - Name: English
+    Level: C2
+  - Name: Spanish
+    Level: B1
+  - Name: German
+    Level: B1
+
+Diplomas:
+  - ISTQB Tester Certification (2019)
+  - English Cambridge CAE (2009)
+
+Interests:
+  - Bouldering
+  - Cooking
+  - Windsurfing
+  - Bossa Nova
+  - Design
+  - Languages
diff --git a/layouts/index.html b/layouts/index.html
index fa0fd5a..bbec6a2 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -4,22 +4,23 @@
 <body>
     <div class="content">
         <div class="content__left">
-            <h1 class="mainHeading">{{.Site.Data.content.BasicInfo.FirstName}} <span>{{.Site.Data.content.BasicInfo.LastName}}</span></h1>
+            {{ $data := or (index .Site.Data .Site.Language.Lang).content .Site.Data.content }}
+            <h1 class="mainHeading">{{ $data.BasicInfo.FirstName}} <span>{{ $data.BasicInfo.LastName}}</span></h1>
 
-            {{ partial "_profile.html" . }}
-            {{ partial "_experience.html" . }}
-            {{ partial "_education.html" . }}
-            {{ partial "_references.html" . }}
+            {{ partial "_profile.html" $data }}
+            {{ partial "_experience.html" $data }}
+            {{ partial "_education.html" $data }}
+            {{ partial "_references.html" $data }}
 
         </div>
         <div class="content__right">
 
-            {{ partial "_avatar.html" . }}
-            {{ partial "_contacts.html" . }}
-            {{ partial "_skills.html" . }}
-            {{ partial "_languages.html" . }}
-            {{ partial "_diplomas.html" . }}
-            {{ partial "_interests.html" . }}
+            {{ partial "_avatar.html" $data }}
+            {{ partial "_contacts.html" $data }}
+            {{ partial "_skills.html" $data }}
+            {{ partial "_languages.html" $data }}
+            {{ partial "_diplomas.html" $data }}
+            {{ partial "_interests.html" $data }}
         </div>
     </div>
 </body>
diff --git a/layouts/partials/_avatar.html b/layouts/partials/_avatar.html
index b903168..403d962 100644
--- a/layouts/partials/_avatar.html
+++ b/layouts/partials/_avatar.html
@@ -1,7 +1,7 @@
-{{ if .Site.Data.content.BasicInfo.Photo }}
+{{ if .BasicInfo.Photo }}
     <div class="sideSection avatar">
         <div class="avatar__container">
-            <img class="avatar__img" src="{{ .Site.Data.content.BasicInfo.Photo }}" alt="photo of me">
+            <img class="avatar__img" src="{{ .BasicInfo.Photo }}" alt="photo of me">
         </div>
     </div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/_contacts.html b/layouts/partials/_contacts.html
index 8089052..57d1159 100644
--- a/layouts/partials/_contacts.html
+++ b/layouts/partials/_contacts.html
@@ -1,7 +1,7 @@
-{{ if .Site.Data.content.BasicInfo.Contacts }}
+{{ if .BasicInfo.Contacts }}
 <div class="sideSection contact">
     <ul>
-        {{ range .Site.Data.content.BasicInfo.Contacts }}
+        {{ range .BasicInfo.Contacts }}
         <li class="contact__item">
             <i class="{{ .Icon }}"></i><span>{{ .Info | safeHTML }}</span>
         </li>
diff --git a/layouts/partials/_diplomas.html b/layouts/partials/_diplomas.html
index 15f2f89..f0564da 100644
--- a/layouts/partials/_diplomas.html
+++ b/layouts/partials/_diplomas.html
@@ -1,11 +1,11 @@
-{{ if .Site.Data.content.Diplomas }}
+{{ if .Diplomas }}
 <div class="sideSection">
     <div class="sideSection__heading">
         <h2 class="sideSection__title">{{ i18n "diplomas" }}</h2>
     </div>
     <div class="sideSection__content">
         <ul>
-            {{ range .Site.Data.content.Diplomas }}
+            {{ range .Diplomas }}
             <li>{{ . | safeHTML }}</li>
             {{ end }}
         </ul>
diff --git a/layouts/partials/_education.html b/layouts/partials/_education.html
index f5021dd..a027d26 100644
--- a/layouts/partials/_education.html
+++ b/layouts/partials/_education.html
@@ -1,4 +1,4 @@
-{{ if .Site.Data.content.Education }}
+{{ if .Education }}
 <div id="education" class="section">
     <div class="section__heading">
         <h2 class="section__title">
@@ -6,7 +6,7 @@
         </h2>
     </div>
     <div class="section__content">
-        {{ range .Site.Data.content.Education }}
+        {{ range .Education }}
             <div class="education__item">
                 <h3 class="education__title">{{ .Course | safeHTML }}</h3>
                 <h4 class="education__place">{{ .Place | safeHTML }}</h4>
diff --git a/layouts/partials/_experience.html b/layouts/partials/_experience.html
index e801a3b..fd6ccc3 100644
--- a/layouts/partials/_experience.html
+++ b/layouts/partials/_experience.html
@@ -1,11 +1,11 @@
-{{ if .Site.Data.content.Experience }}
+{{ if .Experience }}
 <div id="experience" class="section">
     <div class="section__heading">
         <h2 class="section__title">{{ i18n "experience" }}</h2>
     </div>
     <div class="section__content">
         <div class="experience">
-            {{ range .Site.Data.content.Experience }}
+            {{ range .Experience }}
             <div class="experience__item">
                 <div class="experience__header">
                     <h3 class="experience__company">
diff --git a/layouts/partials/_interests.html b/layouts/partials/_interests.html
index cc09bb6..1940290 100644
--- a/layouts/partials/_interests.html
+++ b/layouts/partials/_interests.html
@@ -1,11 +1,11 @@
-{{ if .Site.Data.content.Interests }}
+{{ if .Interests }}
 <div class="sideSection">
     <div class="sideSection__heading">
         <h2 class="sideSection__title">{{ i18n "interests" }}</h2>
     </div>
     <div class="sideSection__content">
         <ul class="interests">
-            {{ range .Site.Data.content.Interests }}
+            {{ range .Interests }}
             <li class="interests__item">{{ . | safeHTML }}</li>
             {{ end }}
         </ul>
diff --git a/layouts/partials/_languages.html b/layouts/partials/_languages.html
index 1ef2c44..7b8e795 100644
--- a/layouts/partials/_languages.html
+++ b/layouts/partials/_languages.html
@@ -1,11 +1,11 @@
-{{ if .Site.Data.content.Languages }}
+{{ if .Languages }}
 <div class="sideSection">
     <div class="sideSection__heading">
         <h2 class="sideSection__title">{{ i18n "languages" }}</h2>
     </div>
     <div class="sideSection__content">
         <ul class="language">
-            {{ range .Site.Data.content.Languages }}
+            {{ range .Languages }}
             <li class="language__item">
                 <div class="language__name">{{ .Name | safeHTML }}</div>
                 <div class="language__level">{{ .Level | safeHTML }}</div>
diff --git a/layouts/partials/_profile.html b/layouts/partials/_profile.html
index d394108..c26a099 100644
--- a/layouts/partials/_profile.html
+++ b/layouts/partials/_profile.html
@@ -1,10 +1,10 @@
-{{ if .Site.Data.content.Profile }}
+{{ if .Profile }}
 <div id="profile" class="section">
     <div class="section__heading">
         <h2 class="section__title">{{ i18n "profile" }}</h2>
     </div>
     <div class="section__content">
-        <p>{{.Site.Data.content.Profile | safeHTML }}</p>
+        <p>{{ .Profile | safeHTML }}</p>
     </div>
 </div>
 {{ end }}
diff --git a/layouts/partials/_references.html b/layouts/partials/_references.html
index 2de14fe..6489bf6 100644
--- a/layouts/partials/_references.html
+++ b/layouts/partials/_references.html
@@ -1,11 +1,11 @@
-{{ if .Site.Data.content.References }}
+{{ if .References }}
 <div id="references" class="section">
     <div class="section__heading">
         <h2 class="section__title">{{ i18n "references" }}</h2>
     </div>
     <div class="section__content">
         <div class="references">
-            {{ range .Site.Data.content.References }}
+            {{ range .References }}
             <div class="references__item">
                 <div class="references__person">
                     <div class="references__header">
diff --git a/layouts/partials/_skills.html b/layouts/partials/_skills.html
index 676aaf3..966a6f8 100644
--- a/layouts/partials/_skills.html
+++ b/layouts/partials/_skills.html
@@ -1,4 +1,4 @@
-{{ if .Site.Data.content.Skills }}
+{{ if .Skills }}
 <div class="sideSection">
     <div class="sideSection__heading">
         <h2 class="sideSection__title">{{ i18n "skills" }}</h2>
@@ -6,7 +6,7 @@
     <div class="sideSection__content">
         <ul class="skills">
             <li>
-                {{ range .Site.Data.content.Skills }}
+                {{ range .Skills }}
                 <ul class="skills__group">
                     <span>{{ .Family | safeHTML }}</span>
                     {{ range .Items }}