From d4e85ea44f4b96721a77b24d9c9fd9a943169db0 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 29 Apr 2025 12:51:23 +0200 Subject: [PATCH 1/6] update readme due release on codeberg --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b9d38c5..5055fbe 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,16 @@ It's even possible to gift your keys via a unique website. Just edit the game to ## 🚀 Get Started! 🚀 -### 1. **Clone the Repository** +## 1. **Clone the Repository (Option 1 or Option 2)** + +### Option 1: Clone the main repository + +```bash +git clone https://codeberg.org/nocci/GameKeyManager +cd steam-gift-manager +``` + +### Option 2: Clone from alternative repository (if option 1 fails) ```bash git clone https://git.nocci.it/nocci/GameKeyManager From 653d04e76aa60cdbecfb6b45dd65c427fb94b6d6 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 29 Apr 2025 14:13:27 +0200 Subject: [PATCH 2/6] docker compose missing in setup.sh --- setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.sh b/setup.sh index 7a24685..f6def89 100644 --- a/setup.sh +++ b/setup.sh @@ -52,6 +52,7 @@ else elif command -v apt-get &>/dev/null; then sudo apt-get update sudo apt-get install -y docker-compose-plugin + sudo apt-get install -y docker-compose elif command -v dnf &>/dev/null; then sudo dnf install -y docker-compose elif command -v yum &>/dev/null; then From 277bd5a2836d302222014ded1d003b9d47096106 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 29 Apr 2025 14:27:55 +0200 Subject: [PATCH 3/6] switch webserver to gunicorn --- setup.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.sh b/setup.sh index f6def89..b2c2083 100644 --- a/setup.sh +++ b/setup.sh @@ -108,6 +108,7 @@ matrix-client reportlab requests pillow +gunicorn EOL # 3. .env-Datei im übergeordneten Verzeichnis erstellen @@ -878,9 +879,7 @@ RUN groupadd -g \$GID appuser && \ chown -R appuser:appuser /app USER appuser - -EXPOSE 5000 -CMD ["python", "app.py"] +CMD ["gunicorn", "-b", "0.0.0.0:5000", "app:app"] DOCKER_END # 6. docker-compose.yml From 2ea3a8059c90cdfb571baf0e14f40cbb6913b940 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 29 Apr 2025 14:32:45 +0200 Subject: [PATCH 4/6] typo in Dockerfile --- setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.sh b/setup.sh index b2c2083..a56f879 100644 --- a/setup.sh +++ b/setup.sh @@ -879,6 +879,9 @@ RUN groupadd -g \$GID appuser && \ chown -R appuser:appuser /app USER appuser + +EXPOSE 5000 + CMD ["gunicorn", "-b", "0.0.0.0:5000", "app:app"] DOCKER_END From c886d5f28e76f9bc696a1797435fb6adcd3c3b57 Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 29 Apr 2025 14:46:55 +0200 Subject: [PATCH 5/6] translations of setup.sh --- setup.sh | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/setup.sh b/setup.sh index a56f879..0793758 100644 --- a/setup.sh +++ b/setup.sh @@ -75,12 +75,12 @@ else fi -# Konfiguration +# Configuration PROJECT_DIR="steam-gift-manager" TRANSLATIONS_DIR="../translations" DATA_DIR="../data" -# 1. Projektordner & Übersetzungsordner erstellen +# 1. Create project folder & translations folder mkdir -p "$PROJECT_DIR"/{templates,static} mkdir -p "$TRANSLATIONS_DIR"/de/LC_MESSAGES mkdir -p "$TRANSLATIONS_DIR"/en/LC_MESSAGES @@ -111,7 +111,7 @@ pillow gunicorn EOL -# 3. .env-Datei im übergeordneten Verzeichnis erstellen +# 3. Create .env file in parent directory cd .. SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_hex(24))') REDEEM_SECRET=$(python3 -c 'import secrets; print(secrets.token_hex(16))') @@ -154,10 +154,10 @@ MATRIX_ACCESS_TOKEN="" MATRIX_ROOM_ID="" EOL -# Zurück ins Projektverzeichnis +# Back to project directory cd $PROJECT_DIR -# 4. app.py (vollständige korrigierte Version) +# 4. app.py (the main app) cat <<'PYTHON_END' > app.py import os import logging @@ -220,7 +220,7 @@ load_dotenv(override=True) # Lade Umgebungsvariablen aus .env mit override load_dotenv(override=True) -# Konfiguration +# App-Configuration app.config.update( SECRET_KEY=os.getenv('SECRET_KEY'), SQLALCHEMY_DATABASE_URI=('sqlite:////app/data/games.db'), @@ -235,7 +235,7 @@ app.config.update( interval_hours = int(os.getenv('CHECK_EXPIRING_KEYS_INTERVAL_HOURS', 12)) -# Initialisierung +# Initialisation db = SQLAlchemy(app, metadata=metadata) migrate = Migrate(app, db) login_manager = LoginManager(app) @@ -259,7 +259,7 @@ def inject_template_vars(): theme='dark' if request.cookies.get('dark_mode') == 'true' else 'light' ) -# Datenbankmodelle +# DB Models class User(db.Model, UserMixin): __tablename__ = 'users' id = db.Column(db.Integer, primary_key=True) @@ -590,7 +590,7 @@ def export_pdf(): game.redeem_date.strftime('%d.%m.%y') if game.redeem_date else '' ]) - # Tabelle formatieren + # Table format table = Table(data, colWidths=col_widths, repeatRows=1) table.setStyle(TableStyle([ ('FONTNAME', (0,0), (-1,0), 'Helvetica-Bold'), @@ -814,7 +814,7 @@ def check_expiring_keys(): send_notification(user, game) -# Optional: Cleanup-Funktion für regelmäßiges Löschen abgelaufener Tokens +# Optional: cleaning up old tokens def cleanup_expired_tokens(): now = datetime.utcnow() expired = RedeemToken.query.filter(RedeemToken.expires < now).all() @@ -823,13 +823,13 @@ def cleanup_expired_tokens(): db.session.commit() -# Scheduler initialisieren und starten +# Scheduler start scheduler = BackgroundScheduler() scheduler.add_job(func=check_expiring_keys, trigger="interval", hours=interval_hours) scheduler.add_job(func=cleanup_expired_tokens, trigger="interval", hours=1) scheduler.start() -# Shutdown des Schedulers bei Beendigung der App +# Shutdown of the Schedulers when stopping the app atexit.register(lambda: scheduler.shutdown()) if __name__ == '__main__': @@ -839,7 +839,7 @@ if __name__ == '__main__': PYTHON_END -# Babel Konfiguration erstellen +# Create Babel configuration cat < babel.cfg [python: **.py] [jinja2: **/templates/**.html] @@ -903,11 +903,11 @@ services: restart: unless-stopped COMPOSE_END -# 7. Verzeichnisse und Berechtigungen +# 7. Directories and permissions mkdir -p ../data ../translations chmod -R a+rwX ../data ../translations -# 8. Übersetzungs- und Upgrade-Scripte +# 8. Translation and upgrade scripts cat <<'SCRIPT_END' > ../translate.sh #!/bin/bash set -e @@ -919,10 +919,10 @@ declare -A locales=( ["en"]="en" ) -# POT-Datei erstellen +# create POT-file docker-compose exec steam-manager pybabel extract -F babel.cfg -o translations/messages.pot . -# Für jede Sprache prüfen und ggf. initialisieren +# Check for each language and initialize if necessary for lang in "${!locales[@]}"; do if [ ! -f "translations/${locales[$lang]}/LC_MESSAGES/messages.po" ]; then docker-compose exec steam-manager pybabel init \ @@ -932,11 +932,11 @@ for lang in "${!locales[@]}"; do fi done -# Übersetzungen aktualisieren und kompilieren +# Update and compile translations docker-compose exec steam-manager pybabel update -i translations/messages.pot -d translations docker-compose exec steam-manager pybabel compile -d translations -echo "✅ Übersetzungen aktualisiert!" +echo "✅ Translations updated!" SCRIPT_END chmod +x ../translate.sh @@ -944,25 +944,25 @@ cat <<'SCRIPT_END' > ../upgrade.sh #!/bin/bash set -e -# Setze das Arbeitsverzeichnis auf das Projektverzeichnis +# Set the working directory to the project directory cd "$(dirname "$0")/steam-gift-manager" # Setze FLASK_APP, falls nötig export FLASK_APP=app.py -# Initialisiere migrations, falls noch nicht vorhanden +# Initialize migrations, if not yet available if [ ! -d migrations ]; then echo "Starting Flask-Migrate..." docker-compose exec steam-manager flask db init fi -# Erzeuge Migration (nur wenn sich Modelle geändert haben) +# Create migration (only if models have changed) docker-compose exec steam-manager flask db migrate -m "Automatic Migration" -# Wende Migration an +# Apply migration docker-compose exec steam-manager flask db upgrade -echo "✅ Database-Migration abgeschlossen!" +echo "✅ Database migration completed!" SCRIPT_END chmod +x ../upgrade.sh @@ -1482,7 +1482,7 @@ function updateCountdown() { updateProgressBar(percent); } -// Initialisierung +// run countdown updateCountdown(); const timer = setInterval(updateCountdown, 1000); @@ -1558,7 +1558,7 @@ body { color: #ff6b6b; } -/* Progressbar-Animationen */ +/* Progressbar-Animations */ #expiry-bar { transition: width 1s linear, background-color 0.5s ease; } From d3eb37ebff3c6d9805884b0594c911f2ef9c16db Mon Sep 17 00:00:00 2001 From: nocci Date: Tue, 29 Apr 2025 15:19:59 +0200 Subject: [PATCH 6/6] more translations fixed --- .env | 34 +++++ setup.sh | 22 ++-- steam-gift-manager/Dockerfile | 3 +- steam-gift-manager/app.py | 14 +- steam-gift-manager/requirements.txt | 1 + steam-gift-manager/static/style.css | 2 +- steam-gift-manager/templates/login.html | 2 +- steam-gift-manager/templates/redeem.html | 2 +- translate.sh | 8 +- translations/de/LC_MESSAGES/messages.mo | Bin 445 -> 445 bytes translations/de/LC_MESSAGES/messages.po | 159 +++++++++++------------ translations/en/LC_MESSAGES/messages.mo | Bin 445 -> 445 bytes translations/en/LC_MESSAGES/messages.po | 35 ++--- translations/messages.pot | 33 ++--- upgrade.sh | 10 +- 15 files changed, 170 insertions(+), 155 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..e8985d5 --- /dev/null +++ b/.env @@ -0,0 +1,34 @@ +# Flask-Configuration - Key are generated through setup.sh +SECRET_KEY="" +REDEEM_SECRET="" +WTF_CSRF_SECRET_KEY="" + +# locales +BABEL_DEFAULT_LOCALE="en" +BABEL_SUPPORTED_LOCALES="de,en" +BABEL_TRANSLATION_DIRECTORIES="translations" + +# Timezone +TZ=Europe/Berlin + +# Security +SESSION_COOKIE_SECURE="False" +CSRF_ENABLED="True" +# Account registration +REGISTRATION_ENABLED="True" + +# checking interval if keys have to be redeemed before a specific date +CHECK_EXPIRING_KEYS_INTERVAL_HOURS=6 + +# Pushover +PUSHOVER_APP_TOKEN="" +PUSHOVER_USER_KEY="" + +# Gotify +GOTIFY_URL="" +GOTIFY_TOKEN="" + +# Matrix +MATRIX_HOMESERVER="" +MATRIX_ACCESS_TOKEN="" +MATRIX_ROOM_ID="" diff --git a/setup.sh b/setup.sh index 0793758..362cdb9 100644 --- a/setup.sh +++ b/setup.sh @@ -351,7 +351,7 @@ def login(): @app.route('/register', methods=['GET', 'POST']) def register(): if not app.config['REGISTRATION_ENABLED']: - flash(_('Registrierungen sind deaktiviert'), 'danger') + flash(_('No new registrations. They are deactivated!'), 'danger') return redirect(url_for('login')) if request.method == 'POST': @@ -385,16 +385,16 @@ def change_password(): confirm_password = request.form['confirm_password'] if not check_password_hash(current_user.password, current_password): - flash(_('Aktuelles Passwort ist falsch'), 'danger') + flash(_('Current passwort is wrong'), 'danger') return redirect(url_for('change_password')) if new_password != confirm_password: - flash(_('Neue Passwörter stimmen nicht überein'), 'danger') + flash(_('New Passwords are not matching'), 'danger') return redirect(url_for('change_password')) current_user.password = generate_password_hash(new_password) db.session.commit() - flash(_('Passwort erfolgreich geändert'), 'success') + flash(_('Password changed successfully'), 'success') return redirect(url_for('index')) return render_template('change_password.html') @@ -652,15 +652,15 @@ def import_games(): db.session.commit() - flash(_('%(new)d neue Spiele importiert, %(dup)d Duplikate übersprungen', new=new_games, dup=duplicates), 'success') + flash(_('%(new)d new games imported, %(dup)d skipped duplicates', new=new_games, dup=duplicates), 'success') except Exception as e: db.session.rollback() - flash(_('Importfehler: %(error)s', error=str(e)), 'danger') + flash(_('Import error: %(error)s', error=str(e)), 'danger') return redirect(url_for('index')) - flash(_('Bitte eine gültige CSV-Datei hochladen.'), 'danger') + flash(_('Please upload a valid CSV file.'), 'danger') return render_template('import.html') @@ -1015,7 +1015,7 @@ cat < templates/base.html {% if current_user.is_authenticated %}
  • - 🔒 {{ _('Passwort') }} + 🔒 {{ _('Password') }}
  • 🚪 {{ _('Logout') }} @@ -1384,11 +1384,11 @@ cat < templates/import.html
    - +
    - - {{ _('Abbrechen') }} + + {{ _('Cancel') }}
    {% endblock %} diff --git a/steam-gift-manager/Dockerfile b/steam-gift-manager/Dockerfile index 9d34b87..681e017 100644 --- a/steam-gift-manager/Dockerfile +++ b/steam-gift-manager/Dockerfile @@ -23,4 +23,5 @@ RUN groupadd -g $GID appuser && useradd -u $UID -g $GID -m appuser && ch USER appuser EXPOSE 5000 -CMD ["python", "app.py"] + +CMD ["gunicorn", "-b", "0.0.0.0:5000", "app:app"] diff --git a/steam-gift-manager/app.py b/steam-gift-manager/app.py index bd7f182..a32caca 100644 --- a/steam-gift-manager/app.py +++ b/steam-gift-manager/app.py @@ -59,7 +59,7 @@ load_dotenv(override=True) # Lade Umgebungsvariablen aus .env mit override load_dotenv(override=True) -# Konfiguration +# App-Configuration app.config.update( SECRET_KEY=os.getenv('SECRET_KEY'), SQLALCHEMY_DATABASE_URI=('sqlite:////app/data/games.db'), @@ -74,7 +74,7 @@ app.config.update( interval_hours = int(os.getenv('CHECK_EXPIRING_KEYS_INTERVAL_HOURS', 12)) -# Initialisierung +# Initialisation db = SQLAlchemy(app, metadata=metadata) migrate = Migrate(app, db) login_manager = LoginManager(app) @@ -98,7 +98,7 @@ def inject_template_vars(): theme='dark' if request.cookies.get('dark_mode') == 'true' else 'light' ) -# Datenbankmodelle +# DB Models class User(db.Model, UserMixin): __tablename__ = 'users' id = db.Column(db.Integer, primary_key=True) @@ -429,7 +429,7 @@ def export_pdf(): game.redeem_date.strftime('%d.%m.%y') if game.redeem_date else '' ]) - # Tabelle formatieren + # Table format table = Table(data, colWidths=col_widths, repeatRows=1) table.setStyle(TableStyle([ ('FONTNAME', (0,0), (-1,0), 'Helvetica-Bold'), @@ -653,7 +653,7 @@ def check_expiring_keys(): send_notification(user, game) -# Optional: Cleanup-Funktion für regelmäßiges Löschen abgelaufener Tokens +# Optional: cleaning up old tokens def cleanup_expired_tokens(): now = datetime.utcnow() expired = RedeemToken.query.filter(RedeemToken.expires < now).all() @@ -662,13 +662,13 @@ def cleanup_expired_tokens(): db.session.commit() -# Scheduler initialisieren und starten +# Scheduler start scheduler = BackgroundScheduler() scheduler.add_job(func=check_expiring_keys, trigger="interval", hours=interval_hours) scheduler.add_job(func=cleanup_expired_tokens, trigger="interval", hours=1) scheduler.start() -# Shutdown des Schedulers bei Beendigung der App +# Shutdown of the Schedulers when stopping the app atexit.register(lambda: scheduler.shutdown()) if __name__ == '__main__': diff --git a/steam-gift-manager/requirements.txt b/steam-gift-manager/requirements.txt index 8c31714..b909030 100644 --- a/steam-gift-manager/requirements.txt +++ b/steam-gift-manager/requirements.txt @@ -14,3 +14,4 @@ matrix-client reportlab requests pillow +gunicorn diff --git a/steam-gift-manager/static/style.css b/steam-gift-manager/static/style.css index 5ed653c..e8c608f 100644 --- a/steam-gift-manager/static/style.css +++ b/steam-gift-manager/static/style.css @@ -42,7 +42,7 @@ body { color: #ff6b6b; } -/* Progressbar-Animationen */ +/* Progressbar-Animations */ #expiry-bar { transition: width 1s linear, background-color 0.5s ease; } diff --git a/steam-gift-manager/templates/login.html b/steam-gift-manager/templates/login.html index 37f3eb0..0003326 100644 --- a/steam-gift-manager/templates/login.html +++ b/steam-gift-manager/templates/login.html @@ -4,7 +4,7 @@
    - Logo + Logo

    {{ _('Login') }}

    diff --git a/steam-gift-manager/templates/redeem.html b/steam-gift-manager/templates/redeem.html index a41f4da..7a0e49c 100644 --- a/steam-gift-manager/templates/redeem.html +++ b/steam-gift-manager/templates/redeem.html @@ -84,7 +84,7 @@ function updateCountdown() { updateProgressBar(percent); } -// Initialisierung +// run countdown updateCountdown(); const timer = setInterval(updateCountdown, 1000); diff --git a/translate.sh b/translate.sh index e78327d..75e21e4 100755 --- a/translate.sh +++ b/translate.sh @@ -8,10 +8,10 @@ declare -A locales=( ["en"]="en" ) -# POT-Datei erstellen +# create POT-file docker-compose exec steam-manager pybabel extract -F babel.cfg -o translations/messages.pot . -# Für jede Sprache prüfen und ggf. initialisieren +# Check for each language and initialize if necessary for lang in "${!locales[@]}"; do if [ ! -f "translations/${locales[$lang]}/LC_MESSAGES/messages.po" ]; then docker-compose exec steam-manager pybabel init \ @@ -21,8 +21,8 @@ for lang in "${!locales[@]}"; do fi done -# Übersetzungen aktualisieren und kompilieren +# Update and compile translations docker-compose exec steam-manager pybabel update -i translations/messages.pot -d translations docker-compose exec steam-manager pybabel compile -d translations -echo "✅ Übersetzungen aktualisiert!" +echo "✅ Translations updated!" diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index a1fd0f7d0da14dea76fd488f6281f7e181a7e805..a99bad905a6fff301d23967eb9f8054e2a897e35 100644 GIT binary patch delta 28 ccmdnXyq9^xM0QIBLt`rgvxzel;miYn0ed?M0ssI2 delta 28 ccmdnXyq9^xM0PU;LqjV=\n" "Language: de\n" "Language-Team: de \n" @@ -20,83 +20,83 @@ msgstr "" #: app.py:187 msgid "Invalid credentials" -msgstr "" +msgstr "Ungültige Anmeldedaten" #: app.py:193 -msgid "Registrierungen sind deaktiviert" -msgstr "" +msgid "No new registrations. They are deactivated!" +msgstr "Upps. Keine neuen Registrierungen, sorry!" #: app.py:201 msgid "Username already exists" -msgstr "" +msgstr "Benutzername existiert bereits" #: app.py:227 -msgid "Aktuelles Passwort ist falsch" -msgstr "" +msgid "Current passwort is wrong" +msgstr "Das aktuelle Passwort ist falsch" #: app.py:231 -msgid "Neue Passwörter stimmen nicht überein" -msgstr "" +msgid "New Passwords are not matching" +msgstr "Die neuen Passwörter stimmen nicht überein" #: app.py:236 -msgid "Passwort erfolgreich geändert" -msgstr "" +msgid "Password changed successfully" +msgstr "Passwort erfolgreich geändert" #: app.py:266 msgid "Game added successfully!" -msgstr "" +msgstr "Spiel erfolgreich hinzugefügt!" #: app.py:271 msgid "Steam Key already exists!" -msgstr "" +msgstr "Game-Key existiert bereits!" #: app.py:274 app.py:318 msgid "Error: " -msgstr "" +msgstr "Fehler: " #: app.py:313 msgid "Changes saved!" -msgstr "" +msgstr "Änderungen gespeichert!" #: app.py:401 msgid "Game List (without Keys)" -msgstr "" +msgstr "Spieleliste (ohne Keys)" #: app.py:494 #, python-format -msgid "%(new)d neue Spiele importiert, %(dup)d Duplikate übersprungen" -msgstr "" +msgid "%(new)d new games imported, %(dup)d skipped duplicates" +msgstr "%(new)d neue Spiele importiert, %(dup)d Duplikate übersprungen" #: app.py:498 #, python-format -msgid "Importfehler: %(error)s" -msgstr "" +msgid "Import error: %(error)s" +msgstr "Importfehler: %(error)s" #: app.py:502 -msgid "Bitte eine gültige CSV-Datei hochladen." -msgstr "" +msgid "Please upload a valid CSV file." +msgstr "Bitte lade eine gültige CSV-Datei hoch." #: templates/add_game.html:4 templates/index.html:9 msgid "Add New Game" -msgstr "" +msgstr "Neues Spiel hinzufügen" #: templates/add_game.html:9 templates/edit_game.html:9 templates/index.html:19 msgid "Name" -msgstr "" +msgstr "Name" #: templates/add_game.html:13 templates/edit_game.html:13 msgid "Game Key" -msgstr "" +msgstr "Spiel-Key" #: templates/add_game.html:17 templates/edit_game.html:21 #: templates/index.html:21 msgid "Status" -msgstr "" +msgstr "Status" #: templates/add_game.html:19 templates/edit_game.html:23 #: templates/index.html:41 msgid "Not redeemed" -msgstr "" +msgstr "Nicht eingelöst" #: templates/add_game.html:20 templates/edit_game.html:24 #: templates/index.html:43 @@ -106,182 +106,175 @@ msgstr "" #: templates/add_game.html:21 templates/edit_game.html:25 #: templates/index.html:45 msgid "Redeemed" -msgstr "" +msgstr "Verschenkt" #: templates/add_game.html:25 templates/edit_game.html:29 #: templates/index.html:23 msgid "Redeem by" -msgstr "" +msgstr "Einzulösen vor" #: templates/add_game.html:29 templates/edit_game.html:33 msgid "Recipient" -msgstr "" +msgstr "Empfänger" #: templates/add_game.html:33 templates/edit_game.html:37 msgid "Shop URL" -msgstr "" +msgstr "Shop-URL" #: templates/add_game.html:37 templates/edit_game.html:41 msgid "Notes" -msgstr "" +msgstr "Notizen" #: templates/add_game.html:41 templates/edit_game.html:60 msgid "Save" -msgstr "" +msgstr "Speichern" #: templates/add_game.html:42 templates/edit_game.html:61 +#: templates/import.html:12 msgid "Cancel" -msgstr "" +msgstr "Abbrechen" #: templates/base.html:7 msgid "Game Key Manager" -msgstr "" +msgstr "Game Key Manager" #: templates/base.html:23 msgid "Search" -msgstr "" +msgstr "Suche" #: templates/base.html:31 msgid "Dark Mode" -msgstr "" +msgstr "Dark Mode" -#: templates/base.html:44 -msgid "Passwort" -msgstr "" +#: templates/base.html:44 templates/login.html:16 templates/register.html:15 +msgid "Password" +msgstr "Passwort" #: templates/base.html:47 msgid "Logout" -msgstr "" +msgstr "Abmelden" #: templates/change_password.html:4 templates/change_password.html:19 msgid "Change Password" -msgstr "" +msgstr "Passwort ändern" #: templates/change_password.html:8 msgid "Current Password" -msgstr "" +msgstr "Aktuelles Passwort" #: templates/change_password.html:12 msgid "New Password" -msgstr "" +msgstr "Neues Passwort" #: templates/change_password.html:16 msgid "Confirm New Password" -msgstr "" +msgstr "Neues Passwort bestätigen" #: templates/edit_game.html:4 msgid "Edit Game" -msgstr "" +msgstr "Spiel bearbeiten" #: templates/edit_game.html:17 msgid "Steam AppID (optional)" -msgstr "" +msgstr "Steam AppID (optional)" #: templates/edit_game.html:47 msgid "Active Redeem Link" -msgstr "" +msgstr "Aktiver Einlöse-Link" #: templates/edit_game.html:54 msgid "Expires at" -msgstr "" +msgstr "Läuft ab" #: templates/import.html:4 msgid "Import Games" -msgstr "" +msgstr "Spiele importieren" #: templates/import.html:8 -msgid "CSV-Datei auswählen" -msgstr "" +msgid "Select CSV file" +msgstr "CSV-Datei auswählen" #: templates/import.html:11 -msgid "Importieren" -msgstr "" - -#: templates/import.html:12 -msgid "Abbrechen" -msgstr "" +msgid "Import" +msgstr "Importieren" #: templates/index.html:4 msgid "My Games" -msgstr "" +msgstr "Meine Spiele" #: templates/index.html:6 msgid "Export CSV" -msgstr "" +msgstr "CSV exportieren" #: templates/index.html:8 msgid "Import CSV" -msgstr "" +msgstr "CSV importieren" #: templates/index.html:18 msgid "Cover" -msgstr "" +msgstr "Cover" #: templates/index.html:20 msgid "Key" -msgstr "" +msgstr "Key" #: templates/index.html:22 msgid "Created" -msgstr "" +msgstr "Erstellt" #: templates/index.html:24 templates/index.html:56 msgid "Shop" -msgstr "" +msgstr "Shop" #: templates/index.html:25 msgid "Actions" -msgstr "" +msgstr "Aktionen" #: templates/index.html:63 msgid "Generate redeem link" -msgstr "" +msgstr "Geschenk-Link generieren" #: templates/index.html:70 msgid "Really delete?" -msgstr "" +msgstr "Wirklich löschen?" #: templates/index.html:96 msgid "Redeem link copied to clipboard!" -msgstr "" +msgstr "Geschenk-Link in die Zwischenablage kopiert!" #: templates/index.html:100 msgid "Error generating link" -msgstr "" +msgstr "Fehler beim Generieren des Links" #: templates/index.html:106 msgid "No games yet" -msgstr "" +msgstr "Der Kornspeicher ist leer, Sire!" #: templates/login.html:8 templates/login.html:19 msgid "Login" -msgstr "" +msgstr "Anmelden" #: templates/login.html:12 templates/register.html:11 msgid "Username" -msgstr "" - -#: templates/login.html:16 templates/register.html:15 -msgid "Password" -msgstr "" +msgstr "Benutzername" #: templates/login.html:22 msgid "No account yet? Register" -msgstr "" +msgstr "Noch kein Konto? Registrieren" #: templates/redeem.html:16 msgid "Your Key:" -msgstr "" +msgstr "Dein Key:" #: templates/redeem.html:22 msgid "Redeem now on" -msgstr "" +msgstr "Jetzt einlösen auf" #: templates/redeem.html:26 msgid "This page will expire in" -msgstr "" +msgstr "Diese Seite läuft ab in" #: templates/register.html:7 templates/register.html:18 msgid "Register" -msgstr "" +msgstr "Registrieren" diff --git a/translations/en/LC_MESSAGES/messages.mo b/translations/en/LC_MESSAGES/messages.mo index 63cc42b4b34325c8c38426a268b98d6bf2a368b5..5d3bf51201c5100b9abc805ccc7c28212dd919f8 100644 GIT binary patch delta 28 ccmdnXyq9^xM0QIBLt`rgvxzel;miYn0ed?M0ssI2 delta 28 ccmdnXyq9^xM0PU;LqjV=\n" "Language: en\n" "Language-Team: en \n" @@ -23,7 +23,7 @@ msgid "Invalid credentials" msgstr "" #: app.py:193 -msgid "Registrierungen sind deaktiviert" +msgid "No new registrations. They are deactivated!" msgstr "" #: app.py:201 @@ -31,15 +31,15 @@ msgid "Username already exists" msgstr "" #: app.py:227 -msgid "Aktuelles Passwort ist falsch" +msgid "Current passwort is wrong" msgstr "" #: app.py:231 -msgid "Neue Passwörter stimmen nicht überein" +msgid "New Passwords are not matching" msgstr "" #: app.py:236 -msgid "Passwort erfolgreich geändert" +msgid "Password changed successfully" msgstr "" #: app.py:266 @@ -64,16 +64,16 @@ msgstr "" #: app.py:494 #, python-format -msgid "%(new)d neue Spiele importiert, %(dup)d Duplikate übersprungen" +msgid "%(new)d new games imported, %(dup)d skipped duplicates" msgstr "" #: app.py:498 #, python-format -msgid "Importfehler: %(error)s" +msgid "Import error: %(error)s" msgstr "" #: app.py:502 -msgid "Bitte eine gültige CSV-Datei hochladen." +msgid "Please upload a valid CSV file." msgstr "" #: templates/add_game.html:4 templates/index.html:9 @@ -130,6 +130,7 @@ msgid "Save" msgstr "" #: templates/add_game.html:42 templates/edit_game.html:61 +#: templates/import.html:12 msgid "Cancel" msgstr "" @@ -145,8 +146,8 @@ msgstr "" msgid "Dark Mode" msgstr "" -#: templates/base.html:44 -msgid "Passwort" +#: templates/base.html:44 templates/login.html:16 templates/register.html:15 +msgid "Password" msgstr "" #: templates/base.html:47 @@ -190,15 +191,11 @@ msgid "Import Games" msgstr "" #: templates/import.html:8 -msgid "CSV-Datei auswählen" +msgid "Select CSV file" msgstr "" #: templates/import.html:11 -msgid "Importieren" -msgstr "" - -#: templates/import.html:12 -msgid "Abbrechen" +msgid "Import" msgstr "" #: templates/index.html:4 @@ -261,10 +258,6 @@ msgstr "" msgid "Username" msgstr "" -#: templates/login.html:16 templates/register.html:15 -msgid "Password" -msgstr "" - #: templates/login.html:22 msgid "No account yet? Register" msgstr "" diff --git a/translations/messages.pot b/translations/messages.pot index 2322064..86dcdc6 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-04-26 11:13+0000\n" +"POT-Creation-Date: 2025-04-29 13:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgid "Invalid credentials" msgstr "" #: app.py:193 -msgid "Registrierungen sind deaktiviert" +msgid "No new registrations. They are deactivated!" msgstr "" #: app.py:201 @@ -30,15 +30,15 @@ msgid "Username already exists" msgstr "" #: app.py:227 -msgid "Aktuelles Passwort ist falsch" +msgid "Current passwort is wrong" msgstr "" #: app.py:231 -msgid "Neue Passwörter stimmen nicht überein" +msgid "New Passwords are not matching" msgstr "" #: app.py:236 -msgid "Passwort erfolgreich geändert" +msgid "Password changed successfully" msgstr "" #: app.py:266 @@ -63,16 +63,16 @@ msgstr "" #: app.py:494 #, python-format -msgid "%(new)d neue Spiele importiert, %(dup)d Duplikate übersprungen" +msgid "%(new)d new games imported, %(dup)d skipped duplicates" msgstr "" #: app.py:498 #, python-format -msgid "Importfehler: %(error)s" +msgid "Import error: %(error)s" msgstr "" #: app.py:502 -msgid "Bitte eine gültige CSV-Datei hochladen." +msgid "Please upload a valid CSV file." msgstr "" #: templates/add_game.html:4 templates/index.html:9 @@ -129,6 +129,7 @@ msgid "Save" msgstr "" #: templates/add_game.html:42 templates/edit_game.html:61 +#: templates/import.html:12 msgid "Cancel" msgstr "" @@ -144,8 +145,8 @@ msgstr "" msgid "Dark Mode" msgstr "" -#: templates/base.html:44 -msgid "Passwort" +#: templates/base.html:44 templates/login.html:16 templates/register.html:15 +msgid "Password" msgstr "" #: templates/base.html:47 @@ -189,15 +190,11 @@ msgid "Import Games" msgstr "" #: templates/import.html:8 -msgid "CSV-Datei auswählen" +msgid "Select CSV file" msgstr "" #: templates/import.html:11 -msgid "Importieren" -msgstr "" - -#: templates/import.html:12 -msgid "Abbrechen" +msgid "Import" msgstr "" #: templates/index.html:4 @@ -260,10 +257,6 @@ msgstr "" msgid "Username" msgstr "" -#: templates/login.html:16 templates/register.html:15 -msgid "Password" -msgstr "" - #: templates/login.html:22 msgid "No account yet? Register" msgstr "" diff --git a/upgrade.sh b/upgrade.sh index f5dff45..54b874f 100644 --- a/upgrade.sh +++ b/upgrade.sh @@ -1,22 +1,22 @@ #!/bin/bash set -e -# Setze das Arbeitsverzeichnis auf das Projektverzeichnis +# Set the working directory to the project directory cd "$(dirname "$0")/steam-gift-manager" # Setze FLASK_APP, falls nötig export FLASK_APP=app.py -# Initialisiere migrations, falls noch nicht vorhanden +# Initialize migrations, if not yet available if [ ! -d migrations ]; then echo "Starting Flask-Migrate..." docker-compose exec steam-manager flask db init fi -# Erzeuge Migration (nur wenn sich Modelle geändert haben) +# Create migration (only if models have changed) docker-compose exec steam-manager flask db migrate -m "Automatic Migration" -# Wende Migration an +# Apply migration docker-compose exec steam-manager flask db upgrade -echo "✅ Database-Migration abgeschlossen!" +echo "✅ Database migration completed!"