Merge pull request #31 from nkdAgility/update-language-detector

Refactor translation retrieval logic for improved clarity and efficiency

Author: MrHinsh

module/layouts/_partials/functions/get-guide-translations-for-version.html

@@ -88,9 +88,12 @@
   {{ $hasPage := false }}
   {{ if $page }}
     {{ $hasPage = true }}
-    {{/* Check if page has actual content by checking plain text content and word count */}}
+    {{/* Check if page has actual body content (not just frontmatter) */}}
+    {{/* Plain contains the rendered content body without frontmatter */}}
+    {{/* Count words in Plain to ensure actual content exists, not just translated frontmatter */}}
     {{ $plainContent := trim $page.Plain " \n\r\t" }}
-    {{ $hasContent = and (gt $page.WordCount 0) (ne $plainContent "") }}
+    {{ $plainWords := split $plainContent " " | len }}
+    {{ $hasContent = gt $plainWords 10 }}
   {{ end }}
 
   {{/* Check if PDF is available and get PDF path */}}

module/layouts/_partials/functions/get-guide-translations-list.html

@@ -7,10 +7,8 @@
 {{/* Get all versions for this guide */}}
 {{ $guidePages := where .Pages "Type" "guide" }}
 
-{{/* Map to track latest version for each language */}}
-{{ $languageMap := dict }}
-
-{{/* Process all versions to find the latest for each language */}}
+{{/* Create a slice with version info for sorting */}}
+{{ $versionsWithInfo := slice }}
 {{ range $guidePages }}
   {{/* Extract version from URL path */}}
   {{ $pathParts := split .RelPermalink "/" }}
@@ -21,52 +19,53 @@
       {{ break }}
     {{ end }}
   {{ end }}
-
+  
   {{ if $version }}
-    {{/* Get available translations for this version using the dedicated function */}}
-    {{ $versionTranslations := partial "functions/get-guide-translations-for-version" . }}
-
-    {{/* Process each translation to find the latest usable version for each language */}}
-    {{ range $versionTranslations }}
-      {{ $langCode := .Language }}
+    {{/* Parse version for sorting (YYYY.M format) */}}
+    {{ $versionParts := split $version "." }}
+    {{ $year := int (index $versionParts 0) }}
+    {{ $month := int (index $versionParts 1) }}
+    {{ $sortKey := add (mul $year 100) $month }}
+    {{ $versionsWithInfo = $versionsWithInfo | append (dict "page" . "version" $version "sortKey" $sortKey) }}
+  {{ end }}
+{{ end }}
 
-      {{/* Check if this translation is usable (has content or PDF) */}}
-      {{ $isUsable := or (eq .ReadOnline true) (eq .ReadPDF true) }}
+{{/* Sort versions in DESCENDING order (newest first) */}}
+{{ $versionsWithInfo = sort $versionsWithInfo "sortKey" "desc" }}
 
-      {{/* Only process usable translations */}}
-      {{ if $isUsable }}
-        {{/* Check if we already have this language or if this version is newer */}}
-        {{ $existing := index $languageMap $langCode }}
-        {{ if not $existing }}
-          {{/* First time seeing this language, add it with version info */}}
-          {{ $translationWithVersion := merge . (dict "Version" $version) }}
-          {{ $languageMap = merge $languageMap (dict $langCode $translationWithVersion) }}
-        {{ else }}
-          {{/* Compare versions to see if this one is newer */}}
-          {{ $currentVersion := $version }}
-          {{ $existingVersion := $existing.Version }}
+{{/* Map to track best version for each language */}}
+{{ $languageMap := dict }}
 
-          {{/* Parse versions for comparison (YYYY.M format) */}}
-          {{ $currentParts := split $currentVersion "." }}
-          {{ $existingParts := split $existingVersion "." }}
+{{/* Process all versions (newest to oldest) to find best available for each language */}}
+{{ range $versionsWithInfo }}
+  {{ $guidePage := .page }}
+  {{ $version := .version }}
+  
+  {{/* Get available translations for this version using the dedicated function */}}
+  {{ $versionTranslations := partial "functions/get-guide-translations-for-version" $guidePage }}
 
-          {{ $currentYear := int (index $currentParts 0) }}
-          {{ $currentMonth := int (index $currentParts 1) }}
-          {{ $existingYear := int (index $existingParts 0) }}
-          {{ $existingMonth := int (index $existingParts 1) }}
+  {{/* Process each translation to find the best version for each language */}}
+  {{ range $versionTranslations }}
+    {{ $langCode := .Language }}
 
-          {{ $isNewer := false }}
-          {{ if gt $currentYear $existingYear }}
-            {{ $isNewer = true }}
-          {{ else if and (eq $currentYear $existingYear) (gt $currentMonth $existingMonth) }}
-            {{ $isNewer = true }}
-          {{ end }}
+    {{/* Check if this translation is usable (has content or PDF) */}}
+    {{ $isUsable := or (eq .ReadOnline true) (eq .ReadPDF true) }}
 
-          {{ if $isNewer }}
-            {{/* Update with newer version only if it's usable */}}
-            {{ $updatedTranslation := merge . (dict "Version" $currentVersion) }}
-            {{ $languageMap = merge $languageMap (dict $langCode $updatedTranslation) }}
-          {{ end }}
+    {{/* Only process usable translations */}}
+    {{ if $isUsable }}
+      {{/* Check if we already have this language */}}
+      {{ $existing := index $languageMap $langCode }}
+      {{ if not $existing }}
+        {{/* First time seeing this language, add it */}}
+        {{ $translationWithVersion := merge . (dict "Version" $version) }}
+        {{ $languageMap = merge $languageMap (dict $langCode $translationWithVersion) }}
+      {{ else }}
+        {{/* We already have this language from a newer version */}}
+        {{/* Only replace if current (older) version has ReadOnline content and existing doesn't */}}
+        {{ if and (eq .ReadOnline true) (ne $existing.ReadOnline true) }}
+          {{/* This older version has actual content, while newer version doesn't - use this one */}}
+          {{ $updatedTranslation := merge . (dict "Version" $version) }}
+          {{ $languageMap = merge $languageMap (dict $langCode $updatedTranslation) }}
         {{ end }}
       {{ end }}
     {{ end }}