Fixes and improvements in preparation for i18n

- Home page: - Replace link to kde-apps.org with apps.kde.org - Make the news summaries shorter - Improve styles a bit - News: - Create a layout for news so writer doesn't need to duplicate as much - Fix typos

Fixes and improvements in preparation for i18n
- Home page: - Replace link to kde-apps.org with apps.kde.org - Make the news summaries shorter - Improve styles a bit - News: - Create a layout for news so writer doesn't need to duplicate as much - Fix typos
2b2eded6 · Phu Nguyen · ffbe1c79 · 2b2eded6 · 2b2eded6 · 2b2eded6
Commit 2b2eded6 authored Jan 22, 2023 by Phu Nguyen
--- a/config.yaml
+++ b/config.yaml
 baseURL: https://skrooge.org/
-defaultcontentlanguage: en
 enableGitInfo: true
 enableRobotsTXT: true
 i18n:
@@ -12,11 +11,9 @@ i18n:
  others:
  - title
  - description
-  - menu
  - strings
 languages:
  en:
-    contentDir: content/
    languageCode: en
    languageName: English
    params:
@@ -53,3 +50,4 @@ params:
  showLinkFooter: false
  showPatrons: false
 rssLimit: 5
+summaryLength: 15
--- a/content/_index.md
+++ b/content/_index.md
@@ -12,14 +12,9 @@ Based on its KDE foundations, Skrooge can run on many platforms, including of co

 Skrooge is part of [KDE](http://extragear.kde.org), and is released under the [GPL](http://en.wikipedia.org/wiki/GNU_General_Public_License) V3 licence.

-*   General User Information : [KDE Userbase](http://userbase.kde.org/Skrooge)
-*   The git repository : [KDE invent](https://invent.kde.org/office/skrooge)
-*   Bugs and Wishes : [KDE Bugtracker](https://bugs.kde.org/enter_bug.cgi?format=guided&product=skrooge)
-*   Forum : [KDE Forum](https://forum.kde.org/viewforum.php?f=210)
-*   The dedicated page in [KDE-Apps](http://kde-apps.org/content/show.php/skrooge?content=92458)
-*   Documentation : in case the Skrooge handbook is not installed on your machine, you may browse it [online](https://docs.kde.org/?application=skrooge).
-
-[![](https://img.shields.io/badge/Skrooge%20stable%20release-2.28.0-green.svg)](/download/)
-![](https://badgen.net/snapcraft/v/skrooge) 
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/7151/badge.svg) ](https://scan.coverity.com/projects/skrooge)
-[![](https://bestpractices.coreinfrastructure.org/projects/6539/badge)](https://bestpractices.coreinfrastructure.org/projects/6539)
+* General user information: [KDE Userbase](http://userbase.kde.org/Skrooge)
+* The git repository: [KDE Invent](https://invent.kde.org/office/skrooge)
+* Bugs and wishes: [KDE Bugtracker](https://bugs.kde.org/enter_bug.cgi?format=guided&product=skrooge)
+* Forum: [KDE Forum](https://forum.kde.org/viewforum.php?f=210)
+* The dedicated page on [KDE Applications](http://apps.kde.org/skrooge)
+* Documentation: in case the Skrooge handbook is not installed on your machine, you may browse it [online](https://docs.kde.org/?application=skrooge).
--- a/content/features.md
+++ b/content/features.md
@@ -7,9 +7,10 @@ menu:
 ## Classical features

 ### Like in a web browser
+
 |            |             |
 |:----------:|:------------|
-| ![](/images/multi_tabs.png) | Several tabs to help you organize your work. | 
+| ![](/images/multi_tabs.png) | Several tabs to help you organize your work. |
 | ![](/images/back_forward.png) | Navigate like in a browser. | 
 | ![](/images/bookmarks_browser.png) | Bookmark your preferred reports, graphs, filters, pages, ... | 

@@ -28,7 +29,7 @@ menu:
 ### Multi currencies.
 |            |             |
 |:----------:|:------------|
-| ![](/images/units.png) | Manage all our currencies, stocks, assets.<br>You can download stocks and currencies prices from many sources too. |
+| ![](/images/units.png) | Manage all our currencies, stocks, assets.<br>You can download stocks and currencies prices from many sources too. |

 ### Manage payees.
 |            |             |
@@ -39,22 +40,22 @@ menu:

 |            |             |
 |:----------:|:------------|
-| Build the graph you want to well undestand how your spend your money.<br>Have a look to the periodic reports (monthly, annually, ...) to undestand the progress.<br>Have a quick look on the dashboard. Skrooge is also able to give you advice based on your behavior. | ![](/images/reports.png) |`
+| Build the graph you want to well understand how your spend your money.<br>Have a look to the periodic reports (monthly, annually, ...) to understand the progress.<br>Have a quick look on the dashboard. Skrooge is also able to give you advice based on your behavior. | ![](/images/reports.png) |`

 ### Budget

 |            |             |
 |:----------:|:------------|
-| Budgeting isn’t about restriction.<br>It’s about setting and reaching your goals.<br>Skrooge can help you to manage your budgets by putting in places simples rules. | ![](/images/budgets.png) |
+| Budgeting isn't about restriction.<br>It's about setting and reaching your goals.<br>Skrooge can help you to manage your budgets by putting in places simple rules. | ![](/images/budgets.png) |


 ### Import your accounts from many sources

 Skrooge is able to import transactions from many formats (AFB120, QIF, CSV, MT940, OFX, QFX, ...).

-For a more reach import, Skrooge is able to import documents from many applications (KMYMONEY, Microsoft Money, GNUCASH, GRISBI, HOMEBANK and MONEY MANAGER EX).
+For a richer import, Skrooge is able to import documents from many applications (KMYMONEY, Microsoft Money, GNUCASH, GRISBI, HOMEBANK and MONEY MANAGER EX).

-And better, Skrooge is able to import directly transactions from all your banks web sites in one click.
+And better, Skrooge is able to import directly transactions from all your banks websites in one click.

 | Format   |      Comments      |  Import | Export |
 |----------|:------------------:|:-------:|:------:|
@@ -74,7 +75,7 @@ And better, Skrooge is able to import directly transactions from all your banks
 | .mmb | The [Money Manager Ex](https://moneymanagerex.org/) file format. | ![](/images/ok.png) | |
 | .mny | The Microsoft Money file format. | ![](/images/ok.png) | |
 | .json | The javascript file format. | | ![](/images/ok.png) |
-| .xml | The skrooge XML file format. | ![](/images/ok.png) | ![](/images/ok.png) |
+| .xml | The Skrooge XML file format. | ![](/images/ok.png) | ![](/images/ok.png) |
 | .xml | The [ISO 20022](https://www.iso20022.org/) XML file format. | ![](/images/ok.png) | |
 | Direct import | The direct import from banks is done with [woob](https://woob.tech/). | ![](/images/ok.png) | |

@@ -105,7 +106,7 @@ Really useful after an import.
 ### Dashboard
 |            |              |
 |:----------:|:------------:|
-| ![](/images/dashboard_categories.png)<br>![](/images/dashboard_banks_light.png) | You can design your dashboard by using many differents components. |
+| ![](/images/dashboard_categories.png)<br>![](/images/dashboard_banks_light.png) | You can design your dashboard by using many different components. |

 ### Reports
 |            |             |
@@ -134,9 +135,9 @@ If you want, you can build your own report template too.

 A Skrooge user kindly took some of his time to craft some videos:

-* Skrooge tutorial #1 [http://vimeo.com/27796633](http://vimeo.com/27796633)
-* Skrooge tutorial #2 [http://vimeo.com/27808880](http://vimeo.com/27808880)
-* Skrooge tutorial #3 [http://vimeo.com/27893118](http://vimeo.com/27893118)
+* Skrooge tutorial #1 [http://vimeo.com/27796633](http://vimeo.com/27796633)
+* Skrooge tutorial #2 [http://vimeo.com/27808880](http://vimeo.com/27808880)
+* Skrooge tutorial #3 [http://vimeo.com/27893118](http://vimeo.com/27893118)

 He also created a comparison between Skrooge, Gnucash and Homebank:
 [http://vimeo.com/27799084](http://vimeo.com/27799084)
--- a/content/help.md
+++ b/content/help.md
@@ -9,17 +9,17 @@ Are you looking for help using Skrooge ? Here is a list of useful locations
 ## Forum
 As a standard [KDE](https://kde.org) application, Skrooge questions can be asked on the KDE Forum, specifically in the office section:

-[Take me to the forum !](https://forum.kde.org/viewforum.php?f=210&sid=1763a05f65212d8220bb82781e5155a4)
+[Take me to the forum!](https://forum.kde.org/viewforum.php?f=210&sid=1763a05f65212d8220bb82781e5155a4)

 ## Documentation
 Skrooge documentation is supposed to be installed along the application when using your distribution's packages. If for some reason it is not there, or outdated, you may read it online:

-[Take me to the online doc !](https://docs.kde.org/development/en/extragear-office/skrooge/index.html)
+[Take me to the online doc!](https://docs.kde.org/development/en/extragear-office/skrooge/index.html)

 ## Wiki
 Skrooge uses the [KDE Wiki](https://userbase.kde.org). As with any wiki, you are encouraged to contribute :)

-[Take me to the Wiki !](https://userbase.kde.org/Skrooge)
+[Take me to the Wiki!](https://userbase.kde.org/Skrooge)

 ## FAQ
-You may find answers to your questions at our own [FAQ](/faq)
+You may find answers to your questions at our own [FAQ](/faq).
--- a/content/news/Skrooge_2.24.6_released.md
+++ b/content/news/Skrooge_2.24.6_released.md
 ---
 date: 2020-12-06
 title: Skrooge 2.24.6 released
+layout: news
 ---
-The [Skrooge](http://skrooge.org) Team announces the release 2.24.6 version of its popular Personal Finances Manager based on [KDE Frameworks](http://kde.org). 
+{{< i18n "news.intro" "2.24.6" >}}

 ### Changelog

-*   Correction bug 424728: Skrooge reconciliation should play happy sounds when delta is 0 and when you validate pointed operations  
+*   Correction bug 424728: Skrooge reconciliation should play happy sounds when delta is 0 and when you validate pointed operations
 *   Correction bug 425208: Import of .gnucash failed
 *   Correction bug 421302: The ability to create aliases for accounts to assist with import
 *   Correction: Ledger-cli export doesn't export negative values in the correct format
 *   Feature: DBUS is now optional (useful for MacOS)Feature: In monthly reports, the templates are now able to filter on the selected period
 *   Feature: Import Ledger
-
-### Get it, Try it, Love it...
-
-Grab Skrooge from your distro's packaging system. If it is not yet included in repositories, go [get it from our website](http://skrooge.org/download), and bug your favorite distro for inclusion.
-
-Now, you can try the **appimage** or the **flatpak** too !
-
-### Get Involved
-
-To enhance Skrooge, we need you ! There are many ways you can help us:
-
-*   [Submit bug reports](https://bugs.kde.org/enter_bug.cgi?format=guided&product=skrooge)
-*   Discuss on the [KDE forum](http://forum.kde.org/)
-*   [Contact us](/contact), give us your ideas, explain us where we can improve...
-*   Can you design good interfaces ? Can you code ? Have webmaster skills ? Are you a billionaire looking for a worthy investment ? We will be very pleased in welcoming you in the skrooge team, [contact us](/contact) !
--- a/content/news/Skrooge_2.26.1_released.md
+++ b/content/news/Skrooge_2.26.1_released.md
 ---
 date: 2021-07-24
 title: Skrooge 2.26.1 released
+layout: news
 ---
-The [Skrooge](http://skrooge.org) Team announces the release 2.26.1 version of its popular Personal Finances Manager based on [KDE Frameworks](http://kde.org). 
+{{< i18n "news.intro" "2.26.1" >}}

 ### Changelog

@@ -14,16 +15,3 @@ The [Skrooge](http://skrooge.org) Team announces the release 2.26.1 version of i
 *   Correction: Migration on new exchangeratesapi.io APIs. Need a API key now
 *   Correction: Fix deprecated knsrc file location
 *   Feature: Add confirmation message when an import is triggered by a double click on an imported file
-
-### Get it, Try it, Love it...
-
-Grab Skrooge from your distro's packaging system. If it is not yet included in repositories, go [get it from our website](http://skrooge.org/download), and bug your favorite distro for inclusion.
-
-### Get Involved
-
-To enhance Skrooge, we need you ! There are many ways you can help us:
-
-*   [Submit bug reports](https://bugs.kde.org/enter_bug.cgi?format=guided&product=skrooge)
-*   Discuss on the [KDE forum](http://forum.kde.org/)
-*   [Contact us](/contact), give us your ideas, explain us where we can improve...
-*   Can you design good interfaces ? Can you code ? Have webmaster skills ? Are you a billionaire looking for a worthy investment ? We will be very pleased in welcoming you in the skrooge team, [contact us](/contact) !
--- a/content/news/Skrooge_2.27.0_released.md
+++ b/content/news/Skrooge_2.27.0_released.md
 ---
 date: 2022-01-22
 title: Skrooge 2.27.0 released
+layout: news
 ---
-The [Skrooge](http://skrooge.org) Team announces the release 2.27.0 version of its popular Personal Finances Manager based on [KDE Frameworks](http://kde.org). 
+{{< i18n "news.intro" "2.27.0" >}}

 ### Changelog

@@ -14,16 +15,3 @@ The [Skrooge](http://skrooge.org) Team announces the release 2.27.0 version of i
 *   Feature: New release process for appimage
 *   Feature: Unit values can be negative now (see https://forum.kde.org/viewtopic.php?f=210&t=173318)
 *   Feature: Skrooge uses now the LC\_MONETARY environement variable to use the specific locale for currency format
-
-### Get it, Try it, Love it...
-
-Grab Skrooge from your distro's packaging system. If it is not yet included in repositories, go [get it from our website](http://skrooge.org/download), and bug your favorite distro for inclusion.
-
-### Get Involved
-
-To enhance Skrooge, we need you ! There are many ways you can help us:
-
-*   [Submit bug reports](https://bugs.kde.org/enter_bug.cgi?format=guided&product=skrooge)
-*   Discuss on the [KDE forum](http://forum.kde.org/)
-*   [Contact us](/contact), give us your ideas, explain us where we can improve...
-*   Can you design good interfaces ? Can you code ? Have webmaster skills ? Are you a billionaire looking for a worthy investment ? We will be very pleased in welcoming you in the skrooge team, [contact us](/contact) !
--- a/content/news/Skrooge_2.28.0_released.md
+++ b/content/news/Skrooge_2.28.0_released.md
 ---
 date: 2022-07-30
 title: Skrooge 2.28.0 released
+layout: news
 ---
-The [Skrooge](http://skrooge.org) Team announces the release 2.28.0 version of its popular Personal Finances Manager based on [KDE Frameworks](http://kde.org). 
+{{< i18n "news.intro" "2.28.0" >}}

 ### Changelog

@@ -15,16 +16,3 @@ The [Skrooge](http://skrooge.org) Team announces the release 2.28.0 version of i
 *   Correction bug 452695: Skrooge report (Line) having issues with values above several millions
 *   Feature: The "Debug" page allows to execute multi sql orders
 *   Feature: Import .sta file as MT940
-
-### Get it, Try it, Love it...
-
-Grab Skrooge from your distro's packaging system. If it is not yet included in repositories, go [get it from our website](http://skrooge.org/download), and bug your favorite distro for inclusion.
-
-### Get Involved
-
-To enhance Skrooge, we need you ! There are many ways you can help us:
-
-*   [Submit bug reports](https://bugs.kde.org/enter_bug.cgi?format=guided&product=skrooge)
-*   Discuss on the [KDE forum](http://forum.kde.org/)
-*   [Contact us](/contact), give us your ideas, explain us where we can improve...
-*   Can you design good interfaces ? Can you code ? Have webmaster skills ? Are you a billionaire looking for a worthy investment ? We will be very pleased in welcoming you in the skrooge team, [contact us](/contact) !
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
 # header
 displayed-title:
  other: Skrooge
+
+# home
+home.recentnews:
+  other: Latest News
+home.recentnews.view-all:
+  other: View All Development News
+home.version.alt:
+  other: Badge of Skrooge version
+home.version.title:
+  other: Skrooge version
+home.snap.alt:
+  other: Badge of Skrooge Snap version
+home.snap.title:
+  other: Skrooge Snap version
+home.openssf:
+  other: OpenSSF Best Practices
+home.coverity:
+  other: Coverity Scan Build Status
+
 # download
 download.appimage.link:
  other: '[%1](%2)'
  comment: '%1 file name, %2 link'

-# home
-Home.recentnews:
-  other: "Latest News"
-Home.recentnews.view-all:
-  other: "View All Development News"
-Home.recentnews.read-more:
-  other: "Read More"
+# news
+news.intro:
+  other: 'The [Skrooge](http://skrooge.org) Team announces the release %1 version of its popular Personal Finances Manager based on [KDE Frameworks](http://kde.org).'
+  comment: '%1 version number'
+news.grab.title:
+  other: 'Get it, Try it, Love it...'
+news.grab:
+  other: 'Grab Skrooge from your distro''s packaging system. If it is not yet included in repositories, go [get it from our website](/download), and bug your favorite distro for inclusion.'
+news.enhance:
+  other: 'To enhance Skrooge, we need you! There are many ways you can help us:'
+news.bugs:
+  other: 'Submit bug reports'
+news.forum:
+  other: 'Discuss on the [KDE forum](http://forum.kde.org/)'
+news.contact:
+  other: '[Contact us](/contact), give us your ideas, tell us where we can improve...'
+news.welcome:
+  other: 'Can you design good interfaces? Can you code? Have webmaster skills? Are you a billionaire looking for a worthy investment? We will be very pleased to welcome you in the Skrooge team, [contact us](/contact)!'
--- a/layouts/_default/news.html
+++ b/layouts/_default/news.html
+{{ define "main" }}
+<main class="container" role="main">
+  <article class="post-content">
+    <h1>{{ .Title }}</h1>
+    <p class="meta">{{ partial "i18n_date.html" . }}</p>
+    <hr>
+
+    {{ .Content }}
+
+    <h3 id="get-it-try-it-love-it">{{ i18n "news.grab.title" }}</h3>
+    <p>{{ i18n "news.grab" | markdownify }}</p>
+    <h3 id="get-involved">{{ i18n "getinvolved.title" }}</h3>
+    <p>{{ i18n "news.enhance" }}</p>
+    <ul>
+      <li><a href="https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=skrooge">{{ i18n "news.bugs" }}</a></li>
+      <li>{{ i18n "news.forum" | markdownify }}</li>
+      <li>{{ i18n "news.contact" | markdownify }}</li>
+      <li>{{ i18n "news.welcome" | markdownify }}</li>
+    </ul>
+  </article>
+</main>
+{{ end }}
--- a/layouts/index.html
+++ b/layouts/index.html
 {{/*
 SPDX-FileCopyrightText: Pablo Marcos <kde@pablomarcos.me>
+SPDX-FileCopyrightText: 2023 Stephane Mankowski <stephane@mankowski.fr>
+SPDX-FileCopyrightText: 2023 Phu Hung Nguyen <phu@kde.org>
 SPDX-License-Identifier: LGPL-3.0-or-later
 */}}
 {{ define "main" }}
 <main id="home">
-  <section class="mt-0 pt-1 pb-4">
+  <section class="mt-0 pt-1">
    <div class="container">
-      <div class="slideshow-container">
+      <div class="slideshow-container mb-3">
        <img class="slides fade" src="/images/screenies/header1.png" style="width:100%">
        <img class="slides fade" src="/images/screenies/header2.png" style="width:100%">
        <img class="slides fade" src="/images/screenies/header3.png" style="width:100%">
      </div>
-      <br>

      {{.Content}}
+
+      <a href="/download/">
+        <figure>
+          <img src="https://img.shields.io/badge/Skrooge%20stable%20release-2.28.0-green.svg" class="img-fluid" alt="{{ i18n "home.version.alt" }}" title="{{ i18n "home.version.title" }}">
+        </figure>
+      </a>
+      <a href="/download/">
+        <figure>
+          <img src="https://badgen.net/snapcraft/v/skrooge" class="img-fluid" alt="{{ i18n "home.snap.alt" }}" title="{{ i18n "home.snap.title" }}">
+        </figure>
+      </a>
+      <a href="https://scan.coverity.com/projects/skrooge">
+        <figure>
+          <img src="https://scan.coverity.com/projects/7151/badge.svg" class="img-fluid" alt="{{ i18n "home.coverity" }}" title="{{ i18n "home.coverity" }}">
+        </figure>
+      </a>
+      <a href="https://bestpractices.coreinfrastructure.org/projects/6539">
+        <figure>
+          <img src="https://bestpractices.coreinfrastructure.org/projects/6539/badge" class="img-fluid" alt="{{ i18n "home.openssf" }}" title="{{ i18n "home.openssf" }}">
+        </figure>
+      </a>
    </div>
  </section>

-  <section class="section-green py-4">
+  <section class="section-green pt-1">
    <div class="container">
-      <h2 class="mb-3 h1">{{ i18n "Home.recentnews" }}</h2>
+      <h2 class="h1">{{ i18n "home.recentnews" }}</h2>
      <div class="row">
      {{ $pages := (.Site.GetPage "/news").RegularPagesRecursive }}
      {{ range .Site.Home.Translations }}
@@ -36,13 +58,13 @@ SPDX-License-Identifier: LGPL-3.0-or-later
              {{ .Summary | markdownify }}
            {{end}}
            {{ if .Truncated }}
-              <a href="{{ .Permalink }}" class="d-block mt-2">{{i18n "Home.recentnews.read-more" }}</a>
+              <a href="{{ .Permalink }}" class="d-block mt-2">{{i18n "read-more" }}</a>
            {{ end }}
          </div>
        </div>
      {{end}}
      </div>
-      <a href="{{ "/news" | relLangURL }}" class="learn-more mt-3" style="font-weight: bold;">&#x1F4E2; {{ i18n "Home.recentnews.view-all" }}</a>
+      <a href="{{ "/news" | relLangURL }}" class="learn-more my-3" style="font-weight: bold;">&#x1F4E2; {{ i18n "home.recentnews.view-all" }}</a>
    </div>
  </section>
 </main>