fixed minor error with short title

Dockerfile

@@ -8,8 +8,20 @@ WORKDIR /blog
 
 RUN pip3 install -r requirements.txt
 
+RUN apt-get update && \
+    apt-get install -y locales && \
+    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
+    sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
 VOLUME /blog/templates/entry
 
+VOLUME /blog/static/graphics
+
 EXPOSE 5000
 
 ENTRYPOINT [ "python3" ]

README.md

@@ -26,6 +26,9 @@ via plain text files.
 - [x] Switchable CSS
   - [x] CSS dark-theme
   - [x] CSS light-theme
+- [x] Language Support
+  - [x] English
+  - [x] German
 - [x] Config file
 - [x] Docker installation
 - [x] Logo
@@ -59,11 +62,12 @@ The `config.py` can be found in the `src` folder.
 Set the following volumes with the -v tag.
 
 | Volume-Name   | Container mount         | Description                                                  |
-| ------------- | --------------------------- | ------------------------------------------------------------ |
-| `config-file` | `/blog/src/config.py`       | Config file                                                  |
-| `entries`     | `/blog/src/templates/entry` | Directory for blog entries                                   |
-| `css`         | `/blog/src/static/css`      | (optional) Directory for css files                           |
-| `html`        | `/blog/src/templates`       | (optional) Directory for templates (entry-volume not needed) |
+| ------------- | ----------------------- | ------------------------------------------------------------ |
+| `config-file` | `/blog/config.py`       | Config file                                                  |
+| `entries`     | `/blog/templates/entry` | Directory for blog entries                                   |
+| `graphics`    | `/blog/static/graphics` | Directory for images needed for entries                      |
+| `css`         | `/blog/static/css`      | (optional) Directory for css files                           |
+| `html`        | `/blog/templates`       | (optional) Directory for templates (entry-volume not needed) |
 
 #### Ports
 

rebuild.sh

@@ -6,4 +6,6 @@ docker run --name beaker-blog \
     --restart unless-stopped \
     -p "5000:5000" \
     -e FLASK_ENV=development \
+    -v entries:/blog/templates/entry \
+    -v graphics:/blog/static/graphics \
     -d tiyn/beaker-blog

src/app.py

@@ -7,34 +7,41 @@ import config
 app = Flask(__name__)
 
 TITLE = config.TITLE
+STITLE = config.STITLE
 STYLE = config.STYLE
+LANGUAGE = config.LANGUAGE
 DESCRIPTION = config.DESCRIPTION
 WEBSITE = config.WEBSITE
+MAIL = config.MAIL
 
 @app.errorhandler(404)
 def page_not_found(e):
-    return render_template("error.html", title=TITLE, errorcode="404", style=STYLE), 404
+    return render_template("error.html", title=TITLE, stitle=STITLE, errorcode="404", style=STYLE, language=LANGUAGE), 404
 
 
 @app.route("/")
 @app.route("/index.html")
 def index():
     content = con_gen.gen_index_string()
-    return render_template("index.html", title=TITLE, content_string=content, style=STYLE)
+    return render_template("index.html", title=TITLE, stitle=STITLE, content_string=content, style=STYLE, language=LANGUAGE)
 
+@app.route("/imprint")
+@app.route("/imprint.html")
+def imprint():
+    return render_template("imprint.html", title=TITLE, stitle=STITLE, mail=MAIL, style=STYLE, language=LANGUAGE)
 
 @app.route("/archive")
 @app.route("/archive.html")
 def archive():
     content = con_gen.gen_arch_string()
-    return render_template("archive.html", title=TITLE, content_string=content, style=STYLE)
+    return render_template("archive.html", title=TITLE, stitle=STITLE, content_string=content, style=STYLE, language=LANGUAGE)
 
 
 @app.route("/entry/<path>")
 def entry(path):
     content = con_gen.gen_stand_string(path)
     if content != "":
-        return render_template("standalone.html", title=TITLE, content_string=content, style=STYLE)
+        return render_template("standalone.html", title=TITLE, stitle=STITLE, content_string=content, style=STYLE, language=LANGUAGE)
     abort(404)
 
 

src/config.py

@@ -1,6 +1,9 @@
 # Name/title of your blog
 TITLE = "Beaker Blog"
 
+# Short name/title of your blog
+STITLE = "Beaker Blog"
+
 # Description for RSS of your blog
 DESCRIPTION = "This is your personal Beaker Blog."
 
@@ -9,3 +12,9 @@ WEBSITE = "localhost:5000"
 
 # Theme for the blog: dark, light
 STYLE = "dark"
+
+# Language for the titles: en-us or de-de
+LANGUAGE = "en-us"
+
+# Mail address for the imprint
+MAIL = "dummy@mail.com"

src/content.py

@@ -1,12 +1,20 @@
-from datetime import datetime
-import markdown
+import locale
 import os
-from os import path
 import pathlib
+from datetime import datetime
+from os import path
 
 import config
+import markdown
 
 ENTRY_DIR = "templates/entry"
+LANGUAGE = config.LANGUAGE
+LOCAL = "de_DE.UTF-8" if LANGUAGE == "de-de" else "en_US.UTF-8"
+
+locale.setlocale(locale.LC_TIME, LOCAL)
+
+standalone_str = "Artikel" if LANGUAGE == "de-de" else "standalone"
+
 
 def gen_arch_string():
   """
@@ -19,14 +27,12 @@ def gen_arch_string():
   if path.exists(path_ex):
     name_list = os.listdir(path_ex)
     full_list = [os.path.join(path_ex, i) for i in name_list]
-        contents = sorted(full_list, key=os.path.getctime)
+    contents = sorted(full_list, key=os.path.getmtime)
     content_string = ""
     last_month = ""
     for file in reversed(contents):
-            curr_date = datetime.fromtimestamp(
-                os.path.getctime(file)).strftime("%Y-%m-%d")
-            curr_month = datetime.fromtimestamp(
-                os.path.getctime(file)).strftime("%b %Y")
+      curr_date = datetime.fromtimestamp(os.path.getmtime(file)).strftime("%Y-%m-%d")
+      curr_month = datetime.fromtimestamp(os.path.getmtime(file)).strftime("%B %Y")
       if curr_month != last_month:
         if last_month != "":
           content_string += "</ul>\n"
@@ -39,13 +45,11 @@ def gen_arch_string():
       if filename[0] != ".":
         filename = filename.split(".", 1)[0]
       content_string += "<li>"
-            content_string += curr_date + " - "
-            content_string += title + " ["
       content_string += "<a href=\"" + "/index.html#" + \
-                filename + "\">" + "link" + "</a> - "
+          filename + "\">" + curr_date + "</a> - "
       content_string += "<a href=\"" + "/entry/" + \
-                pathlib.PurePath(file).name + "\">" + "standalone" + "</a>"
-            content_string += "] <br>"
+          pathlib.PurePath(file).name + "\"><b>" + title + "</b></a>"
+      content_string += "<br>"
       content_string += "</li>\n"
     content_string += "</ul>\n"
     return content_string
@@ -63,7 +67,7 @@ def gen_index_string():
   if path.exists(path_ex):
     name_list = os.listdir(path_ex)
     full_list = [os.path.join(path_ex, i) for i in name_list]
-        contents = sorted(full_list, key=os.path.getctime)
+    contents = sorted(full_list, key=os.path.getmtime)
     for file in reversed(contents):
       filename = pathlib.PurePath(file)
       purefile = filename
@@ -73,19 +77,18 @@ def gen_index_string():
       if filename[0] != ".":
         filename = filename.split(".", 1)[0]
       content_string += "<div class=\"entry\">\n"
-            content_string += "<h2 id=\"" + filename + "\">" + title + "</h2>\n"
-            content_string += "[<a href=\"" + "/entry/" + \
+      content_string += "<h2 id=\"" + filename + "\">"
+      content_string += "<a href=\"" + "/entry/" + \
           pathlib.PurePath(file).name + "\">" + \
-                "standalone" + "</a>]<br>\n"
+          title + "</a>" +"</h2>\n"
+      content_string += "<small>" + \
+          datetime.fromtimestamp(os.path.getmtime(
+              file)).strftime("%Y-%m-%d") + "</small><br><br>"
       if file.endswith(".html"):
         for line in text:
           content_string += line
-                content_string += "<br>"
       if file.endswith(".md"):
         content_string += gen_md_content(file, 2)
-            content_string += "<small>" + \
-                datetime.fromtimestamp(os.path.getctime(
-                    file)).strftime("%Y-%m-%d") + "</small>"
       content_string += "</div>"
   return content_string
 
@@ -107,12 +110,13 @@ def gen_stand_string(path_ex):
   if path.exists(filename):
     title = open(filename).readline().rstrip("\n")
     text = open(filename).readlines()[1:]
+    curr_date = datetime.fromtimestamp(os.path.getmtime(filename)).strftime("%Y-%m-%d")
     filename_no_end = filename.split(".", 1)[0]
+    filename_no_end = filename_no_end.split("/")[-1]
     content_string += "<h1>" + title + "</h1>\n"
-        content_string += "["
     content_string += "<a href=\"" + "/index.html#" + \
-            filename_no_end + "\">" + "link" + "</a>"
-        content_string += "]<br>\n"
+        filename_no_end + "\">" + curr_date + "</a>"
+    content_string += "<br>\n"
     if filename.endswith(".html"):
       for line in text:
         content_string += line
@@ -145,9 +149,7 @@ def gen_md_content(path_ex, depth):
     markdown_text = ""
     for line in markdown_lines:
       markdown_text += line.replace("# ", header)
-        content_string = markdown.markdown(
-            markdown_text, extensions=["fenced_code", "tables"]
-        )
+    content_string = markdown.markdown(markdown_text, extensions=["fenced_code", "tables"])
   return content_string
 
 
@@ -162,7 +164,7 @@ def get_rss_string():
   if path.exists(path_ex):
     name_list = os.listdir(path_ex)
     full_list = [os.path.join(path_ex, i) for i in name_list]
-        contents = sorted(full_list, key=os.path.getctime)
+    contents = sorted(full_list, key=os.path.getmtime)
     content_string = ""
     for file in reversed(contents):
       filename = pathlib.PurePath(file)
@@ -176,7 +178,7 @@ def get_rss_string():
       content_string += "<guid>" + config.WEBSITE + \
           "/index.html#" + filename + "</guid>\n"
       content_string += "<pubDate>" + \
-                datetime.fromtimestamp(os.path.getctime(file)).strftime(
+          datetime.fromtimestamp(os.path.getmtime(file)).strftime(
               "%Y-%m-%d") + "</pubDate>\n"
       content_string += "<description>"
       for line in text:

src/requirements.txt

@@ -1,2 +1,2 @@
-Flask==2.3.2
-Markdown==3.1.1
+Flask
+Markdown

src/static/css/dark.css

@@ -51,11 +51,13 @@ span {
 
 .hide-menu:hover,
 .main-menu a:hover,
+.main-menu-dropdown a:hover,
 .show-menu:hover {
     color: var(--menulink1);
 }
 
-.main-menu a {
+.main-menu a,
+.main-menu-dropdown a {
     color: var(--menulink0);
 }
 

src/static/css/light.css

@@ -6,7 +6,7 @@
     --error: rgb(255,0,0);
     --footerbg0: rgb(192,192,192);
     --link0: rgb(0,0,120);
-    --link1: rgb(255,255,255);
+    --link1: rgb(192,192,192);
     --menulink0: rgb(0,0,120);
     --menulink1: rgb(255,255,255);
     --menubg0: rgb(192,192,192);
@@ -32,6 +32,14 @@ footer {
     color: var(--text0);
 }
 
+.footer a {
+    color: var(--menulink0);
+}
+
+.footer a:hover {
+    color: var(--menulink1);
+}
+
 span {
     color: var(--text1);
 }
@@ -51,11 +59,13 @@ span {
 
 .hide-menu:hover,
 .main-menu a:hover,
+.main-menu-dropdown a:hover,
 .show-menu:hover {
     color: var(--menulink1);
 }
 
-.main-menu a {
+.main-menu a,
+.main-menu-dropdown a {
     color: var(--menulink0);
 }
 

src/static/css/style.css

@@ -76,9 +76,14 @@ footer .center {
     padding-top: 10px;
 }
 
-.main-menu-dropdown span {
+
+.main-menu-dropdown img {
     float: left;
-    font-family: monospace;
+}
+.main-menu-dropdown span,
+.main-menu-dropdown a {
+    float: left;
+    font-family: Georgia, serif;
     font-size: 30px;
     font-weight: bold;
     line-height: 100px;
@@ -90,7 +95,7 @@ footer .center {
 
 .main-menu {
     float: right;
-    font-family: monospace;
+    font-family: Georgia, serif;
     font-size: 30px;
     font-weight: bold;
     line-height: 100px;
@@ -155,15 +160,59 @@ footer .center {
 .entry {
     border-radius: 0 10px 30px 0;
     margin-bottom: 20px;
-    padding: 10px;
+    padding-left: 20px;
 }
 
-.entry h1,
-.entry h2 {
-    margin: 5px auto 2px auto;
+h1, h2 {
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
+h3 {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.imprint h1:first-child {
+    padding-bottom: 20px;
+}
+
+.blog h1:first-child {
+    padding-bottom: 20px;
+}
+
+.entry h2:first-child {
+    padding-top: 0;
+    padding-bottom: 0;
 }
 
 .entry ul {
     padding-left: 20;
 }
 
+figure {
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
+.entry figure:last-child {
+    padding-bottom:0
+}
+
+ul {
+    padding-left:20px;
+}
+
+ol {
+    padding-left:20px;
+}
+
+code {
+    border-radius: 25px;
+    padding-left: 20px;
+    padding-right: 20px;
+    page-break-inside: avoid;
+    font-family: monospace;
+    white-space: pre;
+    display: inline-block
+}

src/templates/archive.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="blogarchive">
-	<h1>Archive</h1><br>
+	<h1>{% if language=="de-de" %}Archiv{% else %}Archive{% endif %}</h1><br>
         {% autoescape off %}
         {{ content_string }}
         {% endautoescape %}

src/templates/error.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="important">
-        Error<br>
+        {% if language=="de-de" %}Fehler{% else %}Error{% endif %}<br>
 	<span>{{ errorcode }}</span>
     </div>
 </div>

src/templates/imprint.html

@@ -0,0 +1,91 @@
+{% extends "template.html" %}
+{% block content %}
+<div class="container">
+  <div class="imprint">
+    <h1>{% if language=="de-de" %}Impressum{% else %}Imprint{% endif %}</h1><br>
+    {% if language=="de-de" %}
+    <h2>Kontakt:</h2>
+    <ul>
+      <li><a href='mailto:{{ mail }}'>E-Mail</a></li>
+    </ul>
+    <h2>Haftungsausschluss:</h2>
+    <h3>Haftung für Inhalte</h3>
+    <p>
+      Die Inhalte unserer Seiten wurden mit größter Sorgfalt erstellt. Für die Richtigkeit, Vollständigkeit und
+      Aktualität der Inhalte können wir jedoch keine Gewähr übernehmen. Als Diensteanbieter sind wir gemäß § 7 Abs.1
+      TMG für eigene Inhalte auf diesen Seiten nach den allgemeinen Gesetzen verantwortlich. Nach §§ 8 bis 10 TMG sind
+      wir als Diensteanbieter jedoch nicht verpflichtet, übermittelte oder gespeicherte fremde Informationen zu
+      überwachen oder nach Umständen zu forschen, die auf eine rechtswidrige Tätigkeit hinweisen. Verpflichtungen zur
+      Entfernung oder Sperrung der Nutzung von Informationen nach den allgemeinen Gesetzen bleiben hiervon unberührt.
+      Eine diesbezügliche Haftung ist jedoch erst ab dem Zeitpunkt der Kenntnis einer konkreten Rechtsverletzung
+      möglich. Bei Bekanntwerden von entsprechenden Rechtsverletzungen werden wir diese Inhalte umgehend
+      entfernen.
+    </p>
+    <h3>Haftung für Links</h3>
+    <p>
+      Unser Angebot enthält Links zu externen Webseiten Dritter, auf deren Inhalte wir keinen Einfluss haben. Deshalb
+      können wir für diese fremden Inhalte auch keine Gewähr übernehmen. Für die Inhalte der verlinkten Seiten ist
+      stets der jeweilige Anbieter oder Betreiber der Seiten verantwortlich. Die verlinkten Seiten wurden zum
+      Zeitpunkt der Verlinkung auf mögliche Rechtsverstöße überprüft. Rechtswidrige Inhalte waren zum Zeitpunkt der
+      Verlinkung nicht erkennbar. Eine permanente inhaltliche Kontrolle der verlinkten Seiten ist jedoch ohne konkrete
+      Anhaltspunkte einer Rechtsverletzung nicht zumutbar. Bei Bekanntwerden von Rechtsverletzungen werden wir
+      derartige Links umgehend entfernen.
+    </p>
+    <h3>Urheberrecht</h3>
+    <p>
+      Die durch die Seitenbetreiber erstellten Inhalte und Werke auf diesen Seiten unterliegen dem deutschen
+      Urheberrecht. Die Vervielfältigung, Bearbeitung, Verbreitung und jede Art der Verwertung außerhalb der Grenzen
+      des Urheberrechtes bedürfen der schriftlichen Zustimmung des jeweiligen Autors bzw. Erstellers. Downloads und
+      Kopien dieser Seite sind nur für den privaten, nicht kommerziellen Gebrauch gestattet. Soweit die Inhalte auf
+      dieser Seite nicht vom Betreiber erstellt wurden, werden die Urheberrechte Dritter beachtet. Insbesondere werden
+      Inhalte Dritter als solche gekennzeichnet. Sollten Sie trotzdem auf eine Urheberrechtsverletzung aufmerksam
+      werden, bitten wir um einen entsprechenden Hinweis. Bei Bekanntwerden von Rechtsverletzungen werden wir
+      derartige Inhalte umgehend entfernen.
+    </p>
+    {% else %}
+    <h2>Contact:</h2>
+    <p><a href='mailto:{{ mail }}'>E-Mail</a></p>
+    <h2>Disclaimer:</h2>
+    <h3>Liability for Content</h3>
+    <p>
+      The contents of our website have been created with the greatest possible care. However, we cannot guarantee the
+      contents' accuracy, completeness, or topicality. According to Section 7, paragraph 1 of the TMG (Telemediengesetz
+      -
+      German Telemedia Act), we as service providers are liable for our content on these pages by general laws. However,
+      according to Sections 8 to 10 of the TMG, we service providers are not obliged to monitor external information
+      transmitted or stored or investigate circumstances pointing to illegal activity. Obligations to remove or block
+      the
+      use of information under general laws remain unaffected. However, a liability in this regard is only possible from
+      the moment of knowledge of a specific infringement. Upon notification of such violations, we will remove the
+      content
+      immediately.
+    </p>
+    <h3>Liability for Links</h3>
+    <p>
+      Our website contains links to external websites, over whose contents we have no control. Therefore, we cannot
+      accept
+      any liability for these external contents. The respective provider or operator of the websites is always
+      responsible
+      for the contents of the linked pages. The linked pages were checked for possible legal violations at the time of
+      linking. Illegal contents were not identified at the time of linking. However, permanent monitoring of the
+      contents
+      of the linked pages is not reasonable without specific indications of a violation. Upon notification of
+      violations,
+      we will remove such links immediately.
+    </p>
+    <h3>Copyright</h3>
+    <p>
+      The contents and works on these pages created by the site operator are subject to German copyright law. The
+      duplication, processing, distribution, and any kind of utilization outside the limits of copyright require the
+      written consent of the respective author or creator. Downloads and copies of these pages are only permitted for
+      private, non-commercial use. In so far as the contents on this site were not created by the operator, the
+      copyrights
+      of third parties are respected. In particular, third-party content is marked as such. Should you become aware of a
+      copyright infringement, please inform us accordingly. Upon notification of violations, we will remove such
+      contents
+      immediately.
+    </p>
+    {% endif %}
+  </div>
+</div>
+{% endblock %}

src/templates/index.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="blog">
-        <h1>Index</h1><br>
+        <h1>Feed</h1><br>
         {% autoescape off %}
         {{ content_string }}
         {% endautoescape %}

src/templates/rss.xml

@@ -4,7 +4,7 @@
 <channel>
     <title>{{ title }}</title>
     <description>{{ description }}</description>
-<language>en-us</language>
+    <language>{{ language }}</language>
 <link>{{ website }}/feed.xml</link>
 <atom:link href="/feed.xml" rel="self" type="application/rss+xml" />
 

src/templates/template.html

@@ -2,19 +2,22 @@
 <head>
     <title>{{ title }}</title>
     <link href="{{ url_for('static', filename='css/' + style + '.css') }}" rel="stylesheet" type="text/css">
+    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='graphics/logo.png') }}">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width" initial-scale=1.0>
 </head>
 <body>
     <!-- Menu -->
     <div class="main-menu-dropdown">
-        <!-- <img class="logo" src="/static/images/logo.png"> -->
-        <span>{{ title }}</span>
+        <a href="{{ url_for('index') }}">
+          <img class="logo" src="{{ url_for('static', filename='graphics/logo.png') }}">
+          {{ stitle }}
+        </a>
         <input type="checkbox" id="main-menu-check">
         <label for="main-menu-check" class="show-menu">&#9776;</label>
         <div class="main-menu">
             <a href="{{ url_for('index') }}">Blog</a>
-            <a href="{{ url_for('archive') }}">Archive</a>
+            <a href="{{ url_for('archive') }}">{% if language=="de-de" %}Archiv{% else %}Archive{% endif %}</a>
             <label for="main-menu-check" class="hide-menu">X</label>
         </div>
     </div>
@@ -25,6 +28,9 @@
     <!-- Content -->
     <footer>
         <div class="center">
+            <a href="{{ url_for('imprint') }}">
+              {% if language=="de-de" %}Impressum und Kontakt{% else %}Imprint and Contact{% endif %}
+            </a><br>
             Made with <a href="https://github.com/tiyn/beaker-blog">Beaker Blog</a>.
         </div>
     </footer>