From 29e4c6d18a57e623500ab3515de21154b9d67d7b Mon Sep 17 00:00:00 2001
From: coolbot100s <76798835+coolbot100s@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:46:42 -0700
Subject: [PATCH] correct vocabulary for resolutions tags warning and sort tags
 list in resolution tags nag

---
 apps/frontend/src/pages/[type]/[id]/settings/tags.vue | 3 ++-
 packages/moderation/data/nags/tags.ts                 | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
index 1b8e7c018..653087c9b 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
@@ -221,7 +221,8 @@ const multipleResolutionTagsWarning = computed(() => {
   );
 
   if (resolutionTags.length > 1) {
-    return `You've selected ${resolutionTags.length} resolution tags (${resolutionTags.map((t) => t.name).join(", ")}). Resource packs should typically only have one resolution tag.`;
+    return `You've selected ${resolutionTags.length} resolution tags (${resolutionTags.map((t) => t.name).join(", ").replace('8x-', '8x or lower')
+            .replace('512x+', '512x or higher')}). Resource packs should typically only have one resolution tag.`;
   }
   return null;
 });
diff --git a/packages/moderation/data/nags/tags.ts b/packages/moderation/data/nags/tags.ts
index 5e1f46322..caf4b3c63 100644
--- a/packages/moderation/data/nags/tags.ts
+++ b/packages/moderation/data/nags/tags.ts
@@ -73,6 +73,10 @@ export const tagsNags: Nag[] = [
         .concat(context.project.additional_categories)
         .filter((tag: string) => allResolutionTags.includes(tag))
 
+      const sortedTags = resolutionTags.toSorted((a, b) => {
+        return allResolutionTags.indexOf(a) - allResolutionTags.indexOf(b)
+      })
+
       return formatMessage(
         defineMessage({
           id: 'nags.multiple-resolution-tags.description',
@@ -81,7 +85,7 @@ export const tagsNags: Nag[] = [
         }),
         {
           count: resolutionTags.length,
-          tags: resolutionTags
+          tags: sortedTags
             .join(', ')
             .replace('8x-', '8x or lower')
             .replace('512x+', '512x or higher'),