From 8d996d8734a5f0e1ce94ba9d0a93235c805fb828 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 11 Aug 2021 15:07:15 +0200 Subject: [PATCH] Now using two separate files for translated app data information, and normal metadata. --- layouts/_default/app.html | 31 ++++++++++++++++--------------- layouts/apps-list.html | 18 +++++++++--------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/layouts/_default/app.html b/layouts/_default/app.html index 0d8cee0..d1489b3 100644 --- a/layouts/_default/app.html +++ b/layouts/_default/app.html @@ -1,8 +1,9 @@ {{ $lang := .Site.Language.Lang }} {{ $appindex := .Params.SectionHeader.AppIndex }} -{{ $data := index .Site.Data $lang }} -{{ $appdata := index $data.apps $appindex }} +{{ $i18nData := index .Site.Data $lang }} +{{ $i18nAppData := index $i18nData.apps $appindex }} +{{ $AppData := index .Site.Data.metadata $appindex }} {{ $disclaimers := newScratch }} {{ $disclaimers.Set "snapcraft" false }} {{ $disclaimers.Set "firefox" false }} @@ -55,35 +56,35 @@

- {{ i18n "supportedPlatforms" }} {{ partial "platforms.html" $appdata.platforms }} + {{ i18n "supportedPlatforms" }} {{ partial "platforms.html" $AppData.platforms }}

- {{ i18n "translated" }} {{ partial "translations.html" $appdata.translated }} + {{ i18n "translated" }} {{ partial "translations.html" $AppData.translated }}

- {{ i18n "latestVersion" }}v{{ $appdata.version }} + {{ i18n "latestVersion" }}v{{ $AppData.version }}

- {{ i18n "status" }}{{ $appdata.status }} + {{ i18n "status" }}{{ $i18nAppData.status }}

- {{ i18n "programingLanguages" }}{{ delimit $appdata.languages ", " }} + {{ i18n "programingLanguages" }}{{ delimit $AppData.languages ", " }}

- {{ i18n "frameworks" }} {{ delimit $appdata.frameworks ", " | markdownify }} + {{ i18n "frameworks" }} {{ delimit $i18nAppData.frameworks ", " | markdownify }}

- {{ if $appdata.touchfriendly }} + {{ if $AppData.touchfriendly }}

{{ i18n "touchFriendly" }}

{{ end }} - {{ if $appdata.keyboardoriented }} + {{ if $AppData.keyboardoriented }}

{{ i18n "keyboardOriented" }} @@ -91,7 +92,7 @@ {{ end }}

- {{ i18n "license" }} {{ $appdata.license | markdownify }} + {{ i18n "license" }} {{ $AppData.license | markdownify }}

  @@ -103,7 +104,7 @@

{{ i18n "download" }}

- {{ i18n "downloadApp" (dict "Name" .Name "Platforms" (delimit $appdata.platforms ", ")) }} + {{ i18n "downloadApp" (dict "Name" .Name "Platforms" (delimit $AppData.platforms ", ")) }}

@@ -136,10 +137,10 @@

{{ i18n "warnExternalWebsite" "addons.mozilla.org" }} {{ else }} - {{ i18n "file" }} {{ replace .Name "" $appdata.version }}

+ {{ i18n "file" }} {{ replace .Name "" $AppData.version }}

- {{ $filename := replace .File "" $appdata.version }} - + {{ $filename := replace .File "" $AppData.version }} + {{ i18n "download" }}
diff --git a/layouts/apps-list.html b/layouts/apps-list.html index 43d40f5..9d62d59 100644 --- a/layouts/apps-list.html +++ b/layouts/apps-list.html @@ -4,33 +4,33 @@ {{ $site := .Site }} {{ range .Site.Data.list }} {{ $index := . }} - {{ $data := index $site.Data $site.Language.Lang }} - {{ with index $data.apps $index }} + {{ $i18nData := index $site.Data $site.Language.Lang }} + {{ $i18nAppData := index $i18nData.apps $index }} + {{ $AppData := index $site.Data.metadata $index }}
- +

-   {{ .name }} +   {{ $i18nAppData.name }}  

-

{{ .description }}

-

{{ i18n "status" }} {{ .status }}

+

{{ $i18nAppData.description }}

+

{{ i18n "status" }} {{ $i18nAppData.status }}

{{ i18n "worksOn" }}  - {{ partial "platforms.html" .platforms }} + {{ partial "platforms.html" $AppData.platforms }}

{{ i18n "translated" }}  - {{ partial "translations.html" .translated }} + {{ partial "translations.html" $AppData.translated }}

{{ i18n "learnMore" }}
- {{ end }} {{ end }}
{{ end }}