Fix segmentation in 1-Index

1-de-index.md

@@ -0,0 +1 @@
+wiki/de/1-index.md

1-es-index.md

@@ -0,0 +1 @@
+wiki/es/1-index.md

1-fr-index.md

@@ -0,0 +1 @@
+wiki/fr/1-index.md

1-index.md

@@ -0,0 +1 @@
+wiki/en/misc/1-index.md

1-it-index.md

@@ -0,0 +1 @@
+wiki/it/1-index.md

1-ko_KR-index.md

@@ -0,0 +1 @@
+wiki/it/1-index.md

1-nb_NO-index.md

@@ -0,0 +1 @@
+wiki/nb_NO/1-index.md

1-nl-index.md

@@ -0,0 +1 @@
+wiki/nl/1-index.md

1-pt_BR-index.md

@@ -0,0 +1 @@
+wiki/pt_BR/1-index.md

1-pt_PT-index.md

@@ -0,0 +1 @@
+wiki/pt_PT/1-index.md

1-zh_CN-index.md

@@ -0,0 +1 @@
+wiki/zh_CN/1-index.md

Gemfile.lock

@@ -1,37 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     cssminify2 (2.0.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    ffi (1.15.5)
+    execjs (2.9.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
+    google-protobuf (3.24.4)
     htmlcompressor (0.4.0)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-minifier (0.1.10)
       cssminify2 (~> 2.0)
       htmlcompressor (~> 0.4)
@@ -40,40 +42,43 @@ GEM
       uglifier (~> 4.1)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-polyglot (1.5.1)
-      jekyll (>= 3.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-polyglot (1.6.0)
+      jekyll (>= 4.0, >= 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.6.2)
+    json (2.6.3)
     json-minify (0.0.3)
       json (> 0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.0)
+    public_suffix (5.0.3)
+    rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.30.0)
+    rexml (3.2.6)
+    rouge (4.1.3)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    sass-embedded (1.69.4)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby

_config.yml

@@ -7,6 +7,9 @@ default_lang:                "en"
 exclude_from_localization:   ["assets", "images", "css", "README.md", "manifest.json", "humans.txt", "sitemap.xml", "robots.txt", "404.html", "CNAME", "LICENSE.md"]
 parallel_localization:       true
 a_rootpage:                  "https://jamulus.io"
+markdown: kramdown
+kramdown:
+  input: GFM
 
 # Jamulus release binary links
 download_root_link:          "https://github.com/jamulussoftware/jamulus/releases/download/r3_10_0/"

_po4a-tools/po4a-add-language.sh

@@ -17,13 +17,13 @@ echo Creating .po files for "$new_lang"
 # Go to root directory
 cd ../
 
-# Create symlinks for 1-index.html file
-ln -s -r ./wiki/$new_lang/1-index.html ./1-$new_lang-index.html
+# Create symlinks for 1-index.md file
+ln -s -r ./wiki/$new_lang/1-index.md ./1-$new_lang-index.md
 if [ $(echo $?) == 0 ] ; then
     echo ''
-    echo 1-"$new_lang"-index.html symlink created for "$new_lang" in /
+    echo 1-"$new_lang"-index.md symlink created for "$new_lang" in /
 else
-    echo Error creating 1-"$new_lang"-index.html symlink in /
+    echo Error creating 1-"$new_lang"-index.md symlink in /
     exit 1
 fi
 

_po4a-tools/po4a-create-all-targets.sh

@@ -103,7 +103,7 @@ process_with_po4a () {
         if [ $ext == yml ] ; then
             FILE_FORMAT=yaml
             OPTION="skip_array"
-        elif [ $ext == html ] ; then
+        elif [[ $ext == html || "$filename" == *'-index' ]] ; then # '-index.md' has a markdown extension but is actually html and should be processed as such by po4a
             FILE_FORMAT=xml
             OPTION="ontagerror=warn"
         elif [ $ext == md ] ; then
@@ -128,11 +128,11 @@ process_with_po4a () {
             echo "$filename.$ext" translated into "$lang"
         fi
 
-        # Check if language is set correctly in '1-$lang-index.html'
+        # Check if language is set correctly in '1-$lang-index.md'
         if [ $filename == '1-index' ] ; then
-            if ! grep -Fxq 'lang: "'$lang'"' "$WIKI_DIR/$lang/1-index.html" ; then
-                echo replacing incorrect language tag in 1-"$lang"-index.html;
-                sed -i '0,/lang: "[^"]*"/s/lang: "[^"]*"/lang: "'$lang'"/' "$WIKI_DIR/$lang/1-index.html"
+            if ! grep -Fxq 'lang: "'$lang'"' "$WIKI_DIR/$lang/1-index.md" ; then
+                echo replacing incorrect language tag in 1-"$lang"-index.md;
+                sed -i '0,/lang: "[^"]*"/s/lang: "[^"]*"/lang: "'$lang'"/' "$WIKI_DIR/$lang/1-index.md"
             fi
         fi
 

_po4a-tools/po4a-update-templates.sh

@@ -64,7 +64,7 @@ while IFS= read -r -d '' doc ; do
         if [ $ext == yml ] ; then
             FILE_FORMAT=yaml
             OPTION="skip_array"
-        elif [ $ext == html ] ; then
+        elif [[ $ext == html || "$filename" == *'-index' ]] ; then # '-index.md' has a markdown extension but is actually html and should be processed as such by po4a
             FILE_FORMAT=xml
             OPTION="ontagerror=warn"
         elif [ $ext == md ] ; then

wiki/en/misc/1-index.md

@@ -0,0 +1,64 @@
+---
+title: "Jamulus ‒ Play music online. With friends. For free."
+lang: "en"
+permalink: /
+layout: mainhomepage
+ldjAppCategory: "Music"
+ldjSlogan: "Play music online. With friends. For free."
+ldjCreator: "Volker Fischer and contributors"
+metadescription: "Jamulus is free and open source software that lets musicians perform music, rehearse or jam together, in real time over the Internet."
+mAltProgIcon: "Jamulus icon"
+mTSlogan: "Play music online. With friends. For free."
+mTGetStartedNow: "Get started now!"
+mTDownloadNow: 'Download now for'
+mTPlatformsAnd: 'and'
+mTOtherPlatforms: 'other platforms'
+---
+[//]: # Markdown sections should not be indented, otherwise they are treated as code blocks.
+<div class="fx-row fx-row-center-xs" id="firstrow">
+  <div class="fx-col-100-xs">
+    <div itemprop="abstract">
+      <h2>What is Jamulus?</h2>
+<div markdown="1">
+Jamulus lets you play, rehearse, or jam with your friends, your band, or anyone you find online. Play together remotely in time with high quality, low-latency sound on a normal broadband connection. [Download it here!](wiki/Getting-Started)
+</div>
+    </div>
+  </div>
+</div>
+<div class="fx-row fx-row-center-xs" id="bannercontainer">
+  <div class="fx-col-100-xs">
+    <a href="wiki/Getting-Started">
+      <img alt="Jamulus Banner. Links to getting started page" src="{{ '/assets/img/jamulusbannersmall.png' | relative_url }}" id="jamulusbanner" loading="lazy" />
+    </a>
+  </div>
+</div>
+<div class="fx-row fx-row-center-xs">
+  <div class="fx-col-100-xs fx-col-50-l">
+     <h2>Jamulus worldwide</h2>
+<div markdown="1">
+All over the world Jamulus allows choirs to rehearse and rock bands to play. Jamulus brings folk and classical musicians together. It's being used for remote music lessons, in schools and universities, in private and in public — all in real time on the Internet, as if you were there in person.
+</div>
+    <h2>Help needed?</h2>
+      <p>
+<div markdown="1">
+Check out the [documentation](wiki/Getting-Started) and consider the [troubleshooting section](wiki/Client-Troubleshooting)!
+You can also ask on the [forums](https://github.com/jamulussoftware/jamulus/discussions).
+</div>
+      </p>
+  </div>
+  <div class="fx-col-100-xs fx-col-50-l">
+    <h2>Want to get involved?</h2>
+    <p>
+<div markdown="1">
+Ideas? Found a bug? Want to contribute some code or help [translating](https://github.com/jamulussoftware/jamulus/blob/main/docs/TRANSLATING.md) Jamulus into your language? Since Jamulus is [free and open source software](https://www.gnu.org/philosophy/free-sw.en.html) (FOSS) licensed under the [GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) you can help us!<br>
+<br>
+Take a look at our [contribution guidelines](wiki/Contribution) to find out how. Everybody is welcome!<br>
+<br>
+_For detailed information on how Jamulus works, see [this paper by Volker Fischer (PDF)](/PerformingBandRehearsalsontheInternetWithJamulus.pdf)._
+</div>
+    </p>
+  </div>
+  <div class="fx-col-100-xs fx-txt-center">
+    <a href="wiki/Getting-Started" class="button" rel="noreferrer">{{ page.mTGetStartedNow }}</a>
+  </div>
+</div>