From 9407eda9d50bd6b4f4b4d66ec79ed5ac902c5bd3 Mon Sep 17 00:00:00 2001 From: Cyrille L Date: Fri, 24 Jun 2022 15:22:25 +0200 Subject: [PATCH] Fix: FR date on template only --- CHANGELOG.md | 4 ++++ control | 2 +- usr/local/bin/gsl | 2 +- var/lib/gsl/CHANGELOG.md | 4 ++++ var/lib/gsl/scripts/gsl__HTML_template | 4 +++- var/lib/gsl/scripts/gsl__post_makers | 4 ---- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f802dd..77c1a20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ GSL changes from releases. You can send an issue : - repo: https://git.a-lec.org/echolib/gsl/-/issues - Contact xmpp: im@echolib.re +## [0.1.6] +- fix: FR date on template only ; replace "-" with "/" + + ## [0.1.5} - fix: sidebar item link with add/replace diff --git a/control b/control index 266ed74..acaf0c1 100644 --- a/control +++ b/control @@ -1,5 +1,5 @@ Package: egsl -Version: 0.1.5 +Version: 0.1.6 Section: custom Priority: optional Architecture: all diff --git a/usr/local/bin/gsl b/usr/local/bin/gsl index 7249397..a87f13d 100755 --- a/usr/local/bin/gsl +++ b/usr/local/bin/gsl @@ -1,5 +1,5 @@ #!/bin/bash -# Version: 0.1.5 +# Version: 0.1.6 # file: gsl # Folder: /usr/local/bin # By echolib (XMPP: im@echolib.re) diff --git a/var/lib/gsl/CHANGELOG.md b/var/lib/gsl/CHANGELOG.md index 1f802dd..77c1a20 100644 --- a/var/lib/gsl/CHANGELOG.md +++ b/var/lib/gsl/CHANGELOG.md @@ -4,6 +4,10 @@ GSL changes from releases. You can send an issue : - repo: https://git.a-lec.org/echolib/gsl/-/issues - Contact xmpp: im@echolib.re +## [0.1.6] +- fix: FR date on template only ; replace "-" with "/" + + ## [0.1.5} - fix: sidebar item link with add/replace diff --git a/var/lib/gsl/scripts/gsl__HTML_template b/var/lib/gsl/scripts/gsl__HTML_template index 4bb43a2..c1d83cc 100644 --- a/var/lib/gsl/scripts/gsl__HTML_template +++ b/var/lib/gsl/scripts/gsl__HTML_template @@ -84,6 +84,7 @@ if [[ `grep -i "fr" <<<"$site_lang"` ]];then gsl_by="par" gsl_read="Lire l'article de" gsl_rss_info="Tous les titres de" + gsl_date="${article_Date//-//}" else gsl_welcome="Welcome page of" @@ -94,6 +95,7 @@ else gsl_by="by" gsl_read="Read the post of" gsl_rss_info="All titles from" + gsl_date="${article_Date}" fi } @@ -142,7 +144,7 @@ $(create__HTML_header)
-

$gsl_written $article_Author - $article_Date

+

$gsl_written $article_Author $gsl_the $gsl_date

$(cat "$gsl_tmp_post") diff --git a/var/lib/gsl/scripts/gsl__post_makers b/var/lib/gsl/scripts/gsl__post_makers index b792466..99f5a6c 100644 --- a/var/lib/gsl/scripts/gsl__post_makers +++ b/var/lib/gsl/scripts/gsl__post_makers @@ -633,7 +633,6 @@ unset ${!image_@} link_class="${site_css}_image-link" this_image=`grep -n "$gsl_mark_image:$header_f1" "$1" | head -n 1` [[ "$this_image" ]] || return -echo "$this_image" # local link with "+" or external link if http* # $1: field @@ -769,9 +768,6 @@ do "$HTML_image" \ ""` fi - - echo "$HTML_image" - echo sed -i "${ln}s^$mark_image^$HTML_image^" "$1" done <<<"$this_image"