openwrite 0.10.5__tar.gz → 0.11.0__tar.gz

{openwrite-0.10.5/openwrite.egg-info → openwrite-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.10.5
+Version: 0.11.0
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -718,6 +718,7 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Blog themes
 - Gemini protocol
 - Statistics per post
+- Multilanguage (currently English and Polish)
 
 
 ## Installation
@@ -734,7 +735,7 @@ pip install openwrite
 openwrite init
 ```
 
-3. Answer few questions about your instance to generate .env, database and create all necessary directories.
+3. Answer few questions about your instance to generate .env and create all necessary directories.
 4. Run:
 
 ```
@@ -749,7 +750,7 @@ openwrite run -d
 
 to run it in background.
 
-5. Enjoy!
+5. Default user is `admin` with password `openwrite`. You can (and should!) change it in your dashboard. Enjoy!
 
 
 #### Docker

{openwrite-0.10.5 → openwrite-0.11.0}/README.md

@@ -29,6 +29,7 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Blog themes
 - Gemini protocol
 - Statistics per post
+- Multilanguage (currently English and Polish)
 
 
 ## Installation
@@ -45,7 +46,7 @@ pip install openwrite
 openwrite init
 ```
 
-3. Answer few questions about your instance to generate .env, database and create all necessary directories.
+3. Answer few questions about your instance to generate .env and create all necessary directories.
 4. Run:
 
 ```
@@ -60,7 +61,7 @@ openwrite run -d
 
 to run it in background.
 
-5. Enjoy!
+5. Default user is `admin` with password `openwrite`. You can (and should!) change it in your dashboard. Enjoy!
 
 
 #### Docker

openwrite-0.11.0/openwrite/__init__.py

@@ -0,0 +1,273 @@
+from flask import Flask, g
+from dotenv import load_dotenv
+from werkzeug.middleware.proxy_fix import ProxyFix
+from werkzeug.exceptions import HTTPException
+import os
+from .utils.helpers import generate_nonce, get_ip
+import time
+from .utils.models import Settings, Home
+from sqlalchemy import distinct
+import bcrypt
+import json
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization
+from datetime import datetime, timezone
+
+start_time = time.time()
+
+def create_app(test_config=None):
+    if test_config is None:
+        load_dotenv()
+        db_type = os.getenv("DB_TYPE", "sqlite")
+        db_path = os.getenv("DB_PATH", "db.sqlite")
+    else:
+        db_type = test_config.get("DB_TYPE", "sqlite")
+        db_path = test_config.get("DB_PATH", "data.db")
+        load_dotenv(test_config.get("env"), override=True)
+
+    if not os.path.exists(".initialized") or test_config is not None:
+        mode = os.getenv("MODE")
+        domain = os.getenv("DOMAIN")
+        f_abs_path = os.path.abspath(__file__)
+        file_cwd = "/".join(f_abs_path.split("/")[:-1])
+        from .utils.create_db import init_db
+        init_db(db_type, db_path)
+        from .utils.models import User, Blog, Post, Settings, Home
+        from .utils.db import init_engine, SessionLocal
+        init_engine(db_type, db_path)
+        from .utils.db import SessionLocal
+        admin_password = os.urandom(16).hex()
+        hashed = bcrypt.hashpw("openwrite".encode("utf-8"), bcrypt.gensalt())
+        admin_user = User(username="admin", email="", password_hash=hashed.decode("utf-8"), verified=1, admin=1)
+        SessionLocal.add(admin_user)
+        SessionLocal.commit()
+        SessionLocal.close()
+        
+        if mode == "single":
+            key = rsa.generate_private_key(
+                public_exponent=65537,
+                key_size=2048
+            )
+
+            private_pem = key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.PKCS8,
+                encryption_algorithm=serialization.NoEncryption()
+            ).decode()
+
+            public_pem = key.public_key().public_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PublicFormat.SubjectPublicKeyInfo
+            ).decode()
+
+            now = datetime.now(timezone.utc).replace(microsecond=0)
+
+            new_blog = Blog(
+                owner=1, 
+                name="default", 
+                title=domain, 
+                index="on", 
+                access="domain",
+                description_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog description in [dashboard](http://{domain}/dashboard/edit/default)",
+                description_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog description in <a href=\"http://{domain}/dashboard/edit/default\">dashboard</a></p>",
+                css="",
+                pub_key=public_pem,
+                priv_key=private_pem,
+                theme="default",
+                created=now
+            )
+            SessionLocal.add(new_blog)
+
+        hometext_pl = """
+                 <h1 class="centered"><span style="color: #f2d2c8">cicha</span> przestrzeń na <span style="color: #5a36bf">głośne</span> myśli.</h1>
+                
+                <article class="main-content" style="text-align: center">
+                    <p><strong>Openwrite</strong> to lekka, otwartoźródłowa platforma blogowa stworzona z myślą o wolności pisania – bez reklam, trackerów i zbędnego balastu.</p><br>
+
+          - Pisz w Markdownie<br>
+          - Zainstaluj w kilka minut<br>
+          - Publikuj do sieci, przez Gemini lub na Mastodonie – jak chcesz<br>
+
+        <br>
+        <p>Bez analityki. Bez ukrytych skryptów.<br>
+        Tylko Ty, Twoje myśli i miejsce, w którym możesz je wyrazić.</p>
+        <p>Wybierz motyw. Dodaj obrazki. Śledź wyświetlenia.<br>
+        Zbuduj bloga po swojemu – minimalistycznego lub z dodatkami.</p>
+        <p><strong>To Twoje słowa. Twój blog. Twoje zasady.</strong><br><br>
+        Zacznij pisać — i odzyskaj głos.</p>
+                    </p>
+                </article>
+                <div class="action-links">
+                    <a class="btn purple" href="/register">Zarejestruj się tutaj</a>
+                    <span class="or-separator">lub</span>
+                    <a class="btn empty" href="https://main.openwrite.io/hosting">Samodzielny hosting</a>
+                </div>
+        """
+
+        hometext_en = """
+                 <h1 class="centered"><span style="color: #f2d2c8">quiet</span> space for <span style="color: #5a36bf">loud</span> thoughts.</h1>
+                
+                <article class="main-content" style="text-align: center">
+                    <p><strong>Openwrite</strong> is a lightweight, open-source blogging platform built for people who just want to write — without ads, trackers, or bloated nonsense.</p><br>
+
+          - Write in Markdown<br>
+          - Self-host in minutes<br>
+          - Publish to the open web, Gemini, or Mastodon — your choice<br>
+
+        <br>
+        <p>There’s no analytics. No hidden scripts. No engagement traps.<br>
+        Just you, your thoughts, and an honest place to share them.</p>
+        <p>Choose a theme. Add images. Track views.<br>
+        Build your blog your way — minimal or feature-rich.</p>
+        <p><strong>It’s your voice. Your blog. Your rules.</strong><br><br>
+        Start writing — and own your words.</p>
+                </article>
+                <div class="action-links">
+                    <a class="btn purple" href="/register">Register Here</a>
+                    <span class="or-separator">or</span>
+                    <a class="btn empty" href="https://main.openwrite.io/hosting">Self Host</a>
+                </div>
+        """
+
+        with open(f"{file_cwd}/utils/i18n.json", "r", encoding='utf-8') as f:
+            data = json.load(f)
+            
+        for lang, entries in data.items():
+            for key, value in entries.items():
+                SessionLocal.add(Home(language=lang, name=key, type="translation", content=value))
+
+        new_setting = Settings(name="logo", value="/static/logo.png")
+        new_home_pl = Home(language="pl", name="hometext", type="text", content=hometext_pl)
+        new_home_en = Home(language="en", name="hometext", type="text", content=hometext_en)
+        SessionLocal.add(new_setting)
+        SessionLocal.add(new_home_pl)
+        SessionLocal.add(new_home_en)
+        SessionLocal.commit()
+
+        if test_config is None:
+            with open(".initialized", "w") as f:
+                f.write("ok")
+
+    app = Flask(__name__, template_folder="templates", subdomain_matching=True, static_url_path='/static')
+    app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_port=1)
+    app.secret_key = os.getenv("SECRET_KEY")
+    app.config['SERVER_NAME'] = os.getenv("DOMAIN")
+
+    from .routes.auth import auth_bp
+    from .routes.dashboard import dashboard_bp
+    from .routes.blog import blog_bp
+    from .routes.admin import admin_bp
+    from .routes.main import main_bp
+    from .routes.upload import upload_bp
+    from .routes.federation import federation_bp
+    from .utils.db import init_engine, SessionLocal
+    from flask_cors import CORS
+    
+    CORS(app)
+
+    init_engine(db_type, db_path)    
+    from .utils.db import SessionLocal
+
+    app.register_blueprint(auth_bp)
+    app.register_blueprint(dashboard_bp)
+    app.register_blueprint(blog_bp)
+    app.register_blueprint(admin_bp)
+    app.register_blueprint(main_bp)
+    app.register_blueprint(upload_bp)
+    app.register_blueprint(federation_bp)
+
+    def _(key: str):
+        return g.trans.get(key, key)
+
+    app.jinja_env.globals['_'] = _
+
+    @app.before_request
+    def before():
+        from flask import request, session
+        from openwrite.utils.models import Home, Settings
+        g.db = SessionLocal
+        t_query = g.db.query(distinct(Home.language)).all()
+        translations = [row[0] for row in t_query]
+        lang = request.cookies.get("lang")
+        if not lang or lang not in translations:
+            accept = request.headers.get("Accept-Language", "")
+            for part in accept.split(","):
+                code = part.split("-")[0].strip().lower()
+                if code in translations:
+                    lang = code
+                    break
+        if lang not in translations:
+            lang = "en"
+
+        trans = g.db.query(Home).filter(Home.type == "translation", Home.language == lang).all()
+        
+        g.mode = os.getenv("MODE")
+        f_abs_path = os.path.abspath(__file__)
+        g.mainpath = "/".join(f_abs_path.split("/")[:-1])
+        g.trans = {t.name: t.content for t in trans if len(t.content) > 1}
+        g.alltrans = translations
+        g.lang = lang
+        g.main_domain = os.getenv("DOMAIN")
+        g.blog_limit = os.getenv("BLOG_LIMIT")
+        g.register_enabled = os.getenv("SELF_REGISTER", "no") == "yes"
+        g.upload_enabled = os.getenv("MEDIA_UPLOAD", "no") == "yes"
+        g.captcha = os.getenv("CAPTCHA_ENABLED", "no") == "yes"
+        g.fcaptcha_sitekey = os.getenv("FRIENDLY_CAPTCHA_SITEKEY", "key")
+        g.fcaptcha_apikey = os.getenv("FRIENDLY_CAPTCHA_APIKEY", "api_key")
+        g.staticdir = app.static_folder
+        g.staticurl = app.static_url_path
+        g.settings = g.db.query(Settings).all()
+
+        if session.get("userid") is not None:
+            g.user = session.get("userid")
+            g.isadmin = session.get("admin")
+        else:
+            g.user = None
+
+        g.nonce = generate_nonce()
+
+    @app.context_processor
+    def inject_globals():
+        from openwrite.utils.models import Home
+        langs = g.db.query(Home).filter_by(name="lang_name").all()
+        lang_obj = {}
+        for l in langs:
+            lang_obj[l.language] = {"name": l.content}
+        return {
+            'current_lang': g.lang,
+            'available_languages': lang_obj
+        }
+
+    @app.after_request
+    def after(response):
+        nonce = g.nonce
+        #response.headers["Content-Security-Policy"] = (
+        #    f"default-src 'none'; "
+        #    f"script-src 'self' 'nonce-{nonce}' https://cdn.jsdelivr.net http://{g.main_domain}"
+        #    f"style-src 'self'; "
+        #    f"style-src-elem 'self' http://{g.main_domain}; "
+        #    f"style-src-attr 'unsafe-inline';"
+        #    f"script-src-attr 'unsafe-inline';"
+        #    f"img-src 'self' data: http://{g.main_domain}; "
+        #    f"font-src 'self'; "
+        #    f"connect-src 'self'; "
+        #    f"base-uri 'none'; "
+        #    f"form-action 'self'; "
+        #    f"frame-ancestors 'none';"
+        #    f"frame-src https://global.frcapi.com ;"
+        #)
+        return response
+
+    @app.errorhandler(Exception)
+    def handle_exception(e):
+        if isinstance(e, HTTPException):
+            return e
+
+        app.logger.exception(f"Unhandled exception! {e}")
+        return "Internal Server Error", 500
+
+    @app.teardown_appcontext
+    def shutdown_session(exception=None):
+        g.db.remove()
+
+    return app

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/cli.py

@@ -13,6 +13,8 @@ from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
 from datetime import datetime, timezone
 import bcrypt
+import json
+import shutil
 
 load_dotenv()
 f_abs_path = os.path.abspath(__file__)
@@ -87,9 +89,9 @@ def init():
         os.makedirs(f"{cwd}/gemini/.certs", exist_ok=True)
         subprocess.run(["openssl", "req", "-x509", "-newkey", "rsa:4096", "-keyout", f"{cwd}/gemini/.certs/key.pem", "-out", f"{cwd}/gemini/.certs/cert.pem", "-days", "365", "-nodes", "-subj", f"/CN={domain}"], check=True)
         if mode == 1:
-            os.rename(f"{lib_cwd}/gemini_multi.py", f"{cwd}/gemini/mod/10_openwrite.py")
+            shutil.copyfile(f"{lib_cwd}/gemini_multi.py", f"{cwd}/gemini/mod/10_openwrite.py")
         elif mode == 2:
-            os.rename(f"{lib_cwd}/gemini_single.py", f"{cwd}/gemini/mod/10_openwrite.py")
+            shutil.copyfile(f"{lib_cwd}/gemini_single.py", f"{cwd}/gemini/mod/10_openwrite.py")
 
     logs_enabled = click.confirm("Enable logging?", default=True)
     if logs_enabled:
@@ -138,70 +140,15 @@ def init():
                 gem.write(f"modules = {cwd}/gemini/mod\n")
         f.write(f"LOGS={'yes' if logs_enabled else 'no'}\n")
         if logs_enabled:
-            f.write(f"LOGS_DIR={logs_dir}")
+            f.write(f"LOGS_DIR={logs_dir}\n")
         f.write(f"CAPTCHA_ENABLED={'yes' if captcha_enabled else 'no'}\n")
         if captcha_enabled:
             f.write(f"FRIENDLY_CAPTCHA_SITEKEY={captcha_sitekey}\n")
             f.write(f"FRIENDLY_CAPTCHA_APIKEY={captcha_apikey}\n")
 
     click.echo("[+] .env file created")
-    click.echo("[*] Initializing database..")
-    init_db(dbtype, dbpath)
-    click.echo("[+] Database initialized")
-    click.echo("[*] Adding admin user...")
-    from .utils.models import User, Blog, Post, Settings
-    from .utils.db import init_engine, SessionLocal
-    init_engine(dbtype, dbpath)
-    from .utils.db import SessionLocal
-    admin_password = os.urandom(16).hex()
-    hashed = bcrypt.hashpw(admin_password.encode("utf-8"), bcrypt.gensalt())
-    admin_user = User(username="admin", email="", password_hash=hashed.decode("utf-8"), verified=1, admin=1)
-    SessionLocal.add(admin_user)
-    SessionLocal.commit()
-    SessionLocal.close()
-    click.echo(f"[+] Admin user added! Your credentials:\n\nLogin: admin\nPassword: {admin_password}")
     if logs_enabled and not os.path.exists(logs_dir):
         os.makedirs(logs_dir, exist_ok=True)
-    
-    if mode == 2:
-        key = rsa.generate_private_key(
-            public_exponent=65537,
-            key_size=2048
-        )
-
-        private_pem = key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.PKCS8,
-            encryption_algorithm=serialization.NoEncryption()
-        ).decode()
-
-        public_pem = key.public_key().public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo
-        ).decode()
-
-        now = datetime.now(timezone.utc)
-
-        new_blog = Blog(
-            owner=1, 
-            name="default", 
-            title=domain, 
-            index="on", 
-            access="domain",
-            description_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog description in [dashboard](http://{domain}/dashboard/edit/default)",
-            description_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog description in <a href=\"http://{domain}/dashboard/edit/default\">dashboard</a></p>",
-            css="",
-            pub_key=public_pem,
-            priv_key=private_pem,
-            theme="default",
-            created=now
-        )
-
-        new_setting = Settings(name="logo", value="/static/logo.png")
-
-        SessionLocal.add(new_blog)
-        SessionLocal.add(new_setting)
-        SessionLocal.commit()
 
 @cli.command()
 @click.option("-d", "--daemon", is_flag=True, help="Run in background (daemon)")
@@ -267,10 +214,12 @@ def run(daemon):
 
         try:
             gunicorn_proc.wait()
-            gemini_proc.wait()
+            if gemini:
+                gemini_proc.wait()
         except KeyboardInterrupt:
             gunicorn_proc.terminate()
-            gemini_proc.terminate()
+            if gemini:
+                gemini_proc.terminate()
 
 @cli.command()
 def debugrun():
@@ -320,7 +269,7 @@ def stop(service):
         click.echo("[*] Searching Gunicorn processes")
         try:
             out = subprocess.check_output(["pgrep", "-f", "gunicorn.*openwrite:create_app"], text=True)
-            out_gemini = subprocess.check_output(["pgrep", "-f", "gemini\.py"], text=True)
+            out_gemini = subprocess.check_output(["pgrep", "-f", "gmcapsuled"], text=True)
             pids = out.strip().splitlines()
             pids_gemini = out_gemini.strip().splitlines()
             for pid in pids:

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/gemini_multi.py

@@ -113,5 +113,3 @@ def init(capsule):
     capsule.add("/b/*",
         blog_index,
         protocol='gemini')
-
-

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/gemini_single.py

@@ -80,5 +80,3 @@ def init(capsule):
     capsule.add("/p/*",
         blog_post,
         protocol='gemini')
-
-

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/routes/admin.py

@@ -5,6 +5,7 @@ import bcrypt
 from werkzeug.utils import secure_filename
 from PIL import Image
 import os
+from collections import defaultdict
 
 admin_bp = Blueprint("admin", __name__)
 
@@ -164,7 +165,36 @@ def admin_settings():
         logo_q.value = f"{g.staticurl}/{filename}"
         g.db.commit()
         settings_dict['logo'] = f"{g.staticurl}/{filename}"
-    for h in hometext:
-        h.content = hometexts[h.language]
+    g.db.query(Home).filter_by(name="hometext").delete()
+    for h in hometexts.keys():
+        g.db.add(Home(name="hometext", language=h, type="text", content=hometexts[h]))
     g.db.commit()
-    return render_template("settings.html", settings=settings_dict, hometext=hometext)
+    new_hometexts = g.db.query(Home).filter_by(name="hometext").all()
+    return render_template("settings.html", settings=settings_dict, hometext=new_hometexts)
+
+@admin_bp.route("/admin/translations", methods=['GET', 'POST'])
+def translations():
+    if request.method == "GET":
+        trans = g.db.query(Home).filter_by(type="translation").all()
+        grouped = defaultdict(dict)
+        for t in trans:
+            grouped[t.name][t.language] = t.content
+        return render_template("translations.html", trans=grouped, langs=g.alltrans)
+
+    trans_array = []
+    for key, val in request.form.items():
+        if key.startswith("val_"):
+            _, name, lang = key.split("___", 2)
+            trans_array.append({
+                "name": name,
+                "language": lang,
+                "content": val
+            })
+
+    g.db.query(Home).filter(Home.type == "translation").delete()
+
+    for tr in trans_array:
+        g.db.add(Home(name=tr['name'], language=tr['language'], content=tr['content'], type="translation"))
+
+    g.db.commit()
+    return redirect("/admin/translations")

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/routes/auth.py

@@ -25,7 +25,7 @@ def register():
     form_password2 = request.form.get('password2')
 
     if form_password != form_password2:
-        return render_template("register.html", error=g.trans['password_dont_match'])
+        return render_template("register.html", error=g.trans['passwords_dont_match'])
 
     user = g.db.query(User).filter_by(username=form_username).first()
     if user:

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/routes/dashboard.py

@@ -123,6 +123,7 @@ def edit_blog(name):
         p.views = v
 
     themes = get_themes()
+    themes.append("default")
 
     if request.method == "GET":
         return render_template("edit.html", blog=blog, posts=posts, themes=themes)
@@ -136,10 +137,7 @@ def edit_blog(name):
     blog.updated = now   
     blog.title = request.form.get("title")
     selected_theme = request.form.get("theme")
-    themes_plus = themes
-    themes_plus.append("default")
-    if selected_theme not in themes_plus:
-        print(f"{selected_theme} in {themes}?")
+    if selected_theme not in themes:
         return render_template("edit.html", blog=blog, posts=posts, themes=themes, error="Wrong theme!")
     blog.theme = selected_theme
     g.db.commit()
@@ -192,7 +190,7 @@ def new_post(name):
         url = f"https://openwrite.io/b/{blog.name}/{link}"
 
     followers = []
-    if blog.followers is not None:
+    if blog.followers not in (None, "null", "NULL"):
         followers = json.loads(blog.followers)
 
     for actor in followers:

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/routes/main.py

@@ -14,8 +14,11 @@ main_bp = Blueprint("main", __name__)
 @main_bp.route("/")
 def index():
     if g.mode == "multi":
+        langs = []
         home = g.db.query(Home).filter_by(name="hometext").all()
-        return render_template('index.html', home=home)
+        for h in home:
+            langs.append(h.language)
+        return render_template('index.html', home=home, langs=langs)
 
     elif g.mode == "single":
         blog = g.db.query(Blog).filter_by(name="default").first()

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/routes/upload.py

@@ -47,7 +47,7 @@ def upload_image():
 
     m = hashlib.md5()
     m.update(filename.encode() + user.username.encode())
-    filename = f"{user.username}_{m.hexdigest()}.{extension}"
+    filename = f"{m.hexdigest()}.{extension}"
 
     if STORAGE_BACKEND == "bunny":
         url = f"https://storage.bunnycdn.com/{BUNNY_ZONE}/{filename}"

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/templates/admin.html

@@ -4,8 +4,9 @@
 {% endif %}   
 <h1 class="centered">Actions</h1>
 <div style="display: flex; justify-content: center; gap: 1rem;">
-<a style="width: 5rem;" class="btn purple" href="/admin/add_user">{{ g.trans['add_user'] }}</a>
+<a style="width: 5rem;" class="btn purple" href="/admin/add_user">{{ _('add_user') }}</a>
 <a style="width: 5rem;" class="btn purple" href="/admin/settings">Settings</a>
+<a style="width: 5rem;" class="btn purple" href="/admin/translations">Translations</a>
 </div>
 <h1 class="centered">Blogs</h1>
 <table class="table">
@@ -14,7 +15,7 @@
 </thead>
 <tbody>
 {% for blog in blogs %}
-<tr><td>{{ blog.title }}</td><td>{{ blog.name }}</td><td>{{ blog.ownername }}</td><td><a class="action" href="/admin/delete_blog/{{ blog.name }}" onclick="return confirm('{{ g.trans['are_you_sure_blog'] }} {{ blog.name }}?\n{{ g.trans['this_action_cannot_be_reverted'] }}.')">Delete</a></td></tr>
+<tr><td>{{ blog.title }}</td><td>{{ blog.name }}</td><td>{{ blog.ownername }}</td><td><a class="action" href="/admin/delete_blog/{{ blog.name }}" onclick="return confirm('{{ _('are_you_sure_blog') }} {{ blog.name }}?\n{{ _('this_action_cannot_be_reverted') }}.')">Delete</a></td></tr>
 {% endfor %}
 </tbody>
 </table>
@@ -27,15 +28,15 @@
 <tbody>
 {% for user in users %}
 <tr><td>{{ user.username }}</td>
-<td>{% if user.admin > 0 %}{{ g.trans['yes'] }}{% else %}{{ g.trans['no'] }}{% endif %}</td>
+<td>{% if user.admin > 0 %}{{ _('yes') }}{% else %}{{ _('no') }}{% endif %}</td>
 <td>
-    <a class="action" href="/admin/delete_user/{{ user.username }}" onclick="return confirm('{{ g.trans['are_you_sure_user'] }} {{ user.username }}?\n{{ g.trans['this_action_cannot_be_reverted'] }}.')">Delete</a>
+    <a class="action" href="/admin/delete_user/{{ user.username }}" onclick="return confirm('{{ _('are_you_sure_user') }} {{ user.username }}?\n{{ _('this_action_cannot_be_reverted') }}.')">Delete</a>
 {% if user.admin > 0 %}
 {% if user.username != "admin" %}
-    <a class="action" onclick="return confirm('{{ g.trans['are_you_sure_remove_admin'] }} {{ user.username }}?')" href="/admin/remove_admin/{{ user.username }}">{{ g.trans['remove_admin'] }}</a>
+    <a class="action" onclick="return confirm('{{ _('are_you_sure_remove_admin') }} {{ user.username }}?')" href="/admin/remove_admin/{{ user.username }}">{{ _('remove_admin') }}</a>
 {% endif %}
 {% else %}
-    <a class="action" onclick="return confirm('{{ g.trans['are_you_sure_make_admin'] }} {{ user.username }}?')" href="/admin/make_admin/{{ user.username }}">{{ g.trans['add_admin'] }}</a>
+    <a class="action" onclick="return confirm('{{ _('are_you_sure_make_admin') }} {{ user.username }}?')" href="/admin/make_admin/{{ user.username }}">{{ _('add_admin') }}</a>
 {% endif %}
 </td>
 </tr>

{openwrite-0.10.5 → openwrite-0.11.0}/openwrite/templates/blog.html

@@ -4,7 +4,7 @@
             </article>
             {% if posts | count > 0 %}
             <hr>
-            <h3><b>{{ g.trans['posts'] }}</b></h3>
+            <h3><b>{{ _('posts') }}</b></h3>
             <article class="post-content" id="posts">
                 {% for post in posts %}
                     <div class="postlist_item">

openwrite-0.11.0/openwrite/templates/changepw.html

@@ -0,0 +1,19 @@
+{% include 'header.html' %}
+
+<h1 class="centered">{{ _('change_password') }}</h1>
+
+<article class="main-content">
+    {% if error %}
+    <div class="error">{{ error }}</div>
+    {% endif %}
+    <form method="post" action="/dashboard/changepw">
+        <span class="form-field">{{ _('current_password') }}:</span>
+        <input type="password" name="current_pass">       
+        <span class="form-field">{{ _('new_password') }}:</span>
+        <input type="password" name="new_pass">
+        <span class="form-field">{{ _('password2') }}:</span>
+        <input type="password" name="new_pass2">
+        <input type="submit" name="sub" value="{{ _('change_password') }}" class="btn purple" style="margin-top: 1rem;">
+    </form>
+</article>
+{% include 'footer.html' %}