From 16108d1f393c3436b1660376b9d1a2cac755f591 Mon Sep 17 00:00:00 2001 From: Armen Date: Tue, 15 Feb 2022 22:00:10 -0500 Subject: [PATCH] Package type update --- app/default_data.py | 2 +- app/flatpages/help/top_packages.md | 2 +- app/models/packages.py | 4 ++-- app/tasks/minetestcheck/tree.py | 22 -------------------- app/templates/base.html | 4 ++-- app/templates/index.html | 4 ++-- app/templates/metapackages/view.html | 2 +- app/templates/packages/game_hub.html | 6 +++--- app/templates/todo/outdated.html | 4 ++-- translations/de/LC_MESSAGES/messages.po | 18 ++++++++-------- translations/es/LC_MESSAGES/messages.po | 12 +++++------ translations/fr/LC_MESSAGES/messages.po | 14 ++++++------- translations/hu/LC_MESSAGES/messages.po | 10 ++++----- translations/id/LC_MESSAGES/messages.po | 10 ++++----- translations/lzh/LC_MESSAGES/messages.po | 10 ++++----- translations/messages.pot | 10 ++++----- translations/ms/LC_MESSAGES/messages.po | 20 +++++++++--------- translations/nb_NO/LC_MESSAGES/messages.po | 10 ++++----- translations/ru/LC_MESSAGES/messages.po | 12 +++++------ translations/tr/LC_MESSAGES/messages.po | 10 ++++----- translations/uk/LC_MESSAGES/messages.po | 10 ++++----- translations/zh_Hans/LC_MESSAGES/messages.po | 10 ++++----- translations/zh_Hant/LC_MESSAGES/messages.po | 10 ++++----- 23 files changed, 97 insertions(+), 119 deletions(-) diff --git a/app/default_data.py b/app/default_data.py index 1d8a92f..b14b00f 100644 --- a/app/default_data.py +++ b/app/default_data.py @@ -160,7 +160,7 @@ Go get it! [DOWNLOAD IT NOW](https://github.com/minetest-mods/mesecons/archive/master.zip) -Now go ahead and install it like any other Minetest tool. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary: +Now go ahead and install it like any other Minetest tool. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Tools) over at the Minetest Wiki. For your convenience, here's a quick summary: 1. If Mesecons is still in a ZIP file, extract the folder inside to somewhere on the computer. 2. Make sure that when you open the folder, you can directly find `README.md` in the listing. If you just see another folder, move that folder up one level and delete the old one. diff --git a/app/flatpages/help/top_packages.md b/app/flatpages/help/top_packages.md index 747a6d7..d80d898 100644 --- a/app/flatpages/help/top_packages.md +++ b/app/flatpages/help/top_packages.md @@ -3,7 +3,7 @@ title: Top Packages Algorithm ## Package Score Each package is given a `score`, which is used when ordering them in the -"Top Games/Mods/Texture Packs" lists. The intention of this feature is +"Top Games/Tools/Asset Packs" lists. The intention of this feature is to make it easier for new users to find good packages. A package's score is equal to a rolling average of recent downloads, diff --git a/app/models/packages.py b/app/models/packages.py index 7699d5c..491d4d5 100644 --- a/app/models/packages.py +++ b/app/models/packages.py @@ -71,11 +71,11 @@ class PackageType(enum.Enum): @property def plural(self): if self == PackageType.TOOL: - return lazy_gettext("Mods") + return lazy_gettext("Tools") elif self == PackageType.GAME: return lazy_gettext("Games") elif self == PackageType.ASSETPACK: - return lazy_gettext("Texture Packs") + return lazy_gettext("Asset Packs") @classmethod def get(cls, name): diff --git a/app/tasks/minetestcheck/tree.py b/app/tasks/minetestcheck/tree.py index 04a0665..d852302 100644 --- a/app/tasks/minetestcheck/tree.py +++ b/app/tasks/minetestcheck/tree.py @@ -126,20 +126,7 @@ class PackageTreeNode: result["optional_depends"] = [] -<<<<<<< HEAD - def checkDependencies(deps): - for dep in deps: - if not basenamePattern.match(dep): - if " " in dep: - raise MinetestCheckError("Invalid dependency name '{}' for tool at {}, did you forget a comma?" \ - .format(dep, self.relative)) - else: - raise MinetestCheckError( - "Invalid dependency name '{}' for tool at {}, names must only contain a-z0-9_." \ - .format(dep, self.relative)) -======= def checkDependencies(deps): pass ->>>>>>> origin/minetestcheck # Check dependencies checkDependencies(result["depends"]) @@ -178,15 +165,6 @@ class PackageTreeNode: path = os.path.join(dir, entry) if not entry.startswith('.') and os.path.isdir(path): child = PackageTreeNode(path, relative + entry + "/", name=entry) -<<<<<<< HEAD - if not child.type.isModLike(): - raise MinetestCheckError("Expecting tool or modpack, found {} at {} inside {}" \ - .format(child.type.value, child.relative, self.type.value)) - - if child.name is None: - raise MinetestCheckError("Missing base name for tool at {}".format(self.relative)) -======= ->>>>>>> origin/minetestcheck self.children.append(child) diff --git a/app/templates/base.html b/app/templates/base.html index 24bf858..2302dd8 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -24,13 +24,13 @@