Merge pull request #933 from mastodon/feat/server-topics-first

Swaps position of region and topic filters

Author: ChaosExAnima

data/categories.ts

@@ -1,4 +1,4 @@
-const { defineMessages } = require("react-intl")
+import { defineMessages } from "react-intl"
 
 export const categoriesMessages = defineMessages({
   academia: { id: "server.category.academia", defaultMessage: "Academia" },
@@ -14,6 +14,7 @@ export const categoriesMessages = defineMessages({
   games: { id: "server.category.gaming", defaultMessage: "Gaming" },
   general: { id: "server.category.general", defaultMessage: "General" },
   humor: { id: "server.category.humor", defaultMessage: "Humour" },
+  hobby: { id: "server.category.hobby", defaultMessage: "Hobbies" },
   journalism: {
     id: "server.category.journalism",
     defaultMessage: "Journalism",

data/regions.ts

@@ -0,0 +1,32 @@
+import { defineMessages } from "react-intl"
+
+export const regionsMessages = defineMessages({
+  all: {
+    id: "server.regions.all",
+    defaultMessage: "All regions",
+  },
+  africa: {
+    id: "server.regions.africa",
+    defaultMessage: "Africa",
+  },
+  asia: {
+    id: "server.regions.asia",
+    defaultMessage: "Asia",
+  },
+  europe: {
+    id: "server.regions.europe",
+    defaultMessage: "Europe",
+  },
+  oceania: {
+    id: "server.regions.oceania",
+    defaultMessage: "Oceania",
+  },
+  northAmerica: {
+    id: "server.regions.north_america",
+    defaultMessage: "North America",
+  },
+  southAmerica: {
+    id: "server.regions.south_america",
+    defaultMessage: "South America",
+  },
+})

locales/en.json

@@ -3,7 +3,7 @@
   "404.go_back_home": "Go back home",
   "404.title": "Page not found",
   "apps.free": "Free",
-  "apps.lead": "The best way to get started with Mastodon is through our official apps for iOS and Android, but many third-party apps are also available below.",
+  "apps.lead": "The best way to get started with Mastodon is through our official iOS and Android apps, but many third-party apps are also available below.",
   "apps.open": "Open",
   "apps.paid": "Paid",
   "apps.title": "Apps",
@@ -77,7 +77,6 @@
   "nav.docs.title": "Documentation",
   "nav.impressum.title": "Impressum",
   "nav.merch.title": "Merch",
-  "nav.new": "New",
   "nav.privacy_policy.title": "Privacy Policy",
   "nav.product.title": "Product",
   "nav.resources.title": "Resources",
@@ -113,6 +112,7 @@
   "server.category.furry": "Furry",
   "server.category.gaming": "Gaming",
   "server.category.general": "General",
+  "server.category.hobby": "Hobbies",
   "server.category.humor": "Humour",
   "server.category.journalism": "Journalism",
   "server.category.lgbt": "LGBTQ+",
@@ -121,7 +121,9 @@
   "server.category.religion": "Religion",
   "server.category.sports": "Sports",
   "server.category.technology": "Technology",
+  "server.filter.all_categories": "All topics",
   "server.filter_by.category": "Topic",
+  "server.filter_by.category.count": "({count})",
   "server.filter_by.category.lead": "Some providers specialize in hosting accounts from specific communities.",
   "server.filter_by.region": "Region",
   "server.filter_by.region.lead": "Where the provider is legally based.",
@@ -221,7 +223,6 @@
   "verification.why.privacy.body": "You do not need to submit your documents anywhere, so there is no chance of them being leaked.",
   "verification.why.privacy.title": "Privacy-friendly",
   "wizard.error": "Oops, something went wrong. Try refreshing the page.",
-  "wizard.filter.all_categories": "All topics",
   "wizard.filter.all_languages": "All languages",
   "wizard.filter.ownership.all": "All",
   "wizard.filter.ownership.juridicial": "Public organization",