From 55a9ebc366a241ab98e6f74b338c3e6b4ee12e3a Mon Sep 17 00:00:00 2001
From: Mike Botsko <botsko@gmail.com>
Date: Mon, 25 Apr 2022 15:03:19 -0700
Subject: [PATCH] Changes minimessage placeholders to snake case

---
 .../resolvers/ActivityPlaceholderResolver.java     | 14 +++++++-------
 .../PaginatedResultsPlaceholderResolver.java       |  8 ++++----
 .../resources/locale/messages-en_US.properties     | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/ActivityPlaceholderResolver.java b/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/ActivityPlaceholderResolver.java
index a5dbde983..a84e211a2 100644
--- a/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/ActivityPlaceholderResolver.java
+++ b/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/ActivityPlaceholderResolver.java
@@ -89,14 +89,14 @@ public ActivityPlaceholderResolver(TranslationService translationService) {
             sign = MiniMessage.miniMessage().deserialize(translationService.messageOf(receiver, "sign-plus"));
         }
 
-        return Map.of(placeholderName + "ActionPastTense",
+        return Map.of(placeholderName + "_action_past_tense",
                 Either.left(ConclusionValue.conclusionValue(actionPastTense)),
-                placeholderName + "ActionFamily", Either.left(ConclusionValue.conclusionValue(actionFamily)),
-                placeholderName + "Cause", Either.left(ConclusionValue.conclusionValue(cause)),
-                placeholderName + "Count", Either.left(ConclusionValue.conclusionValue(count)),
-                placeholderName + "Sign", Either.left(ConclusionValue.conclusionValue(sign)),
-                placeholderName + "Since", Either.left(ConclusionValue.conclusionValue(since)),
-                placeholderName + "Content", Either.left(ConclusionValue.conclusionValue(content)));
+                placeholderName + "_action_family", Either.left(ConclusionValue.conclusionValue(actionFamily)),
+                placeholderName + "_cause", Either.left(ConclusionValue.conclusionValue(cause)),
+                placeholderName + "_count", Either.left(ConclusionValue.conclusionValue(count)),
+                placeholderName + "_sign", Either.left(ConclusionValue.conclusionValue(sign)),
+                placeholderName + "_since", Either.left(ConclusionValue.conclusionValue(since)),
+                placeholderName + "_content", Either.left(ConclusionValue.conclusionValue(content)));
     }
 
     /**
diff --git a/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/PaginatedResultsPlaceholderResolver.java b/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/PaginatedResultsPlaceholderResolver.java
index c63bcf244..e8ae526f3 100644
--- a/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/PaginatedResultsPlaceholderResolver.java
+++ b/prism/src/main/java/network/darkhelmet/prism/services/messages/resolvers/PaginatedResultsPlaceholderResolver.java
@@ -53,9 +53,9 @@ public class PaginatedResultsPlaceholderResolver
         Component totalPages = Component.text(value.totalPages());
         Component totalResults = Component.text(value.totalResults());
 
-        return Map.of(placeholderName + "PerPage", Either.left(ConclusionValue.conclusionValue(perPage)),
-                placeholderName + "TotalResults", Either.left(ConclusionValue.conclusionValue(totalResults)),
-                placeholderName + "CurrentPage", Either.left(ConclusionValue.conclusionValue(currentPage)),
-                placeholderName + "TotalPages", Either.left(ConclusionValue.conclusionValue(totalPages)));
+        return Map.of(placeholderName + "_per_page", Either.left(ConclusionValue.conclusionValue(perPage)),
+                placeholderName + "_total_results", Either.left(ConclusionValue.conclusionValue(totalResults)),
+                placeholderName + "_current_page", Either.left(ConclusionValue.conclusionValue(currentPage)),
+                placeholderName + "_total_pages", Either.left(ConclusionValue.conclusionValue(totalPages)));
     }
 }
\ No newline at end of file
diff --git a/prism/src/main/resources/locale/messages-en_US.properties b/prism/src/main/resources/locale/messages-en_US.properties
index 15dd234fd..42eb2220d 100644
--- a/prism/src/main/resources/locale/messages-en_US.properties
+++ b/prism/src/main/resources/locale/messages-en_US.properties
@@ -1,9 +1,9 @@
-prefix=<dark_gray>(<#ff55ff>\uFF01<dark_gray>) <#ff55ff>P<#f45aff>r<#e95fff>i<#dd64ff>s<#d269ff><gray> \u300b
+prefix=<dark_gray>(<#ff55ff>\uFF01<dark_gray>) <#ff55ff>P<#f45aff>r<#e95fff>i<#dd64ff>s<#d269ff>m<gray> \u300b
 about=<prefix><white>Version <#4fffd3><version> <white>by <#00f2fa>v<#0af5d5>i<#15f9b0>v<#1ffc8b>e<#29ff66>l<#5cff77>e<#8eff87>r<#c1ff98>o<#f3ffa8>i
 error=<prefix><#fc2150><message>
 just-now=just now
 ago=ago
-pagination-header=<prefix><white>Showing <#fcff69><paginationPerPage><white> of <#fcff69><paginationTotalResults> <white>results (Page <#fcff69><paginationCurrentPage> <white>of <#fcff69><paginationTotalPages><white>)
+pagination-header=<prefix><white>Showing <#fcff69><pagination_per_page><white> of <#fcff69><pagination_total_results> <white>results (Page <#fcff69><pagination_current_page> <white>of <#fcff69><pagination_total_pages><white>)
 no-results=<#fc2150>No results.
 unknown-cause=unknown
 query-error=Error executing query. Please report any errors in the server logs.
@@ -11,16 +11,16 @@ reload-locale-error=Error reloading locales. Please report any errors in the ser
 reloaded-locales=<prefix><#9dfc56>Reloaded locale files.
 reloaded-config=<prefix><#9dfc56>Reloaded config.
 queue-not-free=A rollback/restore is in progress. Please try again shortly.
-activity-row=<activitySign> <#03a5fc><activityCause> <white><activityActionPastTense> <#03a5fc><activityContent> <#4fffd3>x<activityCount> <white><activitySince> <gray>(a:<activityActionFamily>)
+activity-row=<activity_sign> <#03a5fc><activity_cause> <white><activity_action_past_tense> <#03a5fc><activity_content> <#4fffd3>x<activity_count> <white><activity_since> <gray>(a:<activity_action_family>)
 sign-minus=<#fc2150>-
 sign-plus=<#9dfc56>+
 page-prev=<#fcff69><< PREV
 page-prev-hover=Go to previous page
 page-next=<#fcff69>NEXT >>
 page-next-hover=Go to next page
-wand-activated=<prefix><#9dfc56>Wand activated. Mode: <wandMode>
-wand-switched=<prefix><#9dfc56>Switched wand mode to: <wandMode>
-wand-deactivated=<prefix><#9dfc56>Deactivated <wandMode> wand.
+wand-activated=<prefix><#9dfc56>Wand activated. Mode: <wand_mode>
+wand-switched=<prefix><#9dfc56>Switched wand mode to: <wand_mode>
+wand-deactivated=<prefix><#9dfc56>Deactivated <wand_mode> wand.
 param-error-r-and-in-chunk=Parameter "r" and "in" with a value of "chunk" conflict. Please use only one.
 param-error-at-invalid-loc=Parameter "at" requires all three coordinates in x,y,z format. Example: at:0,64,0
 no-last-query=No recent query to paginate. Please search again.