diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py index ebee6a1..620c981 100644 --- a/app/blueprints/packages/packages.py +++ b/app/blueprints/packages/packages.py @@ -126,12 +126,12 @@ def view(package): .filter(MetaPackage.packages.any(Package.id != package.id)) \ .all() - conflicting_modnames += db.session.query(ForumTopic.name) \ - .filter(ForumTopic.name.in_([ mp.name for mp in package.provides ])) \ - .filter(ForumTopic.topic_id != package.forums) \ - .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ - .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ - .all() + # conflicting_modnames += db.session.query(ForumTopic.name) \ + # .filter(ForumTopic.name.in_([ mp.name for mp in package.provides ])) \ + # .filter(ForumTopic.topic_id != package.forums) \ + # .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ + # .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ + # .all() conflicting_modnames = set([x[0] for x in conflicting_modnames]) @@ -153,21 +153,21 @@ def view(package): topic_error = None topic_error_lvl = "warning" - if package.state != PackageState.APPROVED and package.forums is not None: - errors = [] - if Package.query.filter(Package.forums==package.forums, Package.state!=PackageState.DELETED).count() > 1: - errors.append("" + gettext("Error: Another package already uses this forum topic!") + "") - topic_error_lvl = "danger" + # if package.state != PackageState.APPROVED and package.forums is not None: + # errors = [] + # if Package.query.filter(Package.forums==package.forums, Package.state!=PackageState.DELETED).count() > 1: + # errors.append("" + gettext("Error: Another package already uses this forum topic!") + "") + # topic_error_lvl = "danger" - topic = ForumTopic.query.get(package.forums) - if topic is not None: - if topic.author != package.author: - errors.append("" + gettext("Error: Forum topic author doesn't match package author.") + "") - topic_error_lvl = "danger" - elif package.type != PackageType.ASSETPACK: - errors.append(gettext("Warning: Forum topic not found. This may happen if the topic has only just been created.")) + # topic = ForumTopic.query.get(package.forums) + # if topic is not None: + # if topic.author != package.author: + # errors.append("" + gettext("Error: Forum topic author doesn't match package author.") + "") + # topic_error_lvl = "danger" + # elif package.type != PackageType.ASSETPACK: + # errors.append(gettext("Warning: Forum topic not found. This may happen if the topic has only just been created.")) - topic_error = "
".join(errors) + # topic_error = "
".join(errors) threads = Thread.query.filter_by(package_id=package.id, review_id=None) @@ -226,7 +226,7 @@ def makeLabel(obj): class PackageForm(FlaskForm): - type = SelectField(lazy_gettext("Type"), [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.TOOL) + type = SelectField(lazy_gettext("Type"), [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.GAME) title = StringField(lazy_gettext("Title (Human-readable)"), [InputRequired(), Length(1, 100)]) name = StringField(lazy_gettext("Name (Technical)"), [InputRequired(), Length(1, 100), Regexp("^[a-z0-9_]+$", 0, lazy_gettext("Lower case letters (a-z), digits (0-9), and underscores (_) only"))]) short_desc = StringField(lazy_gettext("Short Description (Plaintext)"), [InputRequired(), Length(1,200)]) @@ -243,7 +243,7 @@ class PackageForm(FlaskForm): repo = StringField(lazy_gettext("VCS Repository URL"), [Optional(), URL()], filters = [lambda x: x or None]) website = StringField(lazy_gettext("Website URL"), [Optional(), URL()], filters = [lambda x: x or None]) issueTracker = StringField(lazy_gettext("Issue Tracker URL"), [Optional(), URL()], filters = [lambda x: x or None]) - forums = IntegerField(lazy_gettext("Forum Topic ID"), [Optional(), NumberRange(0,999999)]) + # forums = IntegerField(lazy_gettext("Forum Topic ID"), [Optional(), NumberRange(0,999999)]) video_url = StringField(lazy_gettext("Video URL"), [Optional(), URL()], filters = [lambda x: x or None]) submit = SubmitField(lazy_gettext("Save")) @@ -286,7 +286,7 @@ def create_edit(author=None, name=None): form.name.data = request.args.get("bname") form.title.data = request.args.get("title") form.repo.data = request.args.get("repo") - form.forums.data = request.args.get("forums") + # form.forums.data = request.args.get("forums") form.license.data = None form.media_license.data = None else: @@ -327,7 +327,7 @@ def create_edit(author=None, name=None): "repo": form.repo.data, "website": form.website.data, "issueTracker": form.issueTracker.data, - "forums": form.forums.data, + # "forums": form.forums.data, "video_url": form.video_url.data, }) @@ -602,12 +602,12 @@ def similar(package): .order_by(db.desc(Package.score)) \ .all() - similar_topics = ForumTopic.query \ - .filter_by(name=package.name) \ - .filter(ForumTopic.topic_id != package.forums) \ - .filter(~ db.exists().where(Package.forums == ForumTopic.topic_id)) \ - .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ - .all() + # similar_topics = ForumTopic.query \ + # .filter_by(name=package.name) \ + # .filter(ForumTopic.topic_id != package.forums) \ + # .filter(~ db.exists().where(Package.forums == ForumTopic.topic_id)) \ + # .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ + # .all() return render_template("packages/similar.html", package=package, - packages_modnames=packages_modnames, similar_topics=similar_topics) + packages_modnames=packages_modnames, similar_topics=[]) diff --git a/app/models/packages.py b/app/models/packages.py index 491d4d5..1d973a9 100644 --- a/app/models/packages.py +++ b/app/models/packages.py @@ -49,9 +49,9 @@ class License(db.Model): class PackageType(enum.Enum): - TOOL = "Tool" - GAME = "Game" - ASSETPACK = "Asset Pack" + GAME = "Game" + TOOL = "Tool" + ASSETPACK = "Asset Pack" def toName(self): return self.name.lower() @@ -226,7 +226,7 @@ class PackagePropertyKey(enum.Enum): repo = "Repository" website = "Website" issueTracker = "Issue Tracker" - forums = "Forum Topic ID" + # forums = "Forum Topic ID" def convert(self, value): if self == PackagePropertyKey.tags: diff --git a/app/tasks/__init__.py b/app/tasks/__init__.py index c945bd9..98b44d6 100644 --- a/app/tasks/__init__.py +++ b/app/tasks/__init__.py @@ -66,10 +66,10 @@ def make_celery(app): celery = make_celery(app) CELERYBEAT_SCHEDULE = { - 'topic_list_import': { - 'task': 'app.tasks.forumtasks.importTopicList', - 'schedule': crontab(minute=1, hour=1), # 0101 - }, + # 'topic_list_import': { + # 'task': 'app.tasks.forumtasks.importTopicList', + # 'schedule': crontab(minute=1, hour=1), # 0101 + # }, 'package_score_update': { 'task': 'app.tasks.pkgtasks.updatePackageScores', 'schedule': crontab(minute=10, hour=1), # 0110 diff --git a/app/templates/base.html b/app/templates/base.html index 2302dd8..fe8eded 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -24,10 +24,10 @@ - {% if release and (release.min_rel or release.max_rel) %} - - {% if release.min_rel and release.max_rel %} - {{ _("Minetest %(min)s - %(max)s", min=release.min_rel.name, max=release.max_rel.name) }} - {% elif release.min_rel %} - {{ _("For Minetest %(min)s and above", min=release.min_rel.name) }} - {% elif release.max_rel %} - {{ _("Minetest %(max)s and below", max=release.max_rel.name) }} - {% endif %} - - {% endif %} - - {% if package.type == package.type.TOOL %} - {% set installing_url = "https://wiki.minetest.net/Installing_Mods" %} - {% elif package.type == package.type.GAME %} - {% set installing_url = "https://wiki.minetest.net/Games#Installing_games" %} - {% elif package.type == package.type.ASSETPACK %} - {% set installing_url = "https://wiki.minetest.net/Installing_Texture_Packs" %} - {% else %} - {{ 0 / 0 }} - {% endif %} - -

- - - - {{ _("How do I install this?") }} - - -

+

{% else %} {{ _("No downloads available") }} @@ -170,7 +141,7 @@ {{ package.downloads }} {% endif %} - + {{ threads | length }} @@ -194,12 +165,6 @@ {{ _("Source") }} {% endif %} - {% if package.forums %} - - - {{ _("Forums") }} - - {% endif %} {% if package.issueTracker %} @@ -526,7 +491,7 @@ {% endif %} - {{ _("Threads") }} + {{ _("Discussion") }}
{% from "macros/threads.html" import render_compact_threadlist %} diff --git a/app/templates/threads/list.html b/app/templates/threads/list.html index cd8ee57..28be225 100644 --- a/app/templates/threads/list.html +++ b/app/templates/threads/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} - {{ _("Threads") }} + {{ _("Discussion") }} {% endblock %} {% block content %} diff --git a/app/templates/todo/todo_base.html b/app/templates/todo/todo_base.html index e29e283..5d2dee9 100644 --- a/app/templates/todo/todo_base.html +++ b/app/templates/todo/todo_base.html @@ -29,12 +29,6 @@ {{ _("Package Tags") }} -
  • - - {{ _("Forum Topics") }} - -
    • diff --git a/app/templates/users/profile.html b/app/templates/users/profile.html index 05c7117..83e7403 100644 --- a/app/templates/users/profile.html +++ b/app/templates/users/profile.html @@ -161,13 +161,6 @@

    {{ medal.description }}

    - {% endfor %} diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index f909560..62b782c 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -1049,7 +1049,7 @@ msgstr "Hilfe" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "Themen" #: app/templates/base.html:48 @@ -2741,7 +2741,7 @@ msgid "" "read private threads." msgstr "" "Nur Sie, der Paketautor, und Benutzer mit dem Rang eines Genehmigers oder" -" höher können private Threads lesen." +" höher können private Discussion lesen." #: app/templates/threads/user_comments.html:9 #: app/templates/threads/user_comments.html:13 diff --git a/translations/es/LC_MESSAGES/messages.po b/translations/es/LC_MESSAGES/messages.po index c957b99..44138f0 100644 --- a/translations/es/LC_MESSAGES/messages.po +++ b/translations/es/LC_MESSAGES/messages.po @@ -1039,7 +1039,7 @@ msgstr "Ayuda" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "Hilos de discusión" #: app/templates/base.html:48 diff --git a/translations/fr/LC_MESSAGES/messages.po b/translations/fr/LC_MESSAGES/messages.po index f643dea..542df78 100644 --- a/translations/fr/LC_MESSAGES/messages.po +++ b/translations/fr/LC_MESSAGES/messages.po @@ -1044,7 +1044,7 @@ msgstr "Aide" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "Fils" #: app/templates/base.html:48 diff --git a/translations/hu/LC_MESSAGES/messages.po b/translations/hu/LC_MESSAGES/messages.po index a0ba7bf..f0ae7c1 100644 --- a/translations/hu/LC_MESSAGES/messages.po +++ b/translations/hu/LC_MESSAGES/messages.po @@ -1048,7 +1048,7 @@ msgstr "Segítség" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/id/LC_MESSAGES/messages.po b/translations/id/LC_MESSAGES/messages.po index 292a5fe..c8d347a 100644 --- a/translations/id/LC_MESSAGES/messages.po +++ b/translations/id/LC_MESSAGES/messages.po @@ -1038,7 +1038,7 @@ msgstr "Bantuan" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "Utas" #: app/templates/base.html:48 diff --git a/translations/lzh/LC_MESSAGES/messages.po b/translations/lzh/LC_MESSAGES/messages.po index b64f062..352c274 100644 --- a/translations/lzh/LC_MESSAGES/messages.po +++ b/translations/lzh/LC_MESSAGES/messages.po @@ -1003,7 +1003,7 @@ msgstr "" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/messages.pot b/translations/messages.pot index 01fe371..61fe43d 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -1003,7 +1003,7 @@ msgstr "" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/ms/LC_MESSAGES/messages.po b/translations/ms/LC_MESSAGES/messages.po index df63b78..87642fd 100644 --- a/translations/ms/LC_MESSAGES/messages.po +++ b/translations/ms/LC_MESSAGES/messages.po @@ -1044,7 +1044,7 @@ msgstr "Bantuan" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "Bebenang" #: app/templates/base.html:48 diff --git a/translations/nb_NO/LC_MESSAGES/messages.po b/translations/nb_NO/LC_MESSAGES/messages.po index 08b2a56..26b92f5 100644 --- a/translations/nb_NO/LC_MESSAGES/messages.po +++ b/translations/nb_NO/LC_MESSAGES/messages.po @@ -1006,7 +1006,7 @@ msgstr "Hjelp" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/ru/LC_MESSAGES/messages.po b/translations/ru/LC_MESSAGES/messages.po index cc810d6..149fb40 100644 --- a/translations/ru/LC_MESSAGES/messages.po +++ b/translations/ru/LC_MESSAGES/messages.po @@ -1040,7 +1040,7 @@ msgstr "Помощь" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "Треды" #: app/templates/base.html:48 diff --git a/translations/tr/LC_MESSAGES/messages.po b/translations/tr/LC_MESSAGES/messages.po index 3944a4f..1590ff8 100644 --- a/translations/tr/LC_MESSAGES/messages.po +++ b/translations/tr/LC_MESSAGES/messages.po @@ -1005,7 +1005,7 @@ msgstr "" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/uk/LC_MESSAGES/messages.po b/translations/uk/LC_MESSAGES/messages.po index d511566..a791a69 100644 --- a/translations/uk/LC_MESSAGES/messages.po +++ b/translations/uk/LC_MESSAGES/messages.po @@ -1009,7 +1009,7 @@ msgstr "" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/zh_Hans/LC_MESSAGES/messages.po b/translations/zh_Hans/LC_MESSAGES/messages.po index bc527ac..59290da 100644 --- a/translations/zh_Hans/LC_MESSAGES/messages.po +++ b/translations/zh_Hans/LC_MESSAGES/messages.po @@ -1015,7 +1015,7 @@ msgstr "帮助" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48 diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po index 28fbbfe..97aabf5 100644 --- a/translations/zh_Hant/LC_MESSAGES/messages.po +++ b/translations/zh_Hant/LC_MESSAGES/messages.po @@ -1009,7 +1009,7 @@ msgstr "" #: app/templates/base.html:42 app/templates/packages/view.html:173 #: app/templates/packages/view.html:499 app/templates/threads/list.html:4 -msgid "Threads" +msgid "Discussion" msgstr "" #: app/templates/base.html:48