Merge branch 'master' into sprunk-patch-5

ZeroK-RTS · Apr 6, 2024 · 8b332fb · 8b332fb
2 parents 6bd136d + 3696a91
commit 8b332fb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Zero-K.info/Views/Battles/BattleDetail.cshtml b/Zero-K.info/Views/Battles/BattleDetail.cshtml
@@ -52,6 +52,14 @@
         @Model.EngineVersion
 </td>
 </tr>
+<tr>
+    <td>
+        Battle ID:
+    </td>
+    <td>
+        @Model.SpringBattleID
+</td>
+</tr>
 <tr>
     <td>
         Started:

diff --git a/Zero-K.info/Views/Clans/Create.cshtml b/Zero-K.info/Views/Clans/Create.cshtml
@@ -16,7 +16,7 @@
         </tr>
         <tr>
             <td>
-                Shortcut:
+                Acronym:
             </td>
             <td>
                 @Html.TextBoxFor(x => x.Shortcut, new { maxlength = 6 })
@@ -83,4 +83,4 @@
             <td colspan='2'><input type='submit' value="Submit"/></td>
         </tr>
     </table>
-</form>
+</form>
diff --git a/ZkLobbyServer/ZkLobbyServer.cs b/ZkLobbyServer/ZkLobbyServer.cs
@@ -604,14 +604,14 @@ public async Task ReportUser(ZkDataContext db, Account reporter, Account reporte
 
             string str;
             if (reporter.AccountID != reported.AccountID)
-                str = string.Format("{0} https://zero-k.info/Users/Detail/{1} reports abuse by {2} https://zero-k.info/Users/Detail/{3} : {4}", 
+                str = string.Format("`{0}` https://zero-k.info/Users/Detail/{1} reports abuse by `{2}` https://zero-k.info/Users/Detail/{3} : {4}", 
                     reporter.Name,
                     reporter.AccountID,
                     reported.Name, 
                     reported.AccountID,
                     report);
             else
-                str = string.Format("{0} https://zero-k.info/Users/Detail/{1} contacts admins : {2}", 
+                str = string.Format("`{0}` https://zero-k.info/Users/Detail/{1} contacts admins : {2}", 
                     reporter.Name,
                     reporter.AccountID, 
                     report);

diff --git a/ZkLobbyServer/autohost/Commands/CmdKick.cs b/ZkLobbyServer/autohost/Commands/CmdKick.cs
@@ -109,11 +109,11 @@ private bool NotifyAdminChannel(ServerBattle battle, Say e, bool isActualKick)
                 }
                 if (isActualKick)
                 {
-                    battle.server.GhostChanSay(ZkData.GlobalConst.ModeratorChannel, string.Format("{0} (and possibly others) kicked {1} ({2}, {3}) from {4}", e?.User, target, ptype, gtype, battle.Title));
+                    battle.server.GhostChanSay(ZkData.GlobalConst.ModeratorChannel, string.Format("`{0}` (and possibly others) kicked `{1}` ({2}, {3}) from {4}", e?.User, target, ptype, gtype, battle.Title));
                 }
                 else
                 {
-                    battle.server.GhostChanSay(ZkData.GlobalConst.ModeratorChannel, string.Format("{0} started a kick vote against {1} ({2}, {3}) in {4}", e?.User, target, ptype, gtype, battle.Title));
+                    battle.server.GhostChanSay(ZkData.GlobalConst.ModeratorChannel, string.Format("`{0}` started a kick vote against `{1}` ({2}, {3}) in {4}", e?.User, target, ptype, gtype, battle.Title));
                 }
             }
             return true;