Merge branch 'master' into guard-url-protocols

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -58,7 +58,8 @@ body:
 
         The default places to find the logs on desktop platforms are as follows:
           - `%AppData%/osu/logs` *on Windows*
-          - `~/.local/share/osu/logs` *on Linux & macOS*
+          - `~/.local/share/osu/logs` *on Linux*
+          - `~/Library/Application Support/osu/logs` *on macOS*
 
         If you have selected a custom location for the game files, you can find the `logs` folder there.
 

CONTRIBUTING.md

@@ -23,7 +23,8 @@ Issues, bug reports and feature suggestions are welcomed, though please keep in
 
   * the in-game logs, which are located at:
     * `%AppData%/osu/logs` (on Windows),
-    * `~/.local/share/osu/logs` (on Linux and macOS),
+    * `~/.local/share/osu/logs` (on Linux),
+    * `~/Library/Application Support/osu/logs` (on macOS),
     * `Android/data/sh.ppy.osulazer/files/logs` (on Android),
     * on iOS they can be obtained by connecting your device to your desktop and [copying the `logs` directory from the app's own document storage using iTunes](https://support.apple.com/en-us/HT201301#copy-to-computer),
   * your system specifications (including the operating system and platform you are playing on),

osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs

@@ -77,14 +77,14 @@ public void TestNonOwnCommentCantBeDeleted()
             {
                 var comments = this.ChildrenOfType<DrawableComment>();
                 var ourComment = comments.SingleOrDefault(x => x.Comment.Id == 1);
-                return ourComment != null && ourComment.ChildrenOfType<OsuSpriteText>().Any(x => x.Text == "Delete");
+                return ourComment != null && ourComment.ChildrenOfType<OsuSpriteText>().Any(x => x.Text == "delete");
             });
 
             AddAssert("Second doesn't", () =>
             {
                 var comments = this.ChildrenOfType<DrawableComment>();
                 var ourComment = comments.Single(x => x.Comment.Id == 2);
-                return ourComment.ChildrenOfType<OsuSpriteText>().All(x => x.Text != "Delete");
+                return ourComment.ChildrenOfType<OsuSpriteText>().All(x => x.Text != "delete");
             });
         }
 
@@ -102,7 +102,7 @@ public void TestDeletion()
             });
             AddStep("It has delete button", () =>
             {
-                var btn = ourComment.ChildrenOfType<OsuSpriteText>().Single(x => x.Text == "Delete");
+                var btn = ourComment.ChildrenOfType<OsuSpriteText>().Single(x => x.Text == "delete");
                 InputManager.MoveMouseTo(btn);
             });
             AddStep("Click delete button", () =>
@@ -175,7 +175,7 @@ public void TestDeletionFail()
             });
             AddStep("It has delete button", () =>
             {
-                var btn = ourComment.ChildrenOfType<OsuSpriteText>().Single(x => x.Text == "Delete");
+                var btn = ourComment.ChildrenOfType<OsuSpriteText>().Single(x => x.Text == "delete");
                 InputManager.MoveMouseTo(btn);
             });
             AddStep("Click delete button", () =>
@@ -245,7 +245,7 @@ public void TestReport()
             });
             AddStep("Click the button", () =>
             {
-                var btn = targetComment.ChildrenOfType<OsuSpriteText>().Single(x => x.Text == "Report");
+                var btn = targetComment.ChildrenOfType<OsuSpriteText>().Single(x => x.Text == "report");
                 InputManager.MoveMouseTo(btn);
                 InputManager.Click(MouseButton.Left);
             });

osu.Game/Overlays/Comments/CommentReportButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -53,7 +54,7 @@ private void load()
                 }
             };
 
-            link.AddLink(UsersStrings.ReportButtonText, this.ShowPopover);
+            link.AddLink(ReportStrings.CommentButton.ToLower(), this.ShowPopover);
         }
 
         private void report(CommentReportReason reason, string comments)

osu.Game/Overlays/Comments/DrawableComment.cs

@@ -20,6 +20,7 @@
 using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
@@ -336,7 +337,7 @@ private void load(OverlayColourProvider colourProvider)
             actionsContainer.AddArbitraryDrawable(Empty().With(d => d.Width = 10));
 
             if (Comment.UserId.HasValue && Comment.UserId.Value == api.LocalUser.Value.Id)
-                actionsContainer.AddLink(CommonStrings.ButtonsDelete, deleteComment);
+                actionsContainer.AddLink(CommonStrings.ButtonsDelete.ToLower(), deleteComment);
             else
                 actionsContainer.AddArbitraryDrawable(new CommentReportButton(Comment));
 

osu.Game/Screens/Play/SubmittingPlayer.cs

@@ -130,6 +130,7 @@ protected override async Task PrepareScoreForResultsAsync(Score score)
             score.ScoreInfo.Date = DateTimeOffset.Now;
 
             await submitScore(score).ConfigureAwait(false);
+            spectatorClient.EndPlaying(GameplayState);
         }
 
         [Resolved]