0ct0pu5/bashblog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug in localized dates

Browse source
This commit is contained in:
Carles Fenollosa 2013-09-26 11:29:03 +02:00
parent 0749d22835
commit f06d299749
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bb.sh
View file

@ -297,9 +297,9 @@ create_html_page() {
echo "$title" >> "$filename" echo "$title" >> "$filename"
echo '</a></h3>' >> "$filename" echo '</a></h3>' >> "$filename"
if [ "$timestamp" == "" ]; then if [ "$timestamp" == "" ]; then
echo '<div class="subtitle">'$(LC_ALL=date_locale date +"$date_format")' &mdash; ' >> "$filename" echo '<div class="subtitle">'$(LC_ALL=$date_locale date +"$date_format")' &mdash; ' >> "$filename"
else else
echo '<div class="subtitle">'$(LC_ALL=date_locale date +"$date_format" --date="$timestamp") ' &mdash; ' >> "$filename" echo '<div class="subtitle">'$(LC_ALL=$date_locale date +"$date_format" --date="$timestamp") ' &mdash; ' >> "$filename"
fi fi
echo "$global_author</div>" >> "$filename" echo "$global_author</div>" >> "$filename"
echo '<!-- text begin -->' >> "$filename" # This marks the text body, after the title, date... echo '<!-- text begin -->' >> "$filename" # This marks the text body, after the title, date...
@ -434,7 +434,7 @@ all_posts() {
title="$(awk '/<h3><a class="ablack" href=".+">/, /<\/a><\/h3>/{if (!/<h3><a class="ablack" href=".+">/ && !/<\/a><\/h3>/) print}' $i)" title="$(awk '/<h3><a class="ablack" href=".+">/, /<\/a><\/h3>/{if (!/<h3><a class="ablack" href=".+">/ && !/<\/a><\/h3>/) print}' $i)"
echo -n '<li><a href="'$global_url/$i'">'$title'</a> &mdash;' >> "$contentfile" echo -n '<li><a href="'$global_url/$i'">'$title'</a> &mdash;' >> "$contentfile"
# Date # Date
date="$(LC_ALL=date_locale date -r "$i" +"$date_format")" date="$(LC_ALL=$date_locale date -r "$i" +"$date_format")"
echo " $date</li>" >> "$contentfile" echo " $date</li>" >> "$contentfile"
done done
echo "" echo ""
@ -493,7 +493,7 @@ list_posts() {
n=1 n=1
for i in $(ls -t *.html); do for i in $(ls -t *.html); do
if [ "$i" == "$index_file" ] || [ "$i" == "$archive_index" ]; then continue; fi if [ "$i" == "$index_file" ] || [ "$i" == "$archive_index" ]; then continue; fi
line="$n # $(awk '/<h3><a class="ablack" href=".+">/, /<\/a><\/h3>/{if (!/<h3><a class="ablack" href=".+">/ && !/<\/a><\/h3>/) print}' $i) # $(LC_ALL=date_locale date -r $i +"date_format")" line="$n # $(awk '/<h3><a class="ablack" href=".+">/, /<\/a><\/h3>/{if (!/<h3><a class="ablack" href=".+">/ && !/<\/a><\/h3>/) print}' $i) # $(LC_ALL=$date_locale date -r $i +"date_format")"
lines="${lines}""$line""\n" # Weird stuff needed for the newlines lines="${lines}""$line""\n" # Weird stuff needed for the newlines
n=$(( $n + 1 )) n=$(( $n + 1 ))
done done
@ -588,7 +588,7 @@ create_css() {
# This is the CSS file from my main page. Any other person would need it to run the blog # This is the CSS file from my main page. Any other person would need it to run the blog
# so it's attached here for convenience. # so it's attached here for convenience.
if [ "$(whoami)" == "carlesfe" ] && [ ! -f "main.css" ]; then if [ "$(whoami)" == "carlesfe" ] && [ "$(hostname)" == "mmb" ] && [ ! -f "main.css" ]; then
ln -s "../style.css" "main.css" # XXX This is clearly machine-dependent, beware! ln -s "../style.css" "main.css" # XXX This is clearly machine-dependent, beware!
elif [ ! -f "main.css" ]; then elif [ ! -f "main.css" ]; then
echo 'body{font-family:Georgia,"Times New Roman",Times,serif;margin:0;padding:0;background-color:#F3F3F3;} echo 'body{font-family:Georgia,"Times New Roman",Times,serif;margin:0;padding:0;background-color:#F3F3F3;}