Merge branch 'seasons' of https://github.com/venix12/osu-web into sea…

…sons
ppy · Feb 3, 2023 · 5307363 · 5307363
2 parents 6ea0a3e + 8626229
commit 5307363
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 43 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/resources/js/beatmap-discussions/discussion.tsx b/resources/js/beatmap-discussions/discussion.tsx
@@ -82,7 +82,7 @@ export class Discussion extends React.Component<Props> {
     // TODO: handling resolved status in bundles....?
     if (this.props.preview) return -1;
 
-    const systemPost = findLast(this.props.discussion.posts, (post) => post != null && post.system && post.message.type === 'resolve');
+    const systemPost = findLast(this.props.discussion.posts, (post) => post != null && post.system && post.message.type === 'resolved');
     return systemPost?.id ?? -1;
   }
 
@@ -255,7 +255,7 @@ export class Discussion extends React.Component<Props> {
 
   private readonly renderReply = (post: BeatmapsetDiscussionPostJson) => {
     if (!this.isVisible(post)) return null;
-    if (post.system && post.message.type === 'resolve') {
+    if (post.system && post.message.type === 'resolved') {
       if (this.lastResolvedState === post.message.value) return null;
       this.lastResolvedState = post.message.value;
     }

diff --git a/resources/js/beatmap-discussions/system-post.tsx b/resources/js/beatmap-discussions/system-post.tsx
@@ -16,7 +16,7 @@ interface Props {
 }
 
 export default function SystemPost({ post, user }: Props) {
-  if (post.message.type !== 'resolve') switchNever(post.message.type);
+  if (post.message.type !== 'resolved') switchNever(post.message.type);
 
   const className = classWithModifiers('beatmap-discussion-system-post', post.message.type, {
     deleted: post.deleted_at != null,

diff --git a/resources/js/interfaces/beatmapset-discussion-post-json.ts b/resources/js/interfaces/beatmapset-discussion-post-json.ts
@@ -27,7 +27,7 @@ export type BeatmapsetDiscussionMessagePostJson = BeatmapsetDiscussionPostBase &
 
 export type BeatmapsetDiscussionSystemPostJson = BeatmapsetDiscussionPostBase & {
   message: {
-    type: 'resolve';
+    type: 'resolved';
     value: boolean;
   };
   system: true;

diff --git a/resources/js/profile-page/user-page.tsx b/resources/js/profile-page/user-page.tsx
@@ -39,7 +39,7 @@ export default class UserPage extends React.Component<ExtraPageProps> {
             <button
               className='btn-circle btn-circle--page-toggle'
               onClick={this.editStart}
-              title={trans('users.show.page.button')}
+              title={trans('users.show.page.edit_big')}
               type='button'
             >
               <span className='fas fa-pencil-alt' />

diff --git a/resources/lang/en/events.php b/resources/lang/en/events.php
@@ -15,7 +15,7 @@
     'rank' => '<strong><em>:user</em></strong> achieved rank #:rank on <em>:beatmap</em> (:mode)',
     'rank_lost' => '<strong><em>:user</em></strong> has lost first place on <em>:beatmap</em> (:mode)',
     'user_support_again' => '<strong>:user</strong> has once again chosen to support osu! - thanks for your generosity!',
-    'user_support_first' => '<strong>:user</strong> has become an osu!supporter - thanks for your generosity!',
+    'user_support_first' => '<strong>:user</strong> has supported osu! - thanks for your generosity!',
     'user_support_gift' => '<strong>:user</strong> has received the gift of osu!supporter!',
     'username_change' => '<strong>:previousUsername</strong> has changed their username to <strong><em>:user</em></strong>!',