From 7d8036f38330355df94617434e487c6bf85eff4e Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 30 Aug 2024 20:57:33 +0900 Subject: [PATCH 01/36] Change parameter for country flag view Also pass single modifier as string. --- app/Libraries/LocaleMeta.php | 4 ++-- resources/views/accounts/_edit_country.blade.php | 3 +-- resources/views/accounts/_edit_sessions.blade.php | 4 ++-- resources/views/forum/topics/_post_info.blade.php | 5 ++--- resources/views/home/_landing_locales.blade.php | 4 ++-- resources/views/layout/header_mobile/_locales.blade.php | 4 ++-- resources/views/layout/nav2/_locales.blade.php | 8 ++++---- .../views/multiplayer/rooms/_rankings_table.blade.php | 5 ++--- resources/views/objects/_flag_country.blade.php | 6 +++--- .../views/rankings/_spotlight_rankings_table.blade.php | 5 ++--- resources/views/rankings/country.blade.php | 4 ++-- resources/views/rankings/kudosu.blade.php | 2 +- resources/views/rankings/performance.blade.php | 5 ++--- resources/views/rankings/score.blade.php | 5 ++--- resources/views/wiki/_locale_menu.blade.php | 8 ++++---- 15 files changed, 33 insertions(+), 39 deletions(-) diff --git a/app/Libraries/LocaleMeta.php b/app/Libraries/LocaleMeta.php index ec9771d7d70..be05d4a95bc 100644 --- a/app/Libraries/LocaleMeta.php +++ b/app/Libraries/LocaleMeta.php @@ -208,9 +208,9 @@ public function __construct($locale) $this->data = static::MAPPINGS[$locale]; } - public function flag(): string + public function flag(): array { - return $this->data['flag']; + return ['acronym' => $this->data['flag']]; } public function html(): string diff --git a/resources/views/accounts/_edit_country.blade.php b/resources/views/accounts/_edit_country.blade.php index f96a50b32ba..0958e237edf 100644 --- a/resources/views/accounts/_edit_country.blade.php +++ b/resources/views/accounts/_edit_country.blade.php @@ -15,8 +15,7 @@

@include('objects._flag_country', [ - 'countryCode' => $user->country_acronym, - 'countryName' => null, + 'country' => ['acronym' => $user->country_acronym], 'modifiers' => 'wiki', ]) {{ $user->country->name }} diff --git a/resources/views/accounts/_edit_sessions.blade.php b/resources/views/accounts/_edit_sessions.blade.php index 7be2fbc3e74..9f0730a41b2 100644 --- a/resources/views/accounts/_edit_sessions.blade.php +++ b/resources/views/accounts/_edit_sessions.blade.php @@ -32,8 +32,8 @@ @include('objects._flag_country', [ - 'countryCode' => $session['country']['code'], - 'modifiers' => ['flat'], + 'country' => ['acronym' => $session['country']['code']], + 'modifiers' => 'flat', ]) diff --git a/resources/views/forum/topics/_post_info.blade.php b/resources/views/forum/topics/_post_info.blade.php index 202d4d2523a..1cd1800a49d 100644 --- a/resources/views/forum/topics/_post_info.blade.php +++ b/resources/views/forum/topics/_post_info.blade.php @@ -79,9 +79,8 @@ class="forum-post-info__row forum-post-info__row--title" 'country' => $user->country->getKey(), ])}}"> @include('objects._flag_country', [ - 'countryCode' => $user->country->getKey(), - 'countryName' => $user->country->name, - 'modifiers' => ['medium'], + 'country' => $user->country, + 'modifiers' => 'medium', ])

diff --git a/resources/views/home/_landing_locales.blade.php b/resources/views/home/_landing_locales.blade.php index 8c2b8bdde4b..8597c0a197a 100644 --- a/resources/views/home/_landing_locales.blade.php +++ b/resources/views/home/_landing_locales.blade.php @@ -6,7 +6,7 @@ @include('objects._flag_country', [ - 'countryCode' => $currentLocaleMeta->flag(), + 'country' => $currentLocaleMeta->flag(), ]) @@ -38,7 +38,7 @@ class="landing-nav__locale-button" @include('objects._flag_country', [ - 'countryCode' => $localeMeta->flag(), + 'country' => $localeMeta->flag(), ]) diff --git a/resources/views/layout/header_mobile/_locales.blade.php b/resources/views/layout/header_mobile/_locales.blade.php index 9f5715111b1..123b831efec 100644 --- a/resources/views/layout/header_mobile/_locales.blade.php +++ b/resources/views/layout/header_mobile/_locales.blade.php @@ -17,7 +17,7 @@ class="navbar-mobile-item__main js-click-menu" @include('objects._flag_country', [ - 'countryCode' => $currentLocaleMeta->flag(), + 'country' => $currentLocaleMeta->flag(), 'modifiers' => ['small', 'flat'], ]) @@ -39,7 +39,7 @@ class="navbar-mobile-item__submenu-item js-click-menu--close" > @include('objects._flag_country', [ - 'countryCode' => $localeMeta->flag(), + 'country' => $localeMeta->flag(), 'modifiers' => ['small', 'flat'], ]) diff --git a/resources/views/layout/nav2/_locales.blade.php b/resources/views/layout/nav2/_locales.blade.php index da75bbf895b..296e6fe90db 100644 --- a/resources/views/layout/nav2/_locales.blade.php +++ b/resources/views/layout/nav2/_locales.blade.php @@ -7,8 +7,8 @@ class="nav-button js-click-menu" data-click-menu-target="nav2-locale-popup" > @include('objects._flag_country', [ - 'countryCode' => $currentLocaleMeta->flag(), - 'modifiers' => ['flat'], + 'country' => $currentLocaleMeta->flag(), + 'modifiers' => 'flat', ]) @@ -38,8 +38,8 @@ class=" @include('objects._flag_country', [ - 'countryCode' => $localeMeta->flag(), - 'modifiers' => ['flat'], + 'country' => $localeMeta->flag(), + 'modifiers' => 'flat', ]) diff --git a/resources/views/multiplayer/rooms/_rankings_table.blade.php b/resources/views/multiplayer/rooms/_rankings_table.blade.php index 9ed1385c7a0..24132cb2d99 100644 --- a/resources/views/multiplayer/rooms/_rankings_table.blade.php +++ b/resources/views/multiplayer/rooms/_rankings_table.blade.php @@ -36,9 +36,8 @@
@include('objects._flag_country', [ - 'countryName' => $score->user->country->name, - 'countryCode' => $score->user->country->acronym, - 'modifiers' => ['medium'], + 'country' => $score->user->country, + 'modifiers' => 'medium', ]) diff --git a/resources/views/rankings/_spotlight_rankings_table.blade.php b/resources/views/rankings/_spotlight_rankings_table.blade.php index 9927cff2a4e..e36e937eb28 100644 --- a/resources/views/rankings/_spotlight_rankings_table.blade.php +++ b/resources/views/rankings/_spotlight_rankings_table.blade.php @@ -39,9 +39,8 @@
@include('objects._flag_country', [ - 'countryName' => $score->user->country->name, - 'countryCode' => $score->user->country->acronym, - 'modifiers' => ['medium'], + 'country' => $score->user->country, + 'modifiers' => 'medium', ]) $score->country->acronym, ])}}"> @include('objects._flag_country', [ - 'countryCode' => $score->country->acronym, - 'modifiers' => ['medium'], + 'country' => ['acronym' => $score->country->acronym], + 'modifiers' => 'medium', ]) {{ $score->country->name }} diff --git a/resources/views/rankings/kudosu.blade.php b/resources/views/rankings/kudosu.blade.php index c7aeda3327a..fcca6d6c85c 100644 --- a/resources/views/rankings/kudosu.blade.php +++ b/resources/views/rankings/kudosu.blade.php @@ -38,7 +38,7 @@
@include('objects._flag_country', [ - 'countryCode' => $user->country_acronym, + 'country' => ['acronym' => $user->country_acronym], 'modifiers' => 'medium', ]) {!! link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!} diff --git a/resources/views/rankings/performance.blade.php b/resources/views/rankings/performance.blade.php index fd442850cf6..b957f678581 100644 --- a/resources/views/rankings/performance.blade.php +++ b/resources/views/rankings/performance.blade.php @@ -117,9 +117,8 @@ class="{{ class_with_modifiers('ranking-page-table__column', 'rank-change-icon', ]) }}" > @include('objects._flag_country', [ - 'countryName' => $score->user->country->name, - 'countryCode' => $score->user->country->acronym, - 'modifiers' => ['medium'], + 'country' => $score->user->country, + 'modifiers' => 'medium', ]) @include('objects._flag_country', [ - 'countryName' => $score->user->country->name, - 'countryCode' => $score->user->country->acronym, - 'modifiers' => ['medium'], + 'country' => $score->user->country, + 'modifiers' => 'medium', ]) @include('objects._flag_country', [ - 'countryCode' => $displayLocaleMeta->flag(), - 'modifiers' => ['flat'], + 'country' => $displayLocaleMeta->flag(), + 'modifiers' => 'flat', ]) @@ -59,8 +59,8 @@ class="simple-menu simple-menu--wiki-locales js-click-menu" @include('objects._flag_country', [ - 'countryCode' => $localeMeta->flag(), - 'modifiers' => ['flat'], + 'country' => $localeMeta->flag(), + 'modifiers' => 'flat', ]) From 78d0aa37cef3d48e93ad72ae578e4c0bd3ba9a3d Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 13 Sep 2024 22:55:05 +0900 Subject: [PATCH 02/36] Use fa-var variables Reference: `node_modules/@fortawesome/fontawesome-free/less/_variables.less` --- resources/css/bem/form-select.less | 2 +- resources/css/bem/osu-switch-v2.less | 4 ++-- resources/css/bem/supporter-heart.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/css/bem/form-select.less b/resources/css/bem/form-select.less index 31272662816..2c6d59f49ad 100644 --- a/resources/css/bem/form-select.less +++ b/resources/css/bem/form-select.less @@ -26,7 +26,7 @@ &::after { .fas(); .center-content(); - content: "\f078"; + content: @fa-var-chevron-down; padding: 0 10px; position: absolute; right: 0; diff --git a/resources/css/bem/osu-switch-v2.less b/resources/css/bem/osu-switch-v2.less index 62fb672589a..dd83f81306c 100644 --- a/resources/css/bem/osu-switch-v2.less +++ b/resources/css/bem/osu-switch-v2.less @@ -54,7 +54,7 @@ &::after { .fas(); - content: "\f00c"; + content: @fa-var-check; } } @@ -63,7 +63,7 @@ &::after { .fas(); - content: "\f068"; + content: @fa-var-minus; opacity: 1; } } diff --git a/resources/css/bem/supporter-heart.less b/resources/css/bem/supporter-heart.less index a8c5fd05756..9c588c485bc 100644 --- a/resources/css/bem/supporter-heart.less +++ b/resources/css/bem/supporter-heart.less @@ -92,7 +92,7 @@ &::after { .fas(); - content: "\f004"; //fa-heart + content: @fa-var-heart; .own-layer(); will-change: text-shadow, transform; } From eaaea4446a494d0f7efc8a3dff8309bd449d3696 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 13 Sep 2024 23:07:54 +0900 Subject: [PATCH 03/36] Use subgrid for store cart --- resources/css/bem/cart-items.less | 8 ++++++++ resources/css/bem/store-order-item.less | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/css/bem/cart-items.less b/resources/css/bem/cart-items.less index 10c5a563f78..c25abd94349 100644 --- a/resources/css/bem/cart-items.less +++ b/resources/css/bem/cart-items.less @@ -6,4 +6,12 @@ padding: 0; display: grid; gap: 5px; + + @media @narrow-up { + grid-template-columns: 1fr repeat(3, auto); + } + + &__item { + display: contents; + } } diff --git a/resources/css/bem/store-order-item.less b/resources/css/bem/store-order-item.less index 068630c170c..cce43581727 100644 --- a/resources/css/bem/store-order-item.less +++ b/resources/css/bem/store-order-item.less @@ -14,8 +14,9 @@ font-size: @font-size--title-small; @media @narrow-up { + grid-column: ~"1 / -1"; grid-template-areas: "name quantity subtotal delete"; - grid-template-columns: 1fr 150px 100px 35px; + grid-template-columns: subgrid; grid-template-rows: auto; } From 66a24896e64ba2d13cf42fb23ae886a640bacd77 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 17 Sep 2024 13:15:40 +0900 Subject: [PATCH 04/36] document profile_hue --- resources/views/docs/_structures/user_extended.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/docs/_structures/user_extended.md b/resources/views/docs/_structures/user_extended.md index d0e843ec59f..27c6b4fa6b7 100644 --- a/resources/views/docs/_structures/user_extended.md +++ b/resources/views/docs/_structures/user_extended.md @@ -179,7 +179,7 @@ occupation | string? | | playmode | [Ruleset](#ruleset) | | playstyle | string[] | Device choices of the user. post_count | integer | Number of forum posts -profile_hue | integer? | | +profile_hue | integer? | The custom `hsl` hue colour value for the user profile. profile_order | [ProfilePage](#user-profilepage)[] | ordered array of sections in user profile page title | string? | user-specific title title_url | string? | | From 640cf87f5d474712e32f9b2a1d84123100692a3b Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 17 Sep 2024 13:20:28 +0900 Subject: [PATCH 05/36] fix weird phrasing --- resources/views/docs/_structures/user_extended.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/docs/_structures/user_extended.md b/resources/views/docs/_structures/user_extended.md index 27c6b4fa6b7..1ea25eb5800 100644 --- a/resources/views/docs/_structures/user_extended.md +++ b/resources/views/docs/_structures/user_extended.md @@ -169,7 +169,7 @@ Field | Type | Description ---------------- | ---------------------------------- | ----------------------------------------------------------- cover_url | string | url of profile cover. Deprecated, use cover.url instead. discord | string? | | -has_supported | boolean | whether or not ever being a supporter in the past +has_supported | boolean | Whether or not the user has a current or past osu!supporter tag. interests | string? | | join_date | [Timestamp](#timestamp) | | location | string? | | From 9c015fcb7a3df0f446882951f6fb571b6ee05653 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 17 Sep 2024 19:46:41 +0900 Subject: [PATCH 06/36] Update resources/views/docs/_structures/user_extended.md Co-authored-by: clayton --- resources/views/docs/_structures/user_extended.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/docs/_structures/user_extended.md b/resources/views/docs/_structures/user_extended.md index 1ea25eb5800..77834635b22 100644 --- a/resources/views/docs/_structures/user_extended.md +++ b/resources/views/docs/_structures/user_extended.md @@ -179,7 +179,7 @@ occupation | string? | | playmode | [Ruleset](#ruleset) | | playstyle | string[] | Device choices of the user. post_count | integer | Number of forum posts -profile_hue | integer? | The custom `hsl` hue colour value for the user profile. +profile_hue | integer? | Custom colour hue in HSL degrees (0–359). profile_order | [ProfilePage](#user-profilepage)[] | ordered array of sections in user profile page title | string? | user-specific title title_url | string? | | From 33626927b89420a653b69567a64e7f5b2be7a18f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 19 Sep 2024 15:01:53 +0900 Subject: [PATCH 07/36] Update translations from crowdin --- resources/lang/ar/beatmapsets.php | 1 + resources/lang/ar/rankings.php | 7 +++++ resources/lang/be/beatmapsets.php | 1 + resources/lang/be/contest.php | 2 +- resources/lang/be/password_reset.php | 6 ++-- resources/lang/be/rankings.php | 7 +++++ resources/lang/be/users.php | 4 +-- resources/lang/bg/beatmapsets.php | 1 + resources/lang/bg/rankings.php | 7 +++++ resources/lang/ca/beatmapsets.php | 1 + resources/lang/ca/rankings.php | 7 +++++ resources/lang/cs/beatmapsets.php | 1 + resources/lang/cs/rankings.php | 7 +++++ resources/lang/cs/users.php | 2 +- resources/lang/da/beatmapsets.php | 1 + resources/lang/da/rankings.php | 7 +++++ resources/lang/da/users.php | 28 ++++++++--------- resources/lang/de/beatmapsets.php | 5 ++-- resources/lang/de/rankings.php | 7 +++++ resources/lang/de/users.php | 4 +-- resources/lang/el/beatmapsets.php | 1 + resources/lang/el/rankings.php | 7 +++++ resources/lang/es-419/beatmapsets.php | 1 + resources/lang/es-419/rankings.php | 7 +++++ resources/lang/es-419/users.php | 2 +- resources/lang/es/beatmapsets.php | 1 + resources/lang/es/rankings.php | 7 +++++ resources/lang/es/users.php | 2 +- resources/lang/fa-IR/beatmapsets.php | 1 + resources/lang/fa-IR/rankings.php | 7 +++++ resources/lang/fi/beatmapsets.php | 1 + resources/lang/fi/rankings.php | 7 +++++ resources/lang/fil/beatmapsets.php | 1 + resources/lang/fil/rankings.php | 7 +++++ resources/lang/fr/beatmapsets.php | 3 +- resources/lang/fr/rankings.php | 7 +++++ resources/lang/fr/users.php | 2 +- resources/lang/he/beatmapsets.php | 1 + resources/lang/he/rankings.php | 7 +++++ resources/lang/hr-HR/beatmapsets.php | 1 + resources/lang/hr-HR/rankings.php | 7 +++++ resources/lang/hu/beatmapsets.php | 1 + resources/lang/hu/rankings.php | 7 +++++ resources/lang/id/beatmaps.php | 6 ++-- resources/lang/id/beatmapsets.php | 1 + resources/lang/id/rankings.php | 7 +++++ resources/lang/id/users.php | 2 +- resources/lang/it/beatmapsets.php | 1 + resources/lang/it/rankings.php | 7 +++++ resources/lang/it/users.php | 2 +- resources/lang/ja/beatmapsets.php | 1 + resources/lang/ja/rankings.php | 7 +++++ resources/lang/kk-KZ/beatmapsets.php | 1 + resources/lang/kk-KZ/rankings.php | 7 +++++ resources/lang/ko/beatmapsets.php | 3 +- resources/lang/ko/models.php | 2 +- resources/lang/ko/rankings.php | 7 +++++ resources/lang/ko/users.php | 4 +-- resources/lang/lt/beatmapsets.php | 1 + resources/lang/lt/rankings.php | 7 +++++ resources/lang/lv-LV/beatmapsets.php | 1 + resources/lang/lv-LV/rankings.php | 7 +++++ resources/lang/ms-MY/beatmapsets.php | 1 + resources/lang/ms-MY/rankings.php | 7 +++++ resources/lang/nl/beatmapsets.php | 1 + resources/lang/nl/rankings.php | 7 +++++ resources/lang/no/beatmapsets.php | 1 + resources/lang/no/rankings.php | 7 +++++ resources/lang/pl/beatmapsets.php | 1 + resources/lang/pl/rankings.php | 7 +++++ resources/lang/pt-br/beatmapsets.php | 1 + resources/lang/pt-br/rankings.php | 7 +++++ resources/lang/pt-br/users.php | 2 +- resources/lang/pt/beatmapsets.php | 1 + resources/lang/pt/rankings.php | 7 +++++ resources/lang/ro/beatmapsets.php | 1 + resources/lang/ro/rankings.php | 7 +++++ resources/lang/ro/users.php | 2 +- resources/lang/ru/beatmapsets.php | 1 + resources/lang/ru/rankings.php | 7 +++++ resources/lang/ru/user_verification.php | 2 +- resources/lang/ru/users.php | 2 +- resources/lang/si-LK/beatmapsets.php | 1 + resources/lang/si-LK/rankings.php | 7 +++++ resources/lang/sk/beatmapsets.php | 1 + resources/lang/sk/rankings.php | 7 +++++ resources/lang/sl/beatmapsets.php | 1 + resources/lang/sl/rankings.php | 7 +++++ resources/lang/sr/accounts.php | 6 ++-- resources/lang/sr/beatmaps.php | 8 ++--- resources/lang/sr/beatmapsets.php | 1 + resources/lang/sr/changelog.php | 4 +-- resources/lang/sr/comments.php | 10 +++---- resources/lang/sr/common.php | 32 ++++++++++---------- resources/lang/sr/events.php | 10 +++---- resources/lang/sr/rankings.php | 7 +++++ resources/lang/sr/users.php | 5 ++-- resources/lang/sv/beatmapsets.php | 1 + resources/lang/sv/rankings.php | 7 +++++ resources/lang/tg-TJ/beatmapsets.php | 1 + resources/lang/tg-TJ/rankings.php | 7 +++++ resources/lang/th/accounts.php | 2 +- resources/lang/th/beatmaps.php | 4 +-- resources/lang/th/beatmapsets.php | 11 +++---- resources/lang/th/chat.php | 6 ++-- resources/lang/th/common.php | 2 +- resources/lang/th/contest.php | 26 ++++++++-------- resources/lang/th/errors.php | 4 +-- resources/lang/th/layout.php | 8 ++--- resources/lang/th/models.php | 6 ++-- resources/lang/th/oauth.php | 2 +- resources/lang/th/page_title.php | 6 ++-- resources/lang/th/password_reset.php | 2 +- resources/lang/th/rankings.php | 9 +++++- resources/lang/th/report.php | 4 +-- resources/lang/th/score_tokens.php | 4 +-- resources/lang/th/scores.php | 6 ++-- resources/lang/th/user_cover_presets.php | 34 ++++++++++----------- resources/lang/th/users.php | 38 ++++++++++++------------ resources/lang/tr/beatmapsets.php | 13 ++++---- resources/lang/tr/contest.php | 2 +- resources/lang/tr/rankings.php | 7 +++++ resources/lang/tr/users.php | 2 +- resources/lang/uk/beatmapsets.php | 1 + resources/lang/uk/rankings.php | 7 +++++ resources/lang/uk/users.php | 2 +- resources/lang/vi/beatmapsets.php | 1 + resources/lang/vi/rankings.php | 7 +++++ resources/lang/vi/users.php | 2 +- resources/lang/zh-tw/beatmapsets.php | 1 + resources/lang/zh-tw/rankings.php | 7 +++++ resources/lang/zh-tw/users.php | 2 +- resources/lang/zh/beatmapsets.php | 1 + resources/lang/zh/rankings.php | 7 +++++ resources/lang/zh/users.php | 2 +- 135 files changed, 526 insertions(+), 175 deletions(-) diff --git a/resources/lang/ar/beatmapsets.php b/resources/lang/ar/beatmapsets.php index 34970e2b0ae..ca40033b97b 100644 --- a/resources/lang/ar/beatmapsets.php +++ b/resources/lang/ar/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'هل أنت متأكد من أنك تريد ترشيح هذه الخريطة؟', + 'different_nominator_warning' => '', 'header' => 'ترشيح خريطة', 'hybrid_warning' => 'ملاحظة: يمكنك أن ترشح مرة واحدة فقط، لذا يرجى التأكد من أنك ترشح لجميع أنماط اللعبة التي تنويها', 'current_main_ruleset' => 'النمط الرئيسي حالياً: :ruleset', diff --git a/resources/lang/ar/rankings.php b/resources/lang/ar/rankings.php index b33a5449615..5cd9a3884a3 100644 --- a/resources/lang/ar/rankings.php +++ b/resources/lang/ar/rankings.php @@ -9,6 +9,12 @@ 'title' => 'الدولة', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'عرض', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'منطقة ألأضواء', 'country' => 'الدولة', + 'daily_challenge' => '', 'kudosu' => 'كودوسو', 'multiplayer' => 'متعدد اللاعبين', 'performance' => 'الأداء', diff --git a/resources/lang/be/beatmapsets.php b/resources/lang/be/beatmapsets.php index cbe85f451dd..51aa989f489 100644 --- a/resources/lang/be/beatmapsets.php +++ b/resources/lang/be/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Вы сапраўды жадаеце намінаваць гэту бiтмапу?', + 'different_nominator_warning' => '', 'header' => 'Намінаваць бiтмапу', 'hybrid_warning' => 'заўвага: вы можаце намінаваць толькі адзін раз, таму, калі ласка, пераканайцеся, што вы вылучаецеся для ўсіх рэжымаў гульні, якіх вы збіраецеся', 'current_main_ruleset' => '', diff --git a/resources/lang/be/contest.php b/resources/lang/be/contest.php index fb9d4c4db0c..c3e0fdfceda 100644 --- a/resources/lang/be/contest.php +++ b/resources/lang/be/contest.php @@ -14,7 +14,7 @@ ], 'judge' => [ - 'comments' => '', + 'comments' => 'каментарыі', 'hide_judged' => '', 'nav_title' => '', 'no_current_vote' => 'вы яшчэ не прагаласавалі.', diff --git a/resources/lang/be/password_reset.php b/resources/lang/be/password_reset.php index 7a34748971a..e378b4da92b 100644 --- a/resources/lang/be/password_reset.php +++ b/resources/lang/be/password_reset.php @@ -11,7 +11,7 @@ ], 'error' => [ - 'contact_support' => 'Звярніцеся ў службу падтрымкі для аднаўлення акаўнту.', + 'contact_support' => 'Звярніцеся ў службу падтрымкі для аднаўлення ўліковага запісу.', 'expired' => 'Дзеянне верыфікацыйнага кода скончылася.', 'invalid' => 'Нечаканая памылка ў кодзе спраўджання.', 'is_privileged' => 'Калі ласка, звяжыцеся з адміністратарам, каб аднавіць акаўнт.', @@ -29,7 +29,7 @@ 'started' => [ 'password' => 'Новы пароль', 'password_confirmation' => 'Пацвярджэнне пароля', - 'title' => 'Скід паролю для акаўнту + 'title' => 'Скід паролю для ўліковага запісу :username.', 'verification_key' => 'Код праверкі', ], @@ -38,7 +38,7 @@ 'username' => 'Увядзіце эл. пошту або імя карыстальніка', 'reason' => [ - 'inactive_different_country' => "", + 'inactive_different_country' => "Ваш уліковы запіс даўно не выкарыстоўваўся. Каб забяспечыць бяспеку вашага ўліковага запісу, скіньце пароль.", ], 'support' => [ '_' => 'Патрэбна дадатковая дапамога? Звяжыцеся з намі :button.', diff --git a/resources/lang/be/rankings.php b/resources/lang/be/rankings.php index f340e344532..089f352bc9e 100644 --- a/resources/lang/be/rankings.php +++ b/resources/lang/be/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Краіна', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Паказаць', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'па чартам', 'country' => 'па краінам', + 'daily_challenge' => '', 'kudosu' => 'кудосу', 'multiplayer' => 'мультыплэер', 'performance' => 'па прадукцыйнасці', diff --git a/resources/lang/be/users.php b/resources/lang/be/users.php index 2179f61f165..56912c04721 100644 --- a/resources/lang/be/users.php +++ b/resources/lang/be/users.php @@ -97,7 +97,7 @@ 'force_reactivation' => [ 'reason' => [ - 'inactive' => "", + 'inactive' => "Ваш улікавы запіс даўно не выкарыстоўваўся.", 'inactive_different_country' => "Ваш акаўнт не выкарыстоўваўся доўгі час.", ], ], @@ -126,7 +126,7 @@ 'ogp' => [ 'modding_description' => '', - 'modding_description_empty' => '', + 'modding_description_empty' => 'Карыстальнік не мае бітмапаў...', 'description' => [ '_' => '', diff --git a/resources/lang/bg/beatmapsets.php b/resources/lang/bg/beatmapsets.php index 4b18d2bee3e..2fc92c172fd 100644 --- a/resources/lang/bg/beatmapsets.php +++ b/resources/lang/bg/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Сигурни ли сте, че искате да номинирате този бийтмап?', + 'different_nominator_warning' => '', 'header' => 'Номиниране на бийтмап', 'hybrid_warning' => 'бележка: може да се номинира само веднъж, затова се уверете че сте избрали всеки желан вид', 'current_main_ruleset' => 'Основният вид игра в момента е: :ruleset', diff --git a/resources/lang/bg/rankings.php b/resources/lang/bg/rankings.php index 954b084da7f..d0b7c0ad94c 100644 --- a/resources/lang/bg/rankings.php +++ b/resources/lang/bg/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Държава', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Покажи', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'под прожекторите', 'country' => 'държава', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'мултиплейър', 'performance' => 'представяне', diff --git a/resources/lang/ca/beatmapsets.php b/resources/lang/ca/beatmapsets.php index 39bd3e39e4a..00482f35413 100644 --- a/resources/lang/ca/beatmapsets.php +++ b/resources/lang/ca/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Esteu segur que voleu nominar aquest beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nominar beatmap', 'hybrid_warning' => 'nota: només pot nominar una vegada, així que assegureu-vos que està nominant per a totes els modes de joc que desitgi', 'current_main_ruleset' => '', diff --git a/resources/lang/ca/rankings.php b/resources/lang/ca/rankings.php index 0c29cd1e194..86ba58e8f77 100644 --- a/resources/lang/ca/rankings.php +++ b/resources/lang/ca/rankings.php @@ -9,6 +9,12 @@ 'title' => 'País', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Mostra', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'spotlights', 'country' => 'país', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multijugador', 'performance' => 'rendiment', diff --git a/resources/lang/cs/beatmapsets.php b/resources/lang/cs/beatmapsets.php index c3ca54c9a71..d6043df8b09 100644 --- a/resources/lang/cs/beatmapsets.php +++ b/resources/lang/cs/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Jste si jisti, že chcete nominovat tuto beatmapu?', + 'different_nominator_warning' => '', 'header' => 'Nominovat beatmapu', 'hybrid_warning' => 'poznámka: můžete nominovat pouze jednou, takže se ujistěte, že nominujete za všechny herní režimy, které chcete', 'current_main_ruleset' => 'Hlavní ruleset je aktuálně: :ruleset', diff --git a/resources/lang/cs/rankings.php b/resources/lang/cs/rankings.php index 73b33dc48ef..369bb33d25b 100644 --- a/resources/lang/cs/rankings.php +++ b/resources/lang/cs/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Stát', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Zobrazit', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'výběry (staré)', 'country' => 'stát', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'hra pro více hráčů', 'performance' => 'výkon', diff --git a/resources/lang/cs/users.php b/resources/lang/cs/users.php index 01afd783bff..0780485438c 100644 --- a/resources/lang/cs/users.php +++ b/resources/lang/cs/users.php @@ -200,7 +200,7 @@ 'daily' => 'Dnů v řadě', 'daily_streak_best' => 'Nejvíce dnů v řadě', 'daily_streak_current' => 'Aktuálně dnů v řadě', - 'playcount' => '', + 'playcount' => 'Celková účast', 'title' => 'Denní\nvýzva', 'top_10p_placements' => 'Umístění v Top 10%', 'top_50p_placements' => 'Umístění v Top 50%', diff --git a/resources/lang/da/beatmapsets.php b/resources/lang/da/beatmapsets.php index ac69affa8ae..f765e74b70f 100644 --- a/resources/lang/da/beatmapsets.php +++ b/resources/lang/da/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Er du sikker på du vil nominere dette Beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nominér Beatmap', 'hybrid_warning' => 'bemærk: du kan kun nominere én gang, så sørg for at du nominerer til alle spiltilstande, du har til hensigt til', 'current_main_ruleset' => '', diff --git a/resources/lang/da/rankings.php b/resources/lang/da/rankings.php index 366151da2c8..c7f14362c31 100644 --- a/resources/lang/da/rankings.php +++ b/resources/lang/da/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Land', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Vis', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Baner', 'country' => 'Land', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => 'multiplayer', 'performance' => 'Præstation', diff --git a/resources/lang/da/users.php b/resources/lang/da/users.php index 567eb99c1de..ac2ca55fe44 100644 --- a/resources/lang/da/users.php +++ b/resources/lang/da/users.php @@ -7,7 +7,7 @@ 'deleted' => '[slettet bruger]', 'beatmapset_activities' => [ - 'title' => ":user's Modding Historie", + 'title' => ":user's Moddinghistorik", 'title_compact' => 'Modding', 'discussions' => [ @@ -221,7 +221,7 @@ 'title' => '', 'upload' => [ - 'broken_file' => 'Kunne ikke uploade billedet. Prøv igen.', + 'broken_file' => 'Kunne ikke uploade billedet. Kontroller det uploadede billede og prøv igen.', 'button' => 'Upload billede', 'dropzone' => 'Smid her for at uploade', 'dropzone_info' => 'Du kan også smide dit billede her for at uploade', @@ -284,7 +284,7 @@ 'title' => 'Afventende Beatmaps', ], 'ranked' => [ - 'title' => 'Ranked & Godkendte Beatmaps', + 'title' => 'Rangerede & Godkendte Beatmaps', ], ], 'discussions' => [ @@ -318,7 +318,7 @@ ], ], 'kudosu' => [ - 'recent_entries' => 'Seneste Kudosu Historie', + 'recent_entries' => 'Seneste Kudosu Historik', 'title' => 'Kudosu!', 'total' => 'Total Kudosu Optjent', @@ -328,29 +328,29 @@ 'beatmap_discussion' => [ 'allow_kudosu' => [ - 'give' => 'Modtog :amount fra kudosu benægtelsesophævelse af modding opslaget :post', + 'give' => 'Modtog :amount fra kudosu benægtelsesophævelse af moddingopslaget :post', ], 'deny_kudosu' => [ - 'reset' => 'Benægtet :amount fra modding opslaget :post', + 'reset' => 'Benægtet :amount fra moddingopslaget :post', ], 'delete' => [ - 'reset' => 'Mistede :amount fra sletning af modding opslag :post', + 'reset' => 'Mistede :amount fra sletning af moddingopslag :post', ], 'restore' => [ - 'give' => 'Modtog :amount fra modding opslag genetablering af :post', + 'give' => 'Modtog :amount fra genetablering af moddingopslaget :post', ], 'vote' => [ - 'give' => 'Modtog :amount fra at få stemmer på modding opslaget :post', - 'reset' => 'Mistede :amount fra at miste stemmer på modding opslaget :post', + 'give' => 'Modtog :amount fra at få stemmer på moddingopslaget :post', + 'reset' => 'Mistede :amount fra at miste stemmer på moddingopslaget :post', ], 'recalculate' => [ - 'give' => 'Modtog :amount fra genberegning af stemmer i modding opslaget :post', - 'reset' => 'Mistede :amount fra genberegning af stemmer i modding opslaget :post', + 'give' => 'Modtog :amount fra genberegning af stemmer i moddingopslaget :post', + 'reset' => 'Mistede :amount fra genberegning af stemmer i moddingopslaget :post', ], ], @@ -501,7 +501,7 @@ ], 'silenced_banner' => [ - 'title' => 'Du er i øjeblikket gjort tavs.', + 'title' => 'Du er i øjeblikket muted.', 'message' => 'Nogle handlinger kan være utilgængelige.', ], @@ -520,7 +520,7 @@ ], 'view_mode' => [ - 'brick' => 'Klods visning', + 'brick' => 'Klodsvisning', 'card' => 'Kortvisning', 'list' => 'Listevisning', ], diff --git a/resources/lang/de/beatmapsets.php b/resources/lang/de/beatmapsets.php index 8f964888854..48645a3f252 100644 --- a/resources/lang/de/beatmapsets.php +++ b/resources/lang/de/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Bist du sicher, dass du diese Beatmap nominieren möchtest?', + 'different_nominator_warning' => '', 'header' => 'Beatmap nominieren', 'hybrid_warning' => 'Hinweis: du kannst nur einmalig nominieren, also stelle bitte sicher, dass du für alle Spielmodi nominierst, die du beabsichtigst', 'current_main_ruleset' => 'Der Hauptspielmodus ist derzeit: :ruleset', @@ -212,8 +213,8 @@ 'stars' => 'Sternebewertung', 'total_length' => 'Länge (Drain length: :hit_length)', 'bpm' => 'BPM', - 'count_circles' => 'Circle-Anzahl', - 'count_sliders' => 'Slider-Anzahl', + 'count_circles' => 'Anzahl der Circles', + 'count_sliders' => 'Anzahl der Slider', 'offset' => 'Online-Offset: :offset', 'user-rating' => 'User-Bewertungen', 'rating-spread' => 'Bewertungsverteilung', diff --git a/resources/lang/de/rankings.php b/resources/lang/de/rankings.php index dc12748daf4..1e38f1cbb08 100644 --- a/resources/lang/de/rankings.php +++ b/resources/lang/de/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Land', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Anzeigen', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Spotlights (alt)', 'country' => 'Länder', + 'daily_challenge' => '', 'kudosu' => 'Kudosu', 'multiplayer' => 'Mehrspieler', 'performance' => 'Performance', diff --git a/resources/lang/de/users.php b/resources/lang/de/users.php index b5f908e1b81..e8aabcc7e66 100644 --- a/resources/lang/de/users.php +++ b/resources/lang/de/users.php @@ -200,7 +200,7 @@ 'daily' => 'Tägliche Serie', 'daily_streak_best' => 'Beste Tagesserie', 'daily_streak_current' => 'Aktuelle Tagesserie', - 'playcount' => '', + 'playcount' => 'Gesamtbeteiligung', 'title' => 'Tägliche\nHerausforderung', 'top_10p_placements' => 'Platzierungen in den Top 10 %', 'top_50p_placements' => 'Platzierungen in den Top 50 %', @@ -420,7 +420,7 @@ ], 'account_standing' => [ 'title' => 'Accountstatus', - 'bad_standing' => "Der Account von :username ist zurzeit eingeschränkt :(", + 'bad_standing' => "Der Account von :username hat zurzeit keinen guten Ruf :(", 'remaining_silence' => ':username kann in :duration wieder sprechen.', 'recent_infringements' => [ diff --git a/resources/lang/el/beatmapsets.php b/resources/lang/el/beatmapsets.php index 7bc9ea2067f..5ca9d15a706 100644 --- a/resources/lang/el/beatmapsets.php +++ b/resources/lang/el/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '', + 'different_nominator_warning' => '', 'header' => '', 'hybrid_warning' => '', 'current_main_ruleset' => '', diff --git a/resources/lang/el/rankings.php b/resources/lang/el/rankings.php index d0b297ba82b..924b758074f 100644 --- a/resources/lang/el/rankings.php +++ b/resources/lang/el/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Χώρα', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Εμφάνιση', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Spotlights', 'country' => 'Χώρας', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multiplayer', 'performance' => 'Επίδοσης', diff --git a/resources/lang/es-419/beatmapsets.php b/resources/lang/es-419/beatmapsets.php index d2069b519fc..23969e1bf21 100644 --- a/resources/lang/es-419/beatmapsets.php +++ b/resources/lang/es-419/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '¿Estás seguro de que quieres nominar este mapa?', + 'different_nominator_warning' => '', 'header' => 'Nominar mapa', 'hybrid_warning' => 'nota: solo puedes nominar una vez, así que asegúrate de que estás nominando todos los modos de juego que quieres nominar', 'current_main_ruleset' => 'El modo de juego principal es: :ruleset', diff --git a/resources/lang/es-419/rankings.php b/resources/lang/es-419/rankings.php index 4e3fab84731..82692639c77 100644 --- a/resources/lang/es-419/rankings.php +++ b/resources/lang/es-419/rankings.php @@ -9,6 +9,12 @@ 'title' => 'País', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Mostrar', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'spotlights (viejo)', 'country' => 'país', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multijugador', 'performance' => 'rendimiento', diff --git a/resources/lang/es-419/users.php b/resources/lang/es-419/users.php index 109430d9aa1..293ae987847 100644 --- a/resources/lang/es-419/users.php +++ b/resources/lang/es-419/users.php @@ -200,7 +200,7 @@ 'daily' => 'Racha diaria', 'daily_streak_best' => 'Mejor racha diaria', 'daily_streak_current' => 'Racha diaria actual', - 'playcount' => '', + 'playcount' => 'Participación total', 'title' => 'Desafío\ndiario', 'top_10p_placements' => 'Puestos en el top 10 %', 'top_50p_placements' => 'Puestos en el top 50 %', diff --git a/resources/lang/es/beatmapsets.php b/resources/lang/es/beatmapsets.php index 830a8767b2a..3449c9ebbe9 100644 --- a/resources/lang/es/beatmapsets.php +++ b/resources/lang/es/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '¿Estás seguro de que quieres nominar este mapa?', + 'different_nominator_warning' => '', 'header' => 'Nominar mapa', 'hybrid_warning' => 'nota: solo puedes nominar una vez, así que asegúrate de que estás nominando para todos los modos de juego que desees', 'current_main_ruleset' => 'El modo de juego principal es: :ruleset', diff --git a/resources/lang/es/rankings.php b/resources/lang/es/rankings.php index a2b28ee9c2d..9b65d670f35 100644 --- a/resources/lang/es/rankings.php +++ b/resources/lang/es/rankings.php @@ -9,6 +9,12 @@ 'title' => 'País', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Mostrar', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'destacados', 'country' => 'país', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multijugador', 'performance' => 'rendimiento', diff --git a/resources/lang/es/users.php b/resources/lang/es/users.php index 007c29e5fc1..9195c96a05f 100644 --- a/resources/lang/es/users.php +++ b/resources/lang/es/users.php @@ -200,7 +200,7 @@ 'daily' => 'Racha diaria', 'daily_streak_best' => 'Mejor racha diaria', 'daily_streak_current' => 'Racha diaria actual', - 'playcount' => '', + 'playcount' => 'Participación total', 'title' => 'Desafío\ndiario', 'top_10p_placements' => 'Puestos en el top 10 %', 'top_50p_placements' => 'Puestos en el top 50 %', diff --git a/resources/lang/fa-IR/beatmapsets.php b/resources/lang/fa-IR/beatmapsets.php index 74e84201711..fc92a0b0556 100644 --- a/resources/lang/fa-IR/beatmapsets.php +++ b/resources/lang/fa-IR/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '', + 'different_nominator_warning' => '', 'header' => '', 'hybrid_warning' => '', 'current_main_ruleset' => '', diff --git a/resources/lang/fa-IR/rankings.php b/resources/lang/fa-IR/rankings.php index f6c411d2b49..49a7f9e0669 100644 --- a/resources/lang/fa-IR/rankings.php +++ b/resources/lang/fa-IR/rankings.php @@ -9,6 +9,12 @@ 'title' => '', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '', 'country' => '', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => '', 'performance' => '', diff --git a/resources/lang/fi/beatmapsets.php b/resources/lang/fi/beatmapsets.php index d1a96e3cf21..adf8d3f1bc2 100644 --- a/resources/lang/fi/beatmapsets.php +++ b/resources/lang/fi/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Oletko varma, että haluat asettaa tämän rytmikartan ehdolle?', + 'different_nominator_warning' => '', 'header' => 'Ehdollepane rytmikartta', 'hybrid_warning' => 'huomaa: voit tehdä ehdollepanon vain kerran, joten varmista, että asetat todella ehdolle kaikki tarkoittamasi pelimuodot', 'current_main_ruleset' => 'Ensisijainen pelimuoto on tällä hetkellä: :ruleset', diff --git a/resources/lang/fi/rankings.php b/resources/lang/fi/rankings.php index 1229004356f..62128787d53 100644 --- a/resources/lang/fi/rankings.php +++ b/resources/lang/fi/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Maa', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Näytä', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'kohdevalot (vanha)', 'country' => 'maat', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'moninpelit', 'performance' => 'suorituskyky', diff --git a/resources/lang/fil/beatmapsets.php b/resources/lang/fil/beatmapsets.php index a7810fccf86..8ba0e5b9062 100644 --- a/resources/lang/fil/beatmapsets.php +++ b/resources/lang/fil/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Sigurado ka bang gusto mong i-nomina ito?', + 'different_nominator_warning' => '', 'header' => 'Inomina ang Beatmap', 'hybrid_warning' => 'tandaan: ikaw ay maaaring mag-nominate nang isang beses lamang, kaya siguraduhin na ikaw ay nagno-nominate para sa lahat ng game mode na iyong binabalak', 'current_main_ruleset' => '', diff --git a/resources/lang/fil/rankings.php b/resources/lang/fil/rankings.php index 1ab45b46425..9bfadcf5dce 100644 --- a/resources/lang/fil/rankings.php +++ b/resources/lang/fil/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Bansa', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Ipakita', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Mga Spotlight', 'country' => 'Bansa', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multiplayer', 'performance' => 'Performance', diff --git a/resources/lang/fr/beatmapsets.php b/resources/lang/fr/beatmapsets.php index 06f43c6faa4..5bc95090f0b 100644 --- a/resources/lang/fr/beatmapsets.php +++ b/resources/lang/fr/beatmapsets.php @@ -17,7 +17,7 @@ 'download' => [ 'limit_exceeded' => 'Ralentissez, jouez plus.', - 'no_mirrors' => 'Aucun serveur de téléchargements disponible.', + 'no_mirrors' => 'Aucun serveur de téléchargement disponible.', ], 'featured_artist_badge' => [ @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Êtes-vous sûr de vouloir nominer cette beatmap ?', + 'different_nominator_warning' => '', 'header' => 'Nominer la beatmap', 'hybrid_warning' => 'remarque : vous ne pouvez nominer qu\'une seule fois, assurez-vous alors que vous nominez la beatmap pour tous les modes de jeu que vous souhaitez', 'current_main_ruleset' => 'Le mode de jeu principal est actuellement : :ruleset', diff --git a/resources/lang/fr/rankings.php b/resources/lang/fr/rankings.php index c88c6f3f407..747b73b086a 100644 --- a/resources/lang/fr/rankings.php +++ b/resources/lang/fr/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Pays', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Afficher', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'spotlights (ancien)', 'country' => 'pays', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multijoueur', 'performance' => 'performance', diff --git a/resources/lang/fr/users.php b/resources/lang/fr/users.php index 120113afdb5..431120a40e8 100644 --- a/resources/lang/fr/users.php +++ b/resources/lang/fr/users.php @@ -200,7 +200,7 @@ 'daily' => 'Série quotidienne', 'daily_streak_best' => 'Meilleure série quotidienne', 'daily_streak_current' => 'Série quotidienne actuelle', - 'playcount' => '', + 'playcount' => 'Participations totales', 'title' => 'Défi\ndu Jour', 'top_10p_placements' => 'Placements dans le Top 10%', 'top_50p_placements' => 'Placements dans le Top 50%', diff --git a/resources/lang/he/beatmapsets.php b/resources/lang/he/beatmapsets.php index 9481cdb29e0..a50f200456a 100644 --- a/resources/lang/he/beatmapsets.php +++ b/resources/lang/he/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'האם אתה בטוח שאתה רוצה לדרג מפה זאת?', + 'different_nominator_warning' => '', 'header' => 'דירוג מפה', 'hybrid_warning' => 'הערה: אתה רשאי לדרג רק פעם אחת, אנא דרג כל אחד ממצבי המשחק שאתה מתכוון אליהם', 'current_main_ruleset' => '', diff --git a/resources/lang/he/rankings.php b/resources/lang/he/rankings.php index ca8b9634b49..ef605aeac5e 100644 --- a/resources/lang/he/rankings.php +++ b/resources/lang/he/rankings.php @@ -9,6 +9,12 @@ 'title' => 'מדינה', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'הצג', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'זרקורים', 'country' => 'מדינה', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => 'רב משתתפים', 'performance' => 'ביצועים', diff --git a/resources/lang/hr-HR/beatmapsets.php b/resources/lang/hr-HR/beatmapsets.php index 7c4bceb77d6..15d13277c9e 100644 --- a/resources/lang/hr-HR/beatmapsets.php +++ b/resources/lang/hr-HR/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Jesi li siguran/na da želiš nominirati ovu beatmapu?', + 'different_nominator_warning' => '', 'header' => 'Nominiraj beatmapu', 'hybrid_warning' => 'napomena: možetš nominirati samo jednom, stoga te molimo da budeš siguran/na da nominiraš za sve načine igre koje namjeravaš', 'current_main_ruleset' => '', diff --git a/resources/lang/hr-HR/rankings.php b/resources/lang/hr-HR/rankings.php index 74458bb53eb..41bf7efd4ff 100644 --- a/resources/lang/hr-HR/rankings.php +++ b/resources/lang/hr-HR/rankings.php @@ -10,6 +10,12 @@ 'title' => 'Država', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Prikaži ', @@ -32,6 +38,7 @@ 'type' => [ 'charts' => 'istaknuto', 'country' => 'države', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => 'multiplayer', 'performance' => 'izvedba', diff --git a/resources/lang/hu/beatmapsets.php b/resources/lang/hu/beatmapsets.php index a2fa99cc7cb..f1686ba5755 100644 --- a/resources/lang/hu/beatmapsets.php +++ b/resources/lang/hu/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Biztosan nominálni szeretnéd ezt a Beatmap-et?', + 'different_nominator_warning' => '', 'header' => 'Beatmap Nominálása', 'hybrid_warning' => 'megjegyzés: csak egyszer nominálhatsz, ezért kérlek győződj meg róla, hogy minden játékmódra nominálsz, amire szeretnél', 'current_main_ruleset' => 'A fő ruleszet jelenleg: :ruleset', diff --git a/resources/lang/hu/rankings.php b/resources/lang/hu/rankings.php index 4d235aba0a6..d54803b0e88 100644 --- a/resources/lang/hu/rankings.php +++ b/resources/lang/hu/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Ország', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Mutat', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Reflektorfény', 'country' => 'Ország', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'többjátékos', 'performance' => 'Teljesítmény', diff --git a/resources/lang/id/beatmaps.php b/resources/lang/id/beatmaps.php index 844c339b634..4bf1a76a426 100644 --- a/resources/lang/id/beatmaps.php +++ b/resources/lang/id/beatmaps.php @@ -214,7 +214,7 @@ 'unresolved_issues' => 'Terdapat satu atau lebih masalah yang belum terjawab dan harus ditangani terlebih dahulu.', 'rank_estimate' => [ - '_' => 'Map ini akan berstatus Ranked :date apabila tidak terdapat masalah baru yang ditemukan. Map ini berada pada urutan ke-:position dalam :queue yang ada.', + '_' => 'Map ini diperkirakan akan berstatus Ranked :date apabila tidak terdapat masalah yang ditemukan. Map ini berada pada urutan ke-:position dalam :queue yang ada.', 'unresolved_problems' => 'Beatmap ini sedang diblokir untuk dapat melewati kategori Qualified hingga :problems terselesaikan.', 'problems' => 'masalah berikut', 'on' => 'pada tanggal :date', @@ -223,8 +223,8 @@ ], 'reset_at' => [ - 'nomination_reset' => 'Proses nominasi dianulir :time_ago oleh :user akibat ditemukannya masalah baru :discussion (:message).', - 'disqualify' => 'Didiskualifikasi :time_ago oleh :user akibat ditemukannya masalah baru :discussion (:message).', + 'nomination_reset' => 'Proses nominasi dianulir :time_ago oleh :user dengan ditemukannya masalah baru :discussion (:message).', + 'disqualify' => 'Didiskualifikasi :time_ago oleh :user dengan ditemukannya masalah baru :discussion (:message).', ], 'reset_confirm' => [ diff --git a/resources/lang/id/beatmapsets.php b/resources/lang/id/beatmapsets.php index bfe8b93ca80..257d22cbdb1 100644 --- a/resources/lang/id/beatmapsets.php +++ b/resources/lang/id/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Apakah kamu yakin untuk menominasikan beatmap ini?', + 'different_nominator_warning' => '', 'header' => 'Nominasikan Beatmap', 'hybrid_warning' => 'catatan: kamu hanya dapat memberikan nominasi satu kali, sehingga pastikan kamu memberikan nominasi pada mode permainan yang memang kamu kehendaki', 'current_main_ruleset' => 'Ruleset utama saat ini: :ruleset', diff --git a/resources/lang/id/rankings.php b/resources/lang/id/rankings.php index e92aa3939f0..9eacb3cc312 100644 --- a/resources/lang/id/rankings.php +++ b/resources/lang/id/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Negara', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Tampilkan', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'spotlights', 'country' => 'negara', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multiplayer', 'performance' => 'performa', diff --git a/resources/lang/id/users.php b/resources/lang/id/users.php index 2f0a3a3cf71..19c85bf8e88 100644 --- a/resources/lang/id/users.php +++ b/resources/lang/id/users.php @@ -200,7 +200,7 @@ 'daily' => 'Rantai Permainan Harian', 'daily_streak_best' => 'Rantai Permainan Harian Terbaik', 'daily_streak_current' => 'Rantai Permainan Harian Saat Ini', - 'playcount' => '', + 'playcount' => 'Kontribusi Total', 'title' => 'Tantangan\nHarian', 'top_10p_placements' => 'Penempatan 10% Teratas', 'top_50p_placements' => 'Penempatan 50% Teratas', diff --git a/resources/lang/it/beatmapsets.php b/resources/lang/it/beatmapsets.php index 6d60ced2fa0..3255f19ddb4 100644 --- a/resources/lang/it/beatmapsets.php +++ b/resources/lang/it/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Sei sicuro di voler nominare questa beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nomina Beatmap', 'hybrid_warning' => 'nota: puoi nominare una sola volta, quindi assicurati di nominare per tutte le modalità di gioco che vuoi', 'current_main_ruleset' => 'La modalità principale al momento è: :ruleset', diff --git a/resources/lang/it/rankings.php b/resources/lang/it/rankings.php index 9879d69bbfe..817c8caf34e 100644 --- a/resources/lang/it/rankings.php +++ b/resources/lang/it/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Paese', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Mostra', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'spotlight (archivio)', 'country' => 'paese', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multigiocatore', 'performance' => 'performance', diff --git a/resources/lang/it/users.php b/resources/lang/it/users.php index a50d1453eb8..4bf24370cbd 100644 --- a/resources/lang/it/users.php +++ b/resources/lang/it/users.php @@ -200,7 +200,7 @@ 'daily' => 'Serie Giornaliera', 'daily_streak_best' => 'Migliore Serie Giornaliera', 'daily_streak_current' => 'Attuale Serie Giornaliera', - 'playcount' => '', + 'playcount' => 'Partecipazione Totale', 'title' => 'Sfida\nGiornaliera', 'top_10p_placements' => 'Raggiungimenti del primo 10%', 'top_50p_placements' => 'Raggiungimenti del primo 50%', diff --git a/resources/lang/ja/beatmapsets.php b/resources/lang/ja/beatmapsets.php index 19937c3643f..7a4d4f53a8c 100644 --- a/resources/lang/ja/beatmapsets.php +++ b/resources/lang/ja/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'このビートマップを本当にノミネートしますか？', + 'different_nominator_warning' => '', 'header' => 'ビートマップをノミネート', 'hybrid_warning' => '注意: 一度しかノミネートできないので、ノミネートするゲームモードの全てにノミネートするようにしてください。', 'current_main_ruleset' => '現在のメインゲームモードは :ruleset です', diff --git a/resources/lang/ja/rankings.php b/resources/lang/ja/rankings.php index 598c6ef5165..57b5c6a92f9 100644 --- a/resources/lang/ja/rankings.php +++ b/resources/lang/ja/rankings.php @@ -9,6 +9,12 @@ 'title' => '国別', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '表示', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'スポットライト', 'country' => '国別', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'マルチプレイ', 'performance' => 'パフォーマンス', diff --git a/resources/lang/kk-KZ/beatmapsets.php b/resources/lang/kk-KZ/beatmapsets.php index 195bef10542..dcdc5f977c9 100644 --- a/resources/lang/kk-KZ/beatmapsets.php +++ b/resources/lang/kk-KZ/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Осы картаны номинация беретініне сенімдісіз бе?', + 'different_nominator_warning' => '', 'header' => 'Картаға номинацияны беру', 'hybrid_warning' => 'ескерту: сіз тек бір рет номинация бере аласыз, сондықтан сіз барлық қажетті ойын режимдеріне номинация беретін екеніңізге көз жеткізіңіз', 'current_main_ruleset' => '', diff --git a/resources/lang/kk-KZ/rankings.php b/resources/lang/kk-KZ/rankings.php index 509025bad45..138c47e86d1 100644 --- a/resources/lang/kk-KZ/rankings.php +++ b/resources/lang/kk-KZ/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Ел', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '', 'country' => 'ел', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => '', 'performance' => 'өнімділік', diff --git a/resources/lang/ko/beatmapsets.php b/resources/lang/ko/beatmapsets.php index 061f5d5c183..89aad973ffb 100644 --- a/resources/lang/ko/beatmapsets.php +++ b/resources/lang/ko/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '정말로 이 비트맵을 노미네이트 하시겠어요?', + 'different_nominator_warning' => '', 'header' => '비트맵 노미네이트', 'hybrid_warning' => '주의: 딱 한 번만 노미네이트 할 수 있으므로 자신이 노미네이트 하려는 모든 게임 모드를 선택했는지 확인해주세요.', 'current_main_ruleset' => '', @@ -152,7 +153,7 @@ ], 'nsfw_warning' => [ - 'details' => '이 비트맵은 노골적, 폭력적 혹은 혐오감을 들게 하는 내용이 포함되어 있습니다. 그래도 보시겠습니까?', + 'details' => '이 비트맵은 노골적, 폭력적 혹은 혐오감이 들 수 있는 내용을 포함하고 있습니다. 그래도 보시겠어요?', 'title' => '부적절한 내용', 'buttons' => [ diff --git a/resources/lang/ko/models.php b/resources/lang/ko/models.php index 3043f70fabc..12947c3e8f1 100644 --- a/resources/lang/ko/models.php +++ b/resources/lang/ko/models.php @@ -4,7 +4,7 @@ // See the LICENCE file in the repository root for full licence text. return [ - 'not_found' => "", + 'not_found' => "지정한 항목 (:model) 을 찾을 수 없습니다.", 'name' => [ 'App\Models\Beatmap' => '비트맵 난이도', diff --git a/resources/lang/ko/rankings.php b/resources/lang/ko/rankings.php index 45a79650d30..319844bb55c 100644 --- a/resources/lang/ko/rankings.php +++ b/resources/lang/ko/rankings.php @@ -9,6 +9,12 @@ 'title' => '국가별', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '보기', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '스포트라이트', 'country' => '국가별', + 'daily_challenge' => '', 'kudosu' => 'Kudosu', 'multiplayer' => '멀티플레이어', 'performance' => '퍼포먼스', diff --git a/resources/lang/ko/users.php b/resources/lang/ko/users.php index 8b3af5eff3d..354f8dbc029 100644 --- a/resources/lang/ko/users.php +++ b/resources/lang/ko/users.php @@ -218,7 +218,7 @@ 'cover' => [ 'button' => '프로필 표지 변경', 'defaults_info' => '이후에 더 많은 표지 설정이 추가됩니다', - 'holdover_remove_confirm' => "", + 'holdover_remove_confirm' => "이전에 선택한 배경을 이제는 선택할 수 없어 다른 배경으로 바꾸면 다시 되돌릴 수 없습니다. 계속할까요?", 'title' => '표지', 'upload' => [ @@ -243,7 +243,7 @@ ], 'hue' => [ - 'reset_no_supporter' => '', + 'reset_no_supporter' => '기본 색상으로 초기화할까요? 다른 색상으로 바꾸려면 osu! 서포터가 되어야 합니다.', 'title' => '색상', 'supporter' => [ diff --git a/resources/lang/lt/beatmapsets.php b/resources/lang/lt/beatmapsets.php index 5effcd205c5..36de0151d02 100644 --- a/resources/lang/lt/beatmapsets.php +++ b/resources/lang/lt/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Ar tikrai norite nominuoti šį beatmap\'ą?', + 'different_nominator_warning' => '', 'header' => 'Nominuoti Beatmap\'ą', 'hybrid_warning' => 'pastaba: jūs galite nominuoti tik kartą, tai prašom užtikrinti, kad nominuojate visus rėžimus, kuriuos ketinote', 'current_main_ruleset' => '', diff --git a/resources/lang/lt/rankings.php b/resources/lang/lt/rankings.php index c40915783ae..7d454589d18 100644 --- a/resources/lang/lt/rankings.php +++ b/resources/lang/lt/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Šalis', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Rodyti', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'pasižymėje', 'country' => 'Šalimis', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'žaidimas tinkle', 'performance' => 'pp', diff --git a/resources/lang/lv-LV/beatmapsets.php b/resources/lang/lv-LV/beatmapsets.php index c412ef17577..bd712d58872 100644 --- a/resources/lang/lv-LV/beatmapsets.php +++ b/resources/lang/lv-LV/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Vai esat pārliecināts, ka vēlaties nominēt šo bītmapi?', + 'different_nominator_warning' => '', 'header' => 'Nominēt Bītmapi', 'hybrid_warning' => 'piezīme: jūs varat nominēt tikai vienu reizi, tāpēc, lūdzu, pārliecinieties, ka nominējat visus plānotos spēles režīmus (modus)', 'current_main_ruleset' => '', diff --git a/resources/lang/lv-LV/rankings.php b/resources/lang/lv-LV/rankings.php index 7d011405e28..fbe3bdf90d5 100644 --- a/resources/lang/lv-LV/rankings.php +++ b/resources/lang/lv-LV/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Valsts', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Rādīt', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Uzmanības centrā', 'country' => 'Valsts', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'Daudzspēlētāju režīms', 'performance' => 'Veiktspēja', diff --git a/resources/lang/ms-MY/beatmapsets.php b/resources/lang/ms-MY/beatmapsets.php index dc53ac63d85..c8aac80a590 100644 --- a/resources/lang/ms-MY/beatmapsets.php +++ b/resources/lang/ms-MY/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Anda pasti mahu mencalonkan beatmap ini?', + 'different_nominator_warning' => '', 'header' => 'Calonkan Beatmap', 'hybrid_warning' => '', 'current_main_ruleset' => '', diff --git a/resources/lang/ms-MY/rankings.php b/resources/lang/ms-MY/rankings.php index 4aa7618536a..1d623ee5bef 100644 --- a/resources/lang/ms-MY/rankings.php +++ b/resources/lang/ms-MY/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Negara', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Paparkan', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'sorotan (lama)', 'country' => 'negara', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'pemainan beramai-ramai', 'performance' => 'pencapaian', diff --git a/resources/lang/nl/beatmapsets.php b/resources/lang/nl/beatmapsets.php index d9186fd42da..55c4916ed05 100644 --- a/resources/lang/nl/beatmapsets.php +++ b/resources/lang/nl/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Weet je zeker dat je deze Beatmap wilt nomineren?', + 'different_nominator_warning' => '', 'header' => 'Nomineer Beatmap', 'hybrid_warning' => 'opmerking: je mag maar één keer nomineren, dus zorg er alsjeblieft voor dat je nomineert voor alle spelmodi die je van plan bent te nomineren', 'current_main_ruleset' => '', diff --git a/resources/lang/nl/rankings.php b/resources/lang/nl/rankings.php index da0d04d64b8..5a2f80f25a5 100644 --- a/resources/lang/nl/rankings.php +++ b/resources/lang/nl/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Land', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Weergeven', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'in de schijnwerpers', 'country' => 'landelijk', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multiplayer', 'performance' => 'prestatie', diff --git a/resources/lang/no/beatmapsets.php b/resources/lang/no/beatmapsets.php index ce385c3f133..057f62ab44e 100644 --- a/resources/lang/no/beatmapsets.php +++ b/resources/lang/no/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Er du sikker på at du vil nominere dette beatmappet?', + 'different_nominator_warning' => '', 'header' => 'Nominer Beatmap', 'hybrid_warning' => 'merk: du kan kun nominere èn gang. Vær så snill å forsikre deg om at du nominerer for alle spill-modusene du har tenkt å nominere på', 'current_main_ruleset' => '', diff --git a/resources/lang/no/rankings.php b/resources/lang/no/rankings.php index 5de7ad53345..025c6cf5d5a 100644 --- a/resources/lang/no/rankings.php +++ b/resources/lang/no/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Land', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Vis', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Rampelyset', 'country' => 'Land', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'flerspiller', 'performance' => 'Prestasjon', diff --git a/resources/lang/pl/beatmapsets.php b/resources/lang/pl/beatmapsets.php index 62499d132b3..0da3b3a4f97 100644 --- a/resources/lang/pl/beatmapsets.php +++ b/resources/lang/pl/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Czy na pewno chcesz nominować tę beatmapę?', + 'different_nominator_warning' => '', 'header' => 'Nominuj beatmapę', 'hybrid_warning' => 'Uwaga: możesz nominować tylko raz, więc upewnij się, że nominujesz ją dla wszystkich pożądanych trybów gry.', 'current_main_ruleset' => '', diff --git a/resources/lang/pl/rankings.php b/resources/lang/pl/rankings.php index 22b115a2d4c..4062265a788 100644 --- a/resources/lang/pl/rankings.php +++ b/resources/lang/pl/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Kraj', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Pokaż', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Wyróżnionych', 'country' => 'krajowy', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'wieloosobowy', 'performance' => 'globalny', diff --git a/resources/lang/pt-br/beatmapsets.php b/resources/lang/pt-br/beatmapsets.php index c9189d3e705..49eef322c62 100644 --- a/resources/lang/pt-br/beatmapsets.php +++ b/resources/lang/pt-br/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Tem certeza que deseja nomear este Beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nomear Beatmap', 'hybrid_warning' => 'nota: você pode apenas nomear uma vez, então por favor, certifique-se de que você está nomeando para todos os modos de jogo que você pretende', 'current_main_ruleset' => 'A atual regra principal é: :ruleset', diff --git a/resources/lang/pt-br/rankings.php b/resources/lang/pt-br/rankings.php index 2a4c3261ce4..0112dafcf4f 100644 --- a/resources/lang/pt-br/rankings.php +++ b/resources/lang/pt-br/rankings.php @@ -9,6 +9,12 @@ 'title' => 'País', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Exibir', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Destaques', 'country' => 'país', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multijogador', 'performance' => 'desempenho', diff --git a/resources/lang/pt-br/users.php b/resources/lang/pt-br/users.php index 0446ac67398..e315e68ee37 100644 --- a/resources/lang/pt-br/users.php +++ b/resources/lang/pt-br/users.php @@ -200,7 +200,7 @@ 'daily' => 'Sequência diária', 'daily_streak_best' => 'Melhor sequência diária', 'daily_streak_current' => 'Sequência diária atual', - 'playcount' => '', + 'playcount' => 'Participação total', 'title' => 'Desafio\ndiário', 'top_10p_placements' => 'Melhores 10% nos colocados', 'top_50p_placements' => 'Melhores 50% nos colocados', diff --git a/resources/lang/pt/beatmapsets.php b/resources/lang/pt/beatmapsets.php index b6caf1db502..3e9dbf511d1 100644 --- a/resources/lang/pt/beatmapsets.php +++ b/resources/lang/pt/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Tens a certeza que queres nomear este beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nomear beatmap', 'hybrid_warning' => 'nota: poderás apenas nomear uma vez, por isso certifica-te de que estás a nomear para todos os modos de jogo que pretendes', 'current_main_ruleset' => 'O conjunto de regras principal está de momento: :ruleset', diff --git a/resources/lang/pt/rankings.php b/resources/lang/pt/rankings.php index 0aceadc61b4..9c6a1c07a26 100644 --- a/resources/lang/pt/rankings.php +++ b/resources/lang/pt/rankings.php @@ -10,6 +10,12 @@ 'title' => 'País', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Mostrar', @@ -31,6 +37,7 @@ 'type' => [ 'charts' => 'Em destaque', 'country' => 'País', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multijogador', 'performance' => 'Desempenho', diff --git a/resources/lang/ro/beatmapsets.php b/resources/lang/ro/beatmapsets.php index 73aad07fc33..7c35e723295 100644 --- a/resources/lang/ro/beatmapsets.php +++ b/resources/lang/ro/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Ești sigur că vrei să nominalizezi acest beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nominalizează acest Beatmap', 'hybrid_warning' => 'observație: poți nominaliza o singură dată, așa că te rugăm să te asiguri că nominalizezi pentru toate modurile de joc pentru care intenționezi să nominalizezi', 'current_main_ruleset' => 'Ruleset-ul principal este :ruleset momentan', diff --git a/resources/lang/ro/rankings.php b/resources/lang/ro/rankings.php index 093f5920eee..ea8efd37b73 100644 --- a/resources/lang/ro/rankings.php +++ b/resources/lang/ro/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Țară', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Afișează', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'promovări', 'country' => 'național', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'multiplayer', 'performance' => 'performanță', diff --git a/resources/lang/ro/users.php b/resources/lang/ro/users.php index 0bf9c9b2df2..472c428eb37 100644 --- a/resources/lang/ro/users.php +++ b/resources/lang/ro/users.php @@ -200,7 +200,7 @@ 'daily' => 'Serie Zilnică', 'daily_streak_best' => 'Cea Mai Bună Serie Zilnică', 'daily_streak_current' => 'Serie Zilnică Actuală', - 'playcount' => '', + 'playcount' => 'Participare Totală', 'title' => 'Provocare\nZilnică', 'top_10p_placements' => 'Plasamente Top 10%', 'top_50p_placements' => 'Plasamente Top 50%', diff --git a/resources/lang/ru/beatmapsets.php b/resources/lang/ru/beatmapsets.php index bc7b714304e..02988d5a1cd 100644 --- a/resources/lang/ru/beatmapsets.php +++ b/resources/lang/ru/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Вы уверены, что хотите номинировать эту карту?', + 'different_nominator_warning' => '', 'header' => 'Номинировать карту', 'hybrid_warning' => 'примечание: Вы можете номинировать лишь один раз, так что убедитесь, что Вы номинируете все необходимые режимы игры', 'current_main_ruleset' => 'Текущий основной режим игры: :ruleset', diff --git a/resources/lang/ru/rankings.php b/resources/lang/ru/rankings.php index 841337f27e3..3034082e2fd 100644 --- a/resources/lang/ru/rankings.php +++ b/resources/lang/ru/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Страна', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Показать', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'по чартам (устар.)', 'country' => 'по странам', + 'daily_challenge' => '', 'kudosu' => 'по кудосу', 'multiplayer' => 'в мультиплеере', 'performance' => 'по производительности', diff --git a/resources/lang/ru/user_verification.php b/resources/lang/ru/user_verification.php index 616c418d63b..57d4bf18e0b 100644 --- a/resources/lang/ru/user_verification.php +++ b/resources/lang/ru/user_verification.php @@ -23,7 +23,7 @@ 'errors' => [ 'expired' => 'Код подтверждения устарел, отправлено новое письмо.', 'incorrect_key' => 'Неверный код.', - 'retries_exceeded' => 'Неверный код. Вы привысили лимит попыток, поэтому вам отправлено новое письмо.', + 'retries_exceeded' => 'Неверный код. Вы превысили лимит попыток, поэтому вам отправлено новое письмо.', 'reissued' => 'Код подтверждения устарел, отправлено новое письмо.', 'unknown' => 'Произошла неизвестная ошибка, отправлено новое письмо.', ], diff --git a/resources/lang/ru/users.php b/resources/lang/ru/users.php index 738c2d585e6..ab9d7c6caca 100644 --- a/resources/lang/ru/users.php +++ b/resources/lang/ru/users.php @@ -200,7 +200,7 @@ 'daily' => 'Серия в днях', 'daily_streak_best' => 'Лучшая серия в днях', 'daily_streak_current' => 'Текущая серия в днях', - 'playcount' => '', + 'playcount' => 'Всего сыграно', 'title' => 'Карта\nдня', 'top_10p_placements' => 'Попаданий в топ 10%', 'top_50p_placements' => 'Попаданий в топ 50%', diff --git a/resources/lang/si-LK/beatmapsets.php b/resources/lang/si-LK/beatmapsets.php index 007a7e39391..d704e8d814b 100644 --- a/resources/lang/si-LK/beatmapsets.php +++ b/resources/lang/si-LK/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '', + 'different_nominator_warning' => '', 'header' => '', 'hybrid_warning' => '', 'current_main_ruleset' => '', diff --git a/resources/lang/si-LK/rankings.php b/resources/lang/si-LK/rankings.php index f6c411d2b49..49a7f9e0669 100644 --- a/resources/lang/si-LK/rankings.php +++ b/resources/lang/si-LK/rankings.php @@ -9,6 +9,12 @@ 'title' => '', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '', 'country' => '', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => '', 'performance' => '', diff --git a/resources/lang/sk/beatmapsets.php b/resources/lang/sk/beatmapsets.php index 5eea3ca6f32..28f49cb863f 100644 --- a/resources/lang/sk/beatmapsets.php +++ b/resources/lang/sk/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Ste si istí, že chcete nominovať tuto beatmapu?', + 'different_nominator_warning' => '', 'header' => 'Nominovať beatmapu', 'hybrid_warning' => 'poznámka: môžete nominovať len raz, takže sa uistite, že nominujete za všetky herné režimy, ktoré chcete', 'current_main_ruleset' => '', diff --git a/resources/lang/sk/rankings.php b/resources/lang/sk/rankings.php index cee1329f385..8d9b44ca415 100644 --- a/resources/lang/sk/rankings.php +++ b/resources/lang/sk/rankings.php @@ -9,6 +9,12 @@ 'title' => '', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Výbery', 'country' => 'Krajina', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => '', 'performance' => 'Výkon', diff --git a/resources/lang/sl/beatmapsets.php b/resources/lang/sl/beatmapsets.php index 8e9f705037c..5c62e29f033 100644 --- a/resources/lang/sl/beatmapsets.php +++ b/resources/lang/sl/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Ali si prepričan za nominacijo te beatmape?', + 'different_nominator_warning' => '', 'header' => 'Nominiraj beatmapo', 'hybrid_warning' => 'opomba: nominiraš lahko le enkrat, zato poskrbi, da nominiraš za vse nameravane igralne načine', 'current_main_ruleset' => '', diff --git a/resources/lang/sl/rankings.php b/resources/lang/sl/rankings.php index 2f3a9231ad8..b227581fdb0 100644 --- a/resources/lang/sl/rankings.php +++ b/resources/lang/sl/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Država', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Prikaži', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'spotlights', 'country' => 'država', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => 'večigralski način', 'performance' => 'uspešnost', diff --git a/resources/lang/sr/accounts.php b/resources/lang/sr/accounts.php index 5451b17bba1..8eed5744408 100644 --- a/resources/lang/sr/accounts.php +++ b/resources/lang/sr/accounts.php @@ -65,12 +65,12 @@ 'github_user' => [ 'info' => "", - 'link' => '', + 'link' => 'Повежи GitHub Налог', 'title' => 'GitHub', - 'unlink' => '', + 'unlink' => 'Отклони везу GitHub Налога', 'error' => [ - 'already_linked' => '', + 'already_linked' => 'Овај GitHub налог је већ тренутно повезан са другим налогом.', 'no_contribution' => '', 'unverified_email' => '', ], diff --git a/resources/lang/sr/beatmaps.php b/resources/lang/sr/beatmaps.php index dd547946dde..cb2c2fb4bab 100644 --- a/resources/lang/sr/beatmaps.php +++ b/resources/lang/sr/beatmaps.php @@ -25,14 +25,14 @@ 'message_placeholder_silenced' => "Не можете постовати на дискусију док сте мутирани.", 'message_type_select' => 'Изабери врсту коментара', 'reply_notice' => 'Притисните enter да одговорите.', - 'reply_resolve_notice' => '', + 'reply_resolve_notice' => 'Притисните enter да одговорите. Притисните ctrl+enter да одговорите и решите.', 'reply_placeholder' => 'Овде унесите ваш одговор', 'require-login' => 'Пријавите се да бисте поставили или одговорили', 'resolved' => 'Решено', 'restore' => 'поврати', 'show_deleted' => 'Покажи обрисане', 'title' => 'Дискусије', - 'unresolved_count' => '', + 'unresolved_count' => ':count_delimited недовршен проблем|:count_delimited недовршени проблеми', 'collapse' => [ 'all-collapse' => 'Обори све', @@ -84,7 +84,7 @@ 'disqualify' => '', 'hype' => '', 'mapper_note' => '', - 'nomination_reset' => '', + 'nomination_reset' => 'Уклони све Номинације', 'praise' => '', 'problem' => '', 'problem_warning' => '', @@ -216,7 +216,7 @@ 'rank_estimate' => [ '_' => 'Процењује се да ће мапа бити померена у рангирану секцију :date ако се не пронађу проблеми. Мапа је тренутно #:position у :queue.', 'unresolved_problems' => '', - 'problems' => '', + 'problems' => 'ови проблеми', 'on' => ':date', 'queue' => 'ред за рангинг секцију', 'soon' => 'ускоро', diff --git a/resources/lang/sr/beatmapsets.php b/resources/lang/sr/beatmapsets.php index f0749f665b6..a75e3c49215 100644 --- a/resources/lang/sr/beatmapsets.php +++ b/resources/lang/sr/beatmapsets.php @@ -53,6 +53,7 @@ 'dialog' => [ 'confirmation' => 'Да ли сте сигурни да желите да номинујете ову мапу?', + 'different_nominator_warning' => '', 'header' => 'Номинујте ову мапу', 'hybrid_warning' => 'напомена: можете номиновати само једном, па вас молимо да се уверите да номинујете за све модове игре које намеравате да играте', 'current_main_ruleset' => '', diff --git a/resources/lang/sr/changelog.php b/resources/lang/sr/changelog.php index aca59ca5509..0f58bbfce3f 100644 --- a/resources/lang/sr/changelog.php +++ b/resources/lang/sr/changelog.php @@ -11,7 +11,7 @@ ], 'builds' => [ - 'users_online' => ':count_delimited корисник онлајн |:count_delimited корисника онлајн', + 'users_online' => ':count_delimited корисник доступан|:count_delimited корисника доступно', ], 'entry' => [ @@ -32,7 +32,7 @@ ], 'support' => [ - 'heading' => 'Волите овo aжурирање?', + 'heading' => 'Задовољни ових промена?', 'text_1' => 'Подржите даљњи развој osu!-а и :link данас!', 'text_1_link' => 'постаните osu!supporter', 'text_2' => 'Не само да ћете подржати убрзање развоја, већ ћете и добити додатне карактеристике и подешавања!', diff --git a/resources/lang/sr/comments.php b/resources/lang/sr/comments.php index 435493e80ac..517e9ad3150 100644 --- a/resources/lang/sr/comments.php +++ b/resources/lang/sr/comments.php @@ -5,19 +5,19 @@ return [ 'deleted' => 'обрисано', - 'deleted_by' => 'обрисано :timeago од стране :user', + 'deleted_by' => 'обрисано пре :timeago од стране :user', 'deleted_by_system' => 'систем', - 'deleted_count' => ':count_delimited обрисан коментар|:count_delimited обрисани коментари', - 'edited' => 'измењено :timeago од стране :user', + 'deleted_count' => ':count_delimited обрисан коментар|:count_delimited обрисаних коментара', + 'edited' => 'измењено пре :timeago од стране :user', 'pinned' => 'закачено', 'empty' => 'Нема коментара.', 'empty_other' => 'Још нема других коментара.', 'load_replies' => 'учитајте одговоре', - 'replies_count' => ':count_delimited одговор|:count_delimited одговори', + 'replies_count' => ':count_delimited одговор|:count_delimited одговора', 'title' => 'Коментари', 'commentable_name' => [ - 'beatmapset' => 'Мапе', + 'beatmapset' => 'Мапа', 'build' => 'Списак измена', 'news_post' => 'Новости', '_deleted' => 'Избрисана ставка', diff --git a/resources/lang/sr/common.php b/resources/lang/sr/common.php index 4da1b3e777d..a49f14e4ca7 100644 --- a/resources/lang/sr/common.php +++ b/resources/lang/sr/common.php @@ -50,7 +50,7 @@ 'saving' => 'Чување...', 'search' => 'Претрага', 'see_more' => 'прикажите више', - 'show' => 'прикажите', + 'show' => 'прикажи', 'show_deleted' => 'Прикажи обрисане', 'show_less' => 'прикажи мање', 'show_more' => 'прикажи више', @@ -76,7 +76,7 @@ 'minutes' => ':count_delimited минут|:count_delimited минута', 'months' => ':count_delimited месец|:count_delimited месеци', 'notifications' => ':count_delimited нотификација|:count_delimited нотификације', - 'plus_others' => '+ :count_delimited друго|:count_delimited других!', + 'plus_others' => '+ :count_delimited друго!|:count_delimited других!', 'post' => ':count_delimited објава|:count_delimited објаве', 'second_short_unit' => 'секунда|секунде', 'star_priority' => ':count_delimited приоритет звезде|:count_delimited приоритети звезде', @@ -103,10 +103,10 @@ ], 'device' => [ - 'keyboard' => 'Тастатура', - 'mouse' => 'Миш', - 'tablet' => 'Таблет', - 'touch' => 'Екран на додир', + 'keyboard' => 'Тастатуром', + 'mouse' => 'Мишем', + 'tablet' => 'Таблетом', + 'touch' => 'Екраном на додир', ], 'dropzone' => [ @@ -132,22 +132,22 @@ ], 'scoreboard_time' => [ - 'd' => '%dd', - 'dd' => '%dd', - 'h' => '%dh', - 'hh' => '%dh', + 'd' => '%dд', + 'dd' => '%dд', + 'h' => '%dс', + 'hh' => '%dс', 'm' => 'сада', 'mm' => 'сада', - 'month' => '%dm', - 'months' => '%dm', + 'month' => '%dм', + 'months' => '%dм', 'past' => '', 's' => 'сада', - 'y' => '%dy', - 'yy' => '%dy', + 'y' => '%dг', + 'yy' => '%dг', ], 'time' => [ - 'days_ago' => ':count_delimited пре један дан|:count_delimited пре пар дана', + 'days_ago' => 'пре :count_delimited дан|пре :count_delimited дана', 'hours_ago' => 'пре :count_delimited сат|пре :count_delimited сати', 'now' => 'сада', 'remaining' => 'Преостало време', @@ -158,7 +158,7 @@ ], 'wrong_user' => [ - '_' => 'Пријављени сте као корисник :user. :logout_link.', + '_' => 'Пријављени сте као :user. :logout_link.', 'logout_link' => 'Кликните овде да се пријавите као други корисник', ], ]; diff --git a/resources/lang/sr/events.php b/resources/lang/sr/events.php index 925c82268ae..f8aed771550 100644 --- a/resources/lang/sr/events.php +++ b/resources/lang/sr/events.php @@ -8,16 +8,16 @@ 'beatmap_playcount' => ':beatmap је одиграна :count пута!', 'beatmapset_approve' => ':beatmapset од корисника :user је :approval!', 'beatmapset_delete' => ':beatmapset је обрисан.', - 'beatmapset_revive' => ':beatmapset је оживљен од стране корисника :user.', + 'beatmapset_revive' => ':beatmapset је је оживео из вечног сна од стране :user.', 'beatmapset_update' => ':user је ажурирао/ла мапу ":beatmapset"', - 'beatmapset_upload' => ':user је окачио нову мапу ":beatmapset"', + 'beatmapset_upload' => ':user је направио/ла нову мапу ":beatmapset"', 'empty' => "Овај корисник није урадио/ла ништа значајно скоро!", - 'rank' => ':user је достигао/ла #:rank на :beatmap (:mode)', + 'rank' => ':user је достигао/ла #:rank место на :beatmap (:mode)', 'rank_lost' => ':user је изгубио/ла прво место на :beatmap (:mode)', 'user_support_again' => ':user је поново одлучио/ла да подржи osu! - хвала вам на вашој великодушности!', - 'user_support_first' => ':user је постао/ла osu!supporter - хвала вам на вашој великодушности!', + 'user_support_first' => ':user је подржао/ла osu! - хвала вам на вашој великодушности!', 'user_support_gift' => ':user је добио/ла osu!supporter поклон!', - 'username_change' => ':previousUsername је променио/ла име у :user!', + 'username_change' => ':previousUsername је променио/ла корисничко име у :user!', 'beatmapset_status' => [ 'approved' => 'одобрено', diff --git a/resources/lang/sr/rankings.php b/resources/lang/sr/rankings.php index 9ced0b0db94..abc6dfaf98f 100644 --- a/resources/lang/sr/rankings.php +++ b/resources/lang/sr/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Држава', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Прикажи', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'колекције', 'country' => 'држава', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'мултиплејер', 'performance' => 'перформансе', diff --git a/resources/lang/sr/users.php b/resources/lang/sr/users.php index f3a6ab156d5..43aa6f8bb67 100644 --- a/resources/lang/sr/users.php +++ b/resources/lang/sr/users.php @@ -120,8 +120,7 @@ 'beta' => [ 'main' => 'Приступ beta верзији је тренутно дозвољено само привилегованим корисницима.', - 'small' => '(osu!supporters ће ускоро добити приступ) -', + 'small' => '(osu!supporters ће ускоро добити приступ)', ], ], @@ -201,7 +200,7 @@ 'daily' => 'Дневна Серија', 'daily_streak_best' => 'Најбоља Дневна Серија', 'daily_streak_current' => 'Тренутна Дневна Серија', - 'playcount' => '', + 'playcount' => 'Укупно Учесника', 'title' => 'Дневни\nИзазов', 'top_10p_placements' => '10% Најбољих Места', 'top_50p_placements' => '50% Најбољих Места', diff --git a/resources/lang/sv/beatmapsets.php b/resources/lang/sv/beatmapsets.php index d8f62caeb12..786b97d97cb 100644 --- a/resources/lang/sv/beatmapsets.php +++ b/resources/lang/sv/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Är du säker på att du vill nominera denna beatmap?', + 'different_nominator_warning' => '', 'header' => 'Nominera beatmap', 'hybrid_warning' => 'notera: du kan bara nominera en gång, så se till att du nominerar för alla spellägen som du tänker nominera för', 'current_main_ruleset' => 'Det huvudsakliga regelsettet är för närvarande :ruleset', diff --git a/resources/lang/sv/rankings.php b/resources/lang/sv/rankings.php index 541b2965511..11c7bf61ffd 100644 --- a/resources/lang/sv/rankings.php +++ b/resources/lang/sv/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Land', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Visa', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'i rampljuset', 'country' => 'land', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'flerspelarläge', 'performance' => 'prestation', diff --git a/resources/lang/tg-TJ/beatmapsets.php b/resources/lang/tg-TJ/beatmapsets.php index 007a7e39391..d704e8d814b 100644 --- a/resources/lang/tg-TJ/beatmapsets.php +++ b/resources/lang/tg-TJ/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '', + 'different_nominator_warning' => '', 'header' => '', 'hybrid_warning' => '', 'current_main_ruleset' => '', diff --git a/resources/lang/tg-TJ/rankings.php b/resources/lang/tg-TJ/rankings.php index f6c411d2b49..49a7f9e0669 100644 --- a/resources/lang/tg-TJ/rankings.php +++ b/resources/lang/tg-TJ/rankings.php @@ -9,6 +9,12 @@ 'title' => '', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '', 'country' => '', + 'daily_challenge' => '', 'kudosu' => '', 'multiplayer' => '', 'performance' => '', diff --git a/resources/lang/th/accounts.php b/resources/lang/th/accounts.php index fd21ff3cf58..5659fdb0659 100644 --- a/resources/lang/th/accounts.php +++ b/resources/lang/th/accounts.php @@ -10,7 +10,7 @@ 'avatar' => [ 'title' => 'รูปโปรไฟล์', - 'reset' => '', + 'reset' => 'รีเซ็ต', 'rules' => 'โปรดตรวจสอบให้แน่ใจว่า avatar ของคุณเป็นไปตาม :link.
ซึ่งหมายความว่ามันจะต้องเป็น เหมาะสำหรับทุกวัย เช่น ไม่มีภาพลามกหยาบคายหรือเนื้อหาที่มีการชักจูง', 'rules_link' => 'กฎของชุมชน', ], diff --git a/resources/lang/th/beatmaps.php b/resources/lang/th/beatmaps.php index 4cbaba497a6..72b8a667f5c 100644 --- a/resources/lang/th/beatmaps.php +++ b/resources/lang/th/beatmaps.php @@ -25,14 +25,14 @@ 'message_placeholder_silenced' => "ไม่สามารถโพสต์การสนทนาในขณะที่โดนเงียบ", 'message_type_select' => 'เลือกประเภทความคิดเห็น', 'reply_notice' => 'กด Enter เพื่อตอบกลับ', - 'reply_resolve_notice' => '', + 'reply_resolve_notice' => 'กด Enter เพื่อตอบกลับ กด Ctrl+Enter เพื่อตอบกลับและแก้ไข', 'reply_placeholder' => 'พิมพ์คำตอบกลับที่นี่', 'require-login' => 'กรุณาเข้าสู่ระบบเพื่อโพสต์หรือตอบกลับ', 'resolved' => 'แก้ไขแล้ว', 'restore' => 'กู้คืน', 'show_deleted' => 'แสดงรายการที่ถูกลบ', 'title' => 'การสนทนา', - 'unresolved_count' => '', + 'unresolved_count' => ':count_delimited ปัญหาที่ยังไม่ได้รับการแก้ไข|:count_delimited ปัญหาที่ยังไม่ได้รับการแก้ไข', 'collapse' => [ 'all-collapse' => 'ซ่อนทั้งหมด', diff --git a/resources/lang/th/beatmapsets.php b/resources/lang/th/beatmapsets.php index c0d569925d7..87e7f81c51b 100644 --- a/resources/lang/th/beatmapsets.php +++ b/resources/lang/th/beatmapsets.php @@ -17,7 +17,7 @@ 'download' => [ 'limit_exceeded' => 'ช้าลงหน่อย เล่นมากขึ้น', - 'no_mirrors' => '', + 'no_mirrors' => 'ไม่มีเซิร์ฟเวอร์สำหรับดาวน์โหลด', ], 'featured_artist_badge' => [ @@ -45,16 +45,17 @@ 'full_nomination_required' => 'คุณต้องเป็นผู้ที่มีสิทธิ์ในการเสนอชื่อในฐานะผู้ที่เสนอชื่อในระดับสูงสุดเพื่อเสนอชื่อในกฎระเบียบ', 'hybrid_requires_modes' => 'บีตแมปแบบไฮบริดจำเป็นให้คุณต้องเลือกโหมดการเล่นอย่างน้อยหนึ่งโหมดเพื่อเสนอชื่อเข้าชิง', 'incorrect_mode' => 'คุณไม่มีสิทธิในการเสนอชื่อในโหมด :mode', - 'invalid_limited_nomination' => '', - 'invalid_ruleset' => '', + 'invalid_limited_nomination' => 'บีทแมพนี้มีการเสนอชื่อที่ไม่ถูกต้องและไม่สามารถผ่านการคัดเลือกในสถานะนี้ได้', + 'invalid_ruleset' => 'การเสนอชื่อนี้มีรูเล็ตเซตที่ไม่ถูกต้อง', 'too_many' => 'ความต้องการเสนอชื่อได้สำเร็จแล้ว', - 'too_many_non_main_ruleset' => '', + 'too_many_non_main_ruleset' => 'ข้อกำหนดการเสนอชื่อสำหรับ ruleset ที่ไม่ใช่หลักได้ถูกทำครบแล้ว', 'dialog' => [ 'confirmation' => 'คุณแน่ใจที่จะเสนอชื่อแมพนี้ใช่ไหม', + 'different_nominator_warning' => '', 'header' => 'เสนอชื่อบีทแมพ', 'hybrid_warning' => 'โน้ต: คุณสามารถเสนอชื่อได้เพียงแค่ครั้งเดียว ดังนั้นโปรดตรวจสอบให้แน่ใจว่าคุณเสนอชื่อในเกมโหมดทั้งหมดที่คุณต้องการจะเสนอชื่อ', - 'current_main_ruleset' => '', + 'current_main_ruleset' => 'Ruleset ตอนนี้คือ: :ruleset', 'which_modes' => 'เสนอชื่อให้โหมดไหน', ], ], diff --git a/resources/lang/th/chat.php b/resources/lang/th/chat.php index 1b8d8420ffb..4994cb73a15 100644 --- a/resources/lang/th/chat.php +++ b/resources/lang/th/chat.php @@ -18,8 +18,8 @@ 'channels' => [ 'confirm_part' => 'คุณต้องการที่จะซ่อนช่องนี้หรือไม่ คุณจะยังคงได้รับข้อความจากช่องนี้', 'create' => 'สร้างการประกาศ', - 'join' => '', - 'none' => '', + 'join' => 'เข้าร่วมช่อง', + 'none' => 'ไม่มีช่อง', 'list' => [ 'title' => [ @@ -64,6 +64,6 @@ ], 'join_channels' => [ - 'loading' => '', + 'loading' => 'กำลังโหลดรายการช่อง...', ], ]; diff --git a/resources/lang/th/common.php b/resources/lang/th/common.php index e636d096048..494ef2db287 100644 --- a/resources/lang/th/common.php +++ b/resources/lang/th/common.php @@ -39,7 +39,7 @@ 'pin' => 'ปักหมุด', 'post' => 'โพสต์', 'read_more' => 'อ่านเพิ่มเติม', - 'refresh' => '', + 'refresh' => 'รีเฟรช', 'reply' => 'ตอบกลับ', 'reply_reopen' => 'ตอบกลับ และเปิดใหม่', 'reply_resolve' => 'ตอบกลับ และแก้ไข', diff --git a/resources/lang/th/contest.php b/resources/lang/th/contest.php index 1db7ebdc020..b77d66d151a 100644 --- a/resources/lang/th/contest.php +++ b/resources/lang/th/contest.php @@ -15,27 +15,27 @@ 'judge' => [ 'comments' => 'ความคิดเห็น', - 'hide_judged' => '', - 'nav_title' => '', - 'no_current_vote' => '', - 'update' => '', + 'hide_judged' => 'ซ่อนรายการที่ได้รับการตัดสินไปแล้ว', + 'nav_title' => 'ตัดสิน', + 'no_current_vote' => 'คุณยังไม่ได้โหวต', + 'update' => 'อัปเดต', 'validation' => [ - 'missing_score' => '', - 'contest_vote_judged' => '', + 'missing_score' => 'คะแนนที่ขาดหายไป', + 'contest_vote_judged' => 'ไม่สามารถโหวตในการแข่งขันที่มีการตัดสิน', ], - 'voted' => '', + 'voted' => 'คุณได้ส่งโหวตสำหรับรายการนี้ไปแล้ว', ], 'judge_results' => [ - '_' => '', - 'creator' => '', - 'score' => '', - 'total_score' => '', + '_' => 'ผลการตัดสิน', + 'creator' => 'ผู้สร้าง', + 'score' => 'คะแนน', + 'total_score' => 'คะแนนรวมทั้งหมด', ], 'voting' => [ - 'judge_link' => '', - 'judged_notice' => '', + 'judge_link' => 'คุณเป็นผู้ตัดสินของการแข่งขันนี้ ตัดสินรายการที่นี่!', + 'judged_notice' => 'การแข่งขันนี้ใช้ระบบการตัดสินอยู่ ขณะนี้ผู้ตัดสินกำลังดำเนินการกับรายการต่างๆ', 'login_required' => 'กรุณาเข้าสู่ระบบเพื่อทำการโหวต', 'over' => 'การโหวตนั้นได้สิ้นสุดลงแล้ว', 'show_voted_only' => 'แสดงโหวต', diff --git a/resources/lang/th/errors.php b/resources/lang/th/errors.php index b2cb36076eb..849aaf7091f 100644 --- a/resources/lang/th/errors.php +++ b/resources/lang/th/errors.php @@ -29,7 +29,7 @@ 'generic' => 'เกิดข้อผิดพลาดระหว่างการชำระเงินของคุณ', ], 'scores' => [ - 'invalid_id' => '', + 'invalid_id' => 'Id คะแนนไม่ถูกต้อง', ], 'search' => [ 'default' => 'ไม่สามารถแสดงผลลัพธ์ใด ๆได้ ลองอีกครั้งในภายหลัง', @@ -37,6 +37,6 @@ 'operation_timeout_exception' => 'การค้นหายุ่งกว่าปกติ โปรดลองอีกครั้งในภายหลัง', ], 'user_report' => [ - 'recently_reported' => "", + 'recently_reported' => "คุณได้รายงานเรื่องนี้ไปแล้วเมื่อเร็วๆ นี้", ], ]; diff --git a/resources/lang/th/layout.php b/resources/lang/th/layout.php index 67085b3c4c3..701acbe1a9f 100644 --- a/resources/lang/th/layout.php +++ b/resources/lang/th/layout.php @@ -195,12 +195,12 @@ 'account-edit' => 'การตั้งค่า', 'follows' => 'รายการการเฝ้าดู', 'friends' => 'เพื่อน', - 'legacy_score_only_toggle' => '', - 'legacy_score_only_toggle_tooltip' => '', + 'legacy_score_only_toggle' => 'โหมดLazer', + 'legacy_score_only_toggle_tooltip' => 'โหมดLazer แสดงเซ็ตคะแนนจาก Lazer ด้วยอัลกอริธึมการให้คะแนนใหม่', 'logout' => 'ออกจากระบบ', 'profile' => 'โปรไฟล์ของฉัน', - 'scoring_mode_toggle' => '', - 'scoring_mode_toggle_tooltip' => '', + 'scoring_mode_toggle' => 'การให้คะแนนแบบคลาสสิค', + 'scoring_mode_toggle_tooltip' => 'ปรับค่าคะแนนให้รู้สึกคล้ายกับการให้คะแนนแบบคลาสสิคที่ไม่มีขีดจำกัด', ], ], diff --git a/resources/lang/th/models.php b/resources/lang/th/models.php index dc2f9df0ab5..40f555ca878 100644 --- a/resources/lang/th/models.php +++ b/resources/lang/th/models.php @@ -4,10 +4,10 @@ // See the LICENCE file in the repository root for full licence text. return [ - 'not_found' => "", + 'not_found' => "ไม่พบ :model ที่ระบุ", 'name' => [ - 'App\Models\Beatmap' => '', - 'App\Models\Beatmapset' => '', + 'App\Models\Beatmap' => 'ความยากของบีทแมพ', + 'App\Models\Beatmapset' => 'บีทแมพ', ], ]; diff --git a/resources/lang/th/oauth.php b/resources/lang/th/oauth.php index 03a61824dc9..902238e13ca 100644 --- a/resources/lang/th/oauth.php +++ b/resources/lang/th/oauth.php @@ -7,7 +7,7 @@ 'cancel' => 'ยกเลิก', 'authorise' => [ - 'app_owner' => '', + 'app_owner' => 'แอปพลิเคชันโดย :owner', 'request' => 'ต้องการสิทธิ์ในการเข้าถึงบัญชีของคุณ', 'scopes_title' => 'แอปพลิเคชันนี้จะสามารถ:', 'title' => 'ต้องได้รับอนุญาตก่อน', diff --git a/resources/lang/th/page_title.php b/resources/lang/th/page_title.php index 0df766ff9d1..da7c11f62de 100644 --- a/resources/lang/th/page_title.php +++ b/resources/lang/th/page_title.php @@ -64,11 +64,11 @@ '_' => 'ความคิดเห็น', ], 'contest_entries_controller' => [ - 'judge_results' => '', + 'judge_results' => 'ผลการตัดสินการแข่งขัน', ], 'contests_controller' => [ '_' => 'การแข่งขัน', - 'judge' => '', + 'judge' => 'การตัดสินการแข่งขัน', ], 'groups_controller' => [ 'show' => 'กลุ่ม', @@ -112,7 +112,7 @@ ทัวร์นาเมนต์', ], 'user_cover_presets_controller' => [ - '_' => '', + '_' => 'พรีเซ็ตปกของผู้ใช้', ], 'users_controller' => [ '_' => 'ข้อมูลผู้เล่น', diff --git a/resources/lang/th/password_reset.php b/resources/lang/th/password_reset.php index 3ec39d0816b..d8107c0fa0e 100644 --- a/resources/lang/th/password_reset.php +++ b/resources/lang/th/password_reset.php @@ -37,7 +37,7 @@ 'username' => 'กรอกอีเมล หรือชื่อผู้ใช้', 'reason' => [ - 'inactive_different_country' => "", + 'inactive_different_country' => "บัญชีของคุณไม่ได้ใช้งานมานาน หากต้องการรักษาความปลอดภัยของบัญชีคุณ โปรดรีเซ็ตรหัสผ่านของคุณ", ], 'support' => [ '_' => ' diff --git a/resources/lang/th/rankings.php b/resources/lang/th/rankings.php index d6396fe2006..eb1cf8a2608 100644 --- a/resources/lang/th/rankings.php +++ b/resources/lang/th/rankings.php @@ -9,6 +9,12 @@ 'title' => 'ประเทศ', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'แสดง', @@ -24,12 +30,13 @@ ], 'performance' => [ - 'insufficient_history' => '', + 'insufficient_history' => 'ผู้ใช้คนนี้มีประวัติการจัดอันดับล่าสุดน้อยกว่า 30 วัน', ], 'type' => [ 'charts' => 'โดดเด่น', 'country' => 'ประเทศ', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'โหมดผู้เล่นหลายคน', 'performance' => 'ประสิทธิภาพ', diff --git a/resources/lang/th/report.php b/resources/lang/th/report.php index e206f99688b..46da8ed4ae3 100644 --- a/resources/lang/th/report.php +++ b/resources/lang/th/report.php @@ -25,8 +25,8 @@ ], 'message' => [ - 'button' => '', - 'title' => '', + 'button' => 'รายงานข้อความ', + 'title' => 'รายงานข้อความของ:username?', ], 'scores' => [ diff --git a/resources/lang/th/score_tokens.php b/resources/lang/th/score_tokens.php index 88f37c38cc3..194420b3d0a 100644 --- a/resources/lang/th/score_tokens.php +++ b/resources/lang/th/score_tokens.php @@ -5,7 +5,7 @@ return [ 'create' => [ - 'beatmap_hash_invalid' => '', - 'submission_disabled' => '', + 'beatmap_hash_invalid' => 'beatmap_hash ไม่ถูกต้องหรือขาดหายไป', + 'submission_disabled' => 'การส่งคะแนนถูกปิดใช้งาน', ], ]; diff --git a/resources/lang/th/scores.php b/resources/lang/th/scores.php index 9a70112c295..a2ec1f77056 100644 --- a/resources/lang/th/scores.php +++ b/resources/lang/th/scores.php @@ -5,7 +5,7 @@ return [ 'show' => [ - 'non_preserved' => '', + 'non_preserved' => 'คะแนนนี้ถูกทำเครื่องหมายสำหรับการลบและจะหายไปในไม่ช้า', 'title' => ':username บน :title [:version]', 'beatmap' => [ @@ -25,8 +25,8 @@ 'status' => [ 'non_best' => 'เฉพาะคะแนนที่ดีที่สุดของผู้เล่น จะให้ pp', - 'no_pp' => '', + 'no_pp' => 'ไม่สามารถรับ pp ได้สำหรับคะแนนนี้', 'processing' => 'คะแนนนี้กำลังถูกคำนวนอยู่ และจะถูกแสดงในไม่ช้า', - 'no_rank' => '', + 'no_rank' => 'คะแนนนี้ไม่มีอันดับเนื่องจากยังไม่ได้รับการจัดอันดับหรือถูกทำเครื่องหมายสำหรับการลบ', ], ]; diff --git a/resources/lang/th/user_cover_presets.php b/resources/lang/th/user_cover_presets.php index bc8670fbd74..948deeb6c50 100644 --- a/resources/lang/th/user_cover_presets.php +++ b/resources/lang/th/user_cover_presets.php @@ -5,33 +5,33 @@ return [ 'index' => [ - 'batch_disable' => '', - 'batch_enable' => '', + 'batch_disable' => 'ปิดการใช้งานตามที่เลือก', + 'batch_enable' => 'เปิดการใช้งานตามที่เลือก', 'batch_confirm' => [ - '_' => '', - 'disable' => '', - 'enable' => '', - 'items' => '', + '_' => ':action :items?', + 'disable' => 'ปิดการใช้งาน', + 'enable' => 'เปิดการใช้งาน', + 'items' => ':count_delimited ปก|:count_delimited ปก', ], 'create_form' => [ - 'files' => '', - 'submit' => '', - 'title' => '', + 'files' => 'ไฟล์', + 'submit' => 'บันทึก', + 'title' => 'เพิ่มใหม่', ], 'item' => [ - 'click_to_disable' => '', - 'click_to_enable' => '', - 'enabled' => '', - 'disabled' => '', - 'image_store' => '', - 'image_update' => '', + 'click_to_disable' => 'คลิกเพื่อปิดใช้งาน', + 'click_to_enable' => 'คลิกเพื่อเปิดใช้งาน', + 'enabled' => 'เปิดใช้งาน', + 'disabled' => 'ปิดใช้งาน', + 'image_store' => 'ตั้งรูปภาพ', + 'image_update' => 'เปลี่ยนแทนที่รูปภาพ', ], ], 'store' => [ - 'failed' => '', - 'ok' => '', + 'failed' => 'เกิดข้อผิดพลาดขณะสร้างปก: :error', + 'ok' => 'สร้างปกขึ้นแล้ว', ], ]; diff --git a/resources/lang/th/users.php b/resources/lang/th/users.php index 2010808c35e..40c136b788d 100644 --- a/resources/lang/th/users.php +++ b/resources/lang/th/users.php @@ -97,7 +97,7 @@ 'force_reactivation' => [ 'reason' => [ - 'inactive' => "", + 'inactive' => "บัญชีของคุณไม่ได้ใช้งานมานาน", 'inactive_different_country' => "บัญชีของคุณไม่ได้ใช้งานมานาน", ], ], @@ -198,28 +198,28 @@ 'to_1' => 'แสดงปก', ], 'daily_challenge' => [ - 'daily' => '', - 'daily_streak_best' => '', - 'daily_streak_current' => '', - 'playcount' => '', - 'title' => '', - 'top_10p_placements' => '', - 'top_50p_placements' => '', - 'weekly' => '', - 'weekly_streak_best' => '', - 'weekly_streak_current' => '', + 'daily' => 'สตรีคประจำวัน', + 'daily_streak_best' => 'สตรีคประจำวันที่ดีที่สุด', + 'daily_streak_current' => 'สตรีคประจำวันปัจจุบัน', + 'playcount' => 'เข้าร่วมทั้งหมด', + 'title' => 'ชาเลนจ์\nประจำวัน', + 'top_10p_placements' => 'ท็อป 10% แรก', + 'top_50p_placements' => 'ท็อป 50% แรก', + 'weekly' => 'สตรีคประจำสัปดาห์', + 'weekly_streak_best' => 'สตรีคประจำสัปดาห์ที่ดีที่สุด', + 'weekly_streak_current' => 'สตรีคประจำสัปดาห์ปัจจุบัน', 'unit' => [ - 'day' => '', - 'week' => '', + 'day' => ':value วัน', + 'week' => ':value สัปดาห์', ], ], 'edit' => [ 'cover' => [ 'button' => 'เปลี่ยนรูปภาพปก', 'defaults_info' => 'จะมีตัวเลือกรูปภาพปกเพิ่มมากขึ้นในอนาคต', - 'holdover_remove_confirm' => "", - 'title' => '', + 'holdover_remove_confirm' => "ปกที่เลือกไว้ก่อนหน้านี้ไม่สามารถเลือกได้อีกต่อไป คุณไม่สามารถเลือกกลับมาได้หลังจากสลับไปใช้ปกอื่น ดำเนินการต่อ?", + 'title' => 'ปก', 'upload' => [ 'broken_file' => 'ประมวลผลรูปภาพล้มเหลว โปรดตรวจสอบรูปภาพและลองใหม่อีกครั้ง', @@ -243,12 +243,12 @@ ], 'hue' => [ - 'reset_no_supporter' => '', - 'title' => '', + 'reset_no_supporter' => 'รีเซ็ตสีเป็นค่าเริ่มต้นหรือไม่? จะต้องใช้แท็กผู้สนับสนุนเพื่อเปลี่ยนเป็นสีอื่น', + 'title' => 'สี', 'supporter' => [ - '_' => '', - 'link' => '', + '_' => 'ธีมสีที่กำหนดเองมีให้เฉพาะสำหรับ :link เท่านั้น', + 'link' => 'ผู้สนับสนุน osu!', ], ], ], diff --git a/resources/lang/tr/beatmapsets.php b/resources/lang/tr/beatmapsets.php index fcfcbba13d7..8ccd702a296 100644 --- a/resources/lang/tr/beatmapsets.php +++ b/resources/lang/tr/beatmapsets.php @@ -17,7 +17,7 @@ 'download' => [ 'limit_exceeded' => 'Yavaş ol, daha çok oyna.', - 'no_mirrors' => '', + 'no_mirrors' => 'Herhangi bir indirme sunucusu mevcut değil.', ], 'featured_artist_badge' => [ @@ -41,17 +41,18 @@ ], 'nominate' => [ - 'bng_limited_too_many_rulesets' => '', - 'full_nomination_required' => '', + 'bng_limited_too_many_rulesets' => 'Deneme sürecindeki aday göstericiler birden fazla kural seti aday gösteremez.', + 'full_nomination_required' => 'Bir kural setinin son adaylığını gerçekleştirmek için tam yetkili bir aday gösterici olmanız gerekir.', 'hybrid_requires_modes' => 'Karma bir beatmap seti, adaylık için en az bir oyun modu seçmenizi gerektirir.', 'incorrect_mode' => ':mode modunu aday göstermek için izniniz yok.', - 'invalid_limited_nomination' => '', - 'invalid_ruleset' => '', + 'invalid_limited_nomination' => 'Bu beatmap geçersiz adaylara sahip ve bu durumda onaylanamaz.', + 'invalid_ruleset' => 'Bu aday geçersiz kural setlerine sahip.', 'too_many' => 'Adaylık şartı zaten yerine getirildi.', - 'too_many_non_main_ruleset' => '', + 'too_many_non_main_ruleset' => 'Ana kural seti dışındaki adaylık gereksinimi zaten karşılandı.', 'dialog' => [ 'confirmation' => 'Bu beatmapi aday göstermek istediğinize emin misiniz?', + 'different_nominator_warning' => '', 'header' => 'Beatmap aday gösterin', 'hybrid_warning' => 'not: sadece bir kez aday gösterebilirsiniz, bu yüzden lütfen istediğiniz tüm oyun modlarını aday gösterdiğinizden emin olun', 'current_main_ruleset' => 'Şu anki kural dizisi: :ruleset', diff --git a/resources/lang/tr/contest.php b/resources/lang/tr/contest.php index a82ea2e7ce6..a4ef0fd2d45 100644 --- a/resources/lang/tr/contest.php +++ b/resources/lang/tr/contest.php @@ -14,7 +14,7 @@ ], 'judge' => [ - 'comments' => '', + 'comments' => 'yorumlar', 'hide_judged' => 'değerlendirilen girişleri gizle', 'nav_title' => 'yargıç', 'no_current_vote' => 'henüz oy vermedin.', diff --git a/resources/lang/tr/rankings.php b/resources/lang/tr/rankings.php index fe2dd3faf9d..7953687d409 100644 --- a/resources/lang/tr/rankings.php +++ b/resources/lang/tr/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Ülke', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Göster', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'Öne Çıkanlar', 'country' => 'Ülke', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'çok oyunculu', 'performance' => 'Performans', diff --git a/resources/lang/tr/users.php b/resources/lang/tr/users.php index 0f4fb005d17..b4df338ffe2 100644 --- a/resources/lang/tr/users.php +++ b/resources/lang/tr/users.php @@ -200,7 +200,7 @@ 'daily' => 'Günlük Seri', 'daily_streak_best' => 'En İyi Günlük Seri', 'daily_streak_current' => 'Mevcut Günlük Seri', - 'playcount' => '', + 'playcount' => 'Toplam Katılım', 'title' => 'Günlük\nMeydan Okuma', 'top_10p_placements' => 'İlk %10 Sıralama', 'top_50p_placements' => 'İlk %50 Sıralama', diff --git a/resources/lang/uk/beatmapsets.php b/resources/lang/uk/beatmapsets.php index 21741035d0a..7284fc54c58 100644 --- a/resources/lang/uk/beatmapsets.php +++ b/resources/lang/uk/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Ви впевнені що хочете номінувати цю мапу?', + 'different_nominator_warning' => '', 'header' => 'Номінувати мапу', 'hybrid_warning' => 'примітка: ви можете номінувати лише один раз, так що, переконайтеся в тому, що ви номінуєте всі режими, які збиралися', 'current_main_ruleset' => 'Головний набір ігрових режимів зараз: :ruleset', diff --git a/resources/lang/uk/rankings.php b/resources/lang/uk/rankings.php index 064b5453e08..87306e539f1 100644 --- a/resources/lang/uk/rankings.php +++ b/resources/lang/uk/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Країни', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Показати', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'чарти', 'country' => 'країни', + 'daily_challenge' => '', 'kudosu' => 'кудосу', 'multiplayer' => 'мультиплеєр', 'performance' => 'продуктивність', diff --git a/resources/lang/uk/users.php b/resources/lang/uk/users.php index d11d08ac04e..76aad6fc72d 100644 --- a/resources/lang/uk/users.php +++ b/resources/lang/uk/users.php @@ -200,7 +200,7 @@ 'daily' => 'Щоденна серія', 'daily_streak_best' => 'Найкраща щоденна серія', 'daily_streak_current' => 'Поточна щоденна серія', - 'playcount' => '', + 'playcount' => 'Всього участі', 'title' => 'Щоденний\nВиклик', 'top_10p_placements' => 'Топ 10% позицій', 'top_50p_placements' => 'Топ 50% позицій', diff --git a/resources/lang/vi/beatmapsets.php b/resources/lang/vi/beatmapsets.php index fa8537e14a9..ef66e00a5f1 100644 --- a/resources/lang/vi/beatmapsets.php +++ b/resources/lang/vi/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => 'Bạn có chắc chắn muốn đề cử beatmap này không?', + 'different_nominator_warning' => '', 'header' => 'Đề cử Beatmap', 'hybrid_warning' => 'lưu ý: bạn chỉ có thể đề cử một lần, vì vậy hãy đảm bảo rằng bạn đang đề cử cho tất cả các chế độ chơi mà bạn dự định', 'current_main_ruleset' => 'Ruleset chính hiện tại là: :ruleset', diff --git a/resources/lang/vi/rankings.php b/resources/lang/vi/rankings.php index 72df3b31e5e..8263bbd24fe 100644 --- a/resources/lang/vi/rankings.php +++ b/resources/lang/vi/rankings.php @@ -9,6 +9,12 @@ 'title' => 'Quốc gia', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => 'Hiển thị', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => 'tiêu điểm', 'country' => 'quốc gia', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => 'nhiều người chơi', 'performance' => 'thành tích', diff --git a/resources/lang/vi/users.php b/resources/lang/vi/users.php index 63966793410..36e1e6c6f20 100644 --- a/resources/lang/vi/users.php +++ b/resources/lang/vi/users.php @@ -200,7 +200,7 @@ 'daily' => 'Chuỗi chơi hằng ngày', 'daily_streak_best' => 'Chuỗi chơi hằng ngày tốt nhất', 'daily_streak_current' => 'Chuỗi chơi hằng ngày hiện tại', - 'playcount' => '', + 'playcount' => 'Tổng Số Lần Tham Gia', 'title' => 'Thử thách\nhằng ngày', 'top_10p_placements' => '10% vị trí hàng đầu', 'top_50p_placements' => '50% vị trí hàng đầu', diff --git a/resources/lang/zh-tw/beatmapsets.php b/resources/lang/zh-tw/beatmapsets.php index ff3e1854187..27df9900356 100644 --- a/resources/lang/zh-tw/beatmapsets.php +++ b/resources/lang/zh-tw/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '您確定要提名這張圖譜嗎？', + 'different_nominator_warning' => '', 'header' => '提名圖譜', 'hybrid_warning' => '注意: 您只能提名一次，所以請確保您的提名包含所有您想提名的模式。', 'current_main_ruleset' => '目前遊戲模式為: :ruleset', diff --git a/resources/lang/zh-tw/rankings.php b/resources/lang/zh-tw/rankings.php index fcb31165c05..0201bb164bc 100644 --- a/resources/lang/zh-tw/rankings.php +++ b/resources/lang/zh-tw/rankings.php @@ -9,6 +9,12 @@ 'title' => '國家', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '顯示', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '月賽', 'country' => '國家', + 'daily_challenge' => '', 'kudosu' => 'kudosu', 'multiplayer' => '多人遊戲', 'performance' => '成績', diff --git a/resources/lang/zh-tw/users.php b/resources/lang/zh-tw/users.php index 7c7d94dd1ad..24e6b1cab1e 100644 --- a/resources/lang/zh-tw/users.php +++ b/resources/lang/zh-tw/users.php @@ -200,7 +200,7 @@ 'daily' => '每日連續次數', 'daily_streak_best' => '最佳每日連續次數', 'daily_streak_current' => '目前每日連續次數', - 'playcount' => '', + 'playcount' => '總遊玩次數', 'title' => '每日挑戰', 'top_10p_placements' => '前10%名次', 'top_50p_placements' => '前50%名次', diff --git a/resources/lang/zh/beatmapsets.php b/resources/lang/zh/beatmapsets.php index 4c4f495f8ad..9d663dffff8 100644 --- a/resources/lang/zh/beatmapsets.php +++ b/resources/lang/zh/beatmapsets.php @@ -52,6 +52,7 @@ 'dialog' => [ 'confirmation' => '您确定要提名这张谱面吗？', + 'different_nominator_warning' => '', 'header' => '提名谱面', 'hybrid_warning' => '注意：您只能提名一次，所以请确保提名包含所有您想要提名的游戏模式。', 'current_main_ruleset' => '主游戏模式：:ruleset', diff --git a/resources/lang/zh/rankings.php b/resources/lang/zh/rankings.php index 8998c9df082..d09b209afac 100644 --- a/resources/lang/zh/rankings.php +++ b/resources/lang/zh/rankings.php @@ -9,6 +9,12 @@ 'title' => '国家或地区', ], + 'daily_challenge' => [ + 'beatmap' => '', + 'percentile_10' => '', + 'percentile_50' => '', + ], + 'filter' => [ 'title' => '显示', @@ -30,6 +36,7 @@ 'type' => [ 'charts' => '季赛（旧版）', 'country' => '国家/地区', + 'daily_challenge' => '', 'kudosu' => 'Kudosu', 'multiplayer' => '多人游戏', 'performance' => '表现', diff --git a/resources/lang/zh/users.php b/resources/lang/zh/users.php index 54da2047177..3daa4ba74da 100644 --- a/resources/lang/zh/users.php +++ b/resources/lang/zh/users.php @@ -200,7 +200,7 @@ 'daily' => '每日连续完成数', 'daily_streak_best' => '最佳每日完成数', 'daily_streak_current' => '当前每日完成数', - 'playcount' => '', + 'playcount' => '参加次数', 'title' => '每日\n挑战', 'top_10p_placements' => '前 10% 位置', 'top_50p_placements' => '前 50% 位置', From 9c0a81ad0a1364155ab580b3bdaaa0e0bb01aee2 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 24 Sep 2024 03:23:09 +0900 Subject: [PATCH 08/36] add command for getting paypal details of orders --- app/Console/Commands/StoreGetPaypalOrder.php | 40 ++++++++++++++++++++ app/Console/Kernel.php | 1 + 2 files changed, 41 insertions(+) create mode 100644 app/Console/Commands/StoreGetPaypalOrder.php diff --git a/app/Console/Commands/StoreGetPaypalOrder.php b/app/Console/Commands/StoreGetPaypalOrder.php new file mode 100644 index 00000000000..aa923936102 --- /dev/null +++ b/app/Console/Commands/StoreGetPaypalOrder.php @@ -0,0 +1,40 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +namespace App\Console\Commands; + +use App\Libraries\Payments\PaypalApiContext; +use App\Models\Store\Order; +use App\Models\Store\Product; +use Illuminate\Console\Command; +use PayPalCheckoutSdk\Orders\OrdersGetRequest; + +class StoreGetPaypalOrder extends Command +{ + protected $signature = 'store:get-paypal-order {orderId}'; + + protected $description = 'Gets order info from paypal.'; + + public function handle() + { + $order = Order::findOrFail(get_int($this->argument('orderId'))); + if ($order->provider !== 'paypal') { + $this->error('Not a Paypal order'); + return; + } + + $paypalOrderId = $order->reference; + if ($paypalOrderId === null) { + $this->error('Missing Paypal order id'); + return; + } + + $this->comment("Getting details for Order {$order->getKey()}, Paypal Id: {$paypalOrderId}"); + $client = PaypalApiContext::client(); + $response = $client->execute(new OrdersGetRequest($paypalOrderId)); + + $this->line(json_encode((array) $response->result, JSON_PRETTY_PRINT)); + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 85e252310e1..10262f13a68 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -36,6 +36,7 @@ class Kernel extends ConsoleKernel Commands\StoreCleanupStaleOrders::class, Commands\StoreExpireProducts::class, + Commands\StoreGetPaypalOrder::class, // builds Commands\BuildsCreate::class, From 97bee71167de3c8a7022b53b3c2eaed0736b4252 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 24 Sep 2024 04:02:32 +0900 Subject: [PATCH 09/36] reject banned paypal accounts --- app/Console/Commands/StoreGetPaypalOrder.php | 1 - .../Store/PaymentRejectedException.php | 12 ++++++++ .../Controllers/Payments/PaypalController.php | 3 ++ .../Payments/PaypalExecutePayment.php | 29 +++++++++++++++++-- app/Models/Store/PaypalBanned.php | 13 +++++++++ ...9_24_000001_create_store_paypal_banned.php | 27 +++++++++++++++++ 6 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 app/Exceptions/Store/PaymentRejectedException.php create mode 100644 app/Models/Store/PaypalBanned.php create mode 100644 database/migrations/2024_09_24_000001_create_store_paypal_banned.php diff --git a/app/Console/Commands/StoreGetPaypalOrder.php b/app/Console/Commands/StoreGetPaypalOrder.php index aa923936102..1ea65c41940 100644 --- a/app/Console/Commands/StoreGetPaypalOrder.php +++ b/app/Console/Commands/StoreGetPaypalOrder.php @@ -7,7 +7,6 @@ use App\Libraries\Payments\PaypalApiContext; use App\Models\Store\Order; -use App\Models\Store\Product; use Illuminate\Console\Command; use PayPalCheckoutSdk\Orders\OrdersGetRequest; diff --git a/app/Exceptions/Store/PaymentRejectedException.php b/app/Exceptions/Store/PaymentRejectedException.php new file mode 100644 index 00000000000..64d6dc7d922 --- /dev/null +++ b/app/Exceptions/Store/PaymentRejectedException.php @@ -0,0 +1,12 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +namespace App\Exceptions\Store; + +class PaymentRejectedException extends OrderException +{ +} diff --git a/app/Http/Controllers/Payments/PaypalController.php b/app/Http/Controllers/Payments/PaypalController.php index 0dfea2464b1..1a9c17fdc7c 100644 --- a/app/Http/Controllers/Payments/PaypalController.php +++ b/app/Http/Controllers/Payments/PaypalController.php @@ -7,6 +7,7 @@ use App\Exceptions\InvalidSignatureException; use App\Exceptions\Store\OrderException; +use App\Exceptions\Store\PaymentRejectedException; use App\Libraries\OrderCheckout; use App\Libraries\Payments\NotificationType; use App\Libraries\Payments\PaypalCreatePayment; @@ -61,6 +62,8 @@ public function approved() (new PaypalExecutePayment($order))->run(); } catch (HttpException $e) { return $this->setAndRedirectCheckoutError($order, $this->userErrorMessage($e)); + } catch (PaymentRejectedException $e) { + return $this->setAndRedirectCheckoutError($order, osu_trans('paypal/errors.unknown')); } return redirect(route('store.invoice.show', ['invoice' => $order->order_id, 'thanks' => 1])); diff --git a/app/Libraries/Payments/PaypalExecutePayment.php b/app/Libraries/Payments/PaypalExecutePayment.php index c716bcb479e..ef8594ca1a3 100644 --- a/app/Libraries/Payments/PaypalExecutePayment.php +++ b/app/Libraries/Payments/PaypalExecutePayment.php @@ -5,9 +5,13 @@ namespace App\Libraries\Payments; +use App\Exceptions\Store\PaymentRejectedException; use App\Models\Store\Order; +use App\Models\Store\PaypalBanned; use Log; +use PayPalCheckoutSdk\Core\PayPalHttpClient; use PayPalCheckoutSdk\Orders\OrdersCaptureRequest; +use PayPalCheckoutSdk\Orders\OrdersGetRequest; use Throwable; /** @@ -19,8 +23,11 @@ */ class PaypalExecutePayment { + private PayPalHttpClient $client; + public function __construct(private Order $order) { + $this->client = PaypalApiContext::client(); } public function run() @@ -34,13 +41,16 @@ public function run() ); } + $paypalOrderId = $order->reference; + + $this->assertPaypalOrder($paypalOrderId); + $order->status = Order::STATUS_PAYMENT_APPROVED; $order->saveOrExplode(); - $client = PaypalApiContext::client(); - $request = new OrdersCaptureRequest($order->reference); + $request = new OrdersCaptureRequest($paypalOrderId); - $response = $client->execute($request); + $response = $this->client->execute($request); // This block is just extra information for now, errors here should not cause the transaction to fail. try { @@ -53,4 +63,17 @@ public function run() } }); } + + private function assertPaypalOrder(string $paypalOrderId): void + { + $request = new OrdersGetRequest($paypalOrderId); + $response = $this->client->execute($request); + + $accountId = $response->result->payment_source->paypal->account_id; + + if (PaypalBanned::where('id', $accountId)->exists()) { + datadog_increment('store.payments.banned', ['provider' => $this->order->getPaymentProvider()]); + throw new PaymentRejectedException($this->order); + } + } } diff --git a/app/Models/Store/PaypalBanned.php b/app/Models/Store/PaypalBanned.php new file mode 100644 index 00000000000..5e57cf239f2 --- /dev/null +++ b/app/Models/Store/PaypalBanned.php @@ -0,0 +1,13 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +namespace App\Models\Store; + +/** + * @property string $id + */ +class PaypalBanned extends Model +{ +} diff --git a/database/migrations/2024_09_24_000001_create_store_paypal_banned.php b/database/migrations/2024_09_24_000001_create_store_paypal_banned.php new file mode 100644 index 00000000000..6b2f3a9f876 --- /dev/null +++ b/database/migrations/2024_09_24_000001_create_store_paypal_banned.php @@ -0,0 +1,27 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; + +return new class extends Migration +{ + public function up(): void + { + Schema::connection('mysql-store')->create('paypal_banneds', function (Blueprint $table) { + $table->string('id'); + + $table->unique('id'); + }); + } + + public function down(): void + { + Schema::connection('mysql-store')->drop('paypal_banneds'); + } +}; From ed3ce8d39abb505df4e13041871d6386f1ea565c Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 24 Sep 2024 04:16:22 +0900 Subject: [PATCH 10/36] allow banning by email or account_id --- app/Libraries/Payments/PaypalExecutePayment.php | 8 ++++++-- app/Models/Store/PaypalBanned.php | 4 +++- .../2024_09_24_000001_create_store_paypal_banned.php | 8 +++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/Libraries/Payments/PaypalExecutePayment.php b/app/Libraries/Payments/PaypalExecutePayment.php index ef8594ca1a3..2313c112cfa 100644 --- a/app/Libraries/Payments/PaypalExecutePayment.php +++ b/app/Libraries/Payments/PaypalExecutePayment.php @@ -69,9 +69,13 @@ private function assertPaypalOrder(string $paypalOrderId): void $request = new OrdersGetRequest($paypalOrderId); $response = $this->client->execute($request); - $accountId = $response->result->payment_source->paypal->account_id; + $paypalSource = $response->result->payment_source->paypal; - if (PaypalBanned::where('id', $accountId)->exists()) { + if ( + PaypalBanned::where('account_id', $paypalSource->account_id) + ->orWhere('email', $paypalSource->email_address) + ->exists() + ) { datadog_increment('store.payments.banned', ['provider' => $this->order->getPaymentProvider()]); throw new PaymentRejectedException($this->order); } diff --git a/app/Models/Store/PaypalBanned.php b/app/Models/Store/PaypalBanned.php index 5e57cf239f2..d4e7fd678d2 100644 --- a/app/Models/Store/PaypalBanned.php +++ b/app/Models/Store/PaypalBanned.php @@ -6,7 +6,9 @@ namespace App\Models\Store; /** - * @property string $id + * @property int $id + * @property string|null $account_id + * @property string|null $email */ class PaypalBanned extends Model { diff --git a/database/migrations/2024_09_24_000001_create_store_paypal_banned.php b/database/migrations/2024_09_24_000001_create_store_paypal_banned.php index 6b2f3a9f876..54dce9b80ce 100644 --- a/database/migrations/2024_09_24_000001_create_store_paypal_banned.php +++ b/database/migrations/2024_09_24_000001_create_store_paypal_banned.php @@ -14,9 +14,11 @@ public function up(): void { Schema::connection('mysql-store')->create('paypal_banneds', function (Blueprint $table) { - $table->string('id'); - - $table->unique('id'); + $table->increments('id'); + $table->string('account_id')->nullable(); + $table->string('email')->nullable(); + $table->unique('account_id'); + $table->unique('email'); }); } From bc051ad4302cf0d03c02736fdf93df997458825d Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 24 Sep 2024 12:20:43 +0900 Subject: [PATCH 11/36] Add minimum size for price Reduces chance of things moving around when changing item count. --- resources/css/bem/cart-items.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/css/bem/cart-items.less b/resources/css/bem/cart-items.less index c25abd94349..80536ed2c7c 100644 --- a/resources/css/bem/cart-items.less +++ b/resources/css/bem/cart-items.less @@ -8,7 +8,7 @@ gap: 5px; @media @narrow-up { - grid-template-columns: 1fr repeat(3, auto); + grid-template-columns: 1fr auto minmax(100px, auto) auto; } &__item { From 3c8130cd42e77e59452cf60e2613206798a00653 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 24 Sep 2024 12:23:10 +0900 Subject: [PATCH 12/36] More using variable --- resources/css/bem/header-nav-v4.less | 2 +- resources/css/bem/sticky-header-breadcrumbs.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/css/bem/header-nav-v4.less b/resources/css/bem/header-nav-v4.less index 0955b1bbac4..8d520691e39 100644 --- a/resources/css/bem/header-nav-v4.less +++ b/resources/css/bem/header-nav-v4.less @@ -44,7 +44,7 @@ .@{_top}--breadcrumb & + &::before { .fas(); - content: "\f105"; // fa-angle-right + content: @fa-var-angle-right; padding-right: @header-nav-gap; } diff --git a/resources/css/bem/sticky-header-breadcrumbs.less b/resources/css/bem/sticky-header-breadcrumbs.less index 0dad3679a3f..e60f5e262d6 100644 --- a/resources/css/bem/sticky-header-breadcrumbs.less +++ b/resources/css/bem/sticky-header-breadcrumbs.less @@ -17,7 +17,7 @@ & + & { &::before { .fas(); - content: "\f105"; + content: @fa-var-angle-right; margin: 0 10px; } } From c686f260069f8b364970c4cb30cdc8031a6fe2dd Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 24 Sep 2024 12:27:39 +0900 Subject: [PATCH 13/36] Allow passing just the code if title is not needed --- app/Libraries/LocaleMeta.php | 4 ++-- resources/views/accounts/_edit_country.blade.php | 2 +- resources/views/accounts/_edit_sessions.blade.php | 2 +- resources/views/objects/_flag_country.blade.php | 5 +++++ resources/views/rankings/country.blade.php | 2 +- resources/views/rankings/kudosu.blade.php | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Libraries/LocaleMeta.php b/app/Libraries/LocaleMeta.php index be05d4a95bc..ec9771d7d70 100644 --- a/app/Libraries/LocaleMeta.php +++ b/app/Libraries/LocaleMeta.php @@ -208,9 +208,9 @@ public function __construct($locale) $this->data = static::MAPPINGS[$locale]; } - public function flag(): array + public function flag(): string { - return ['acronym' => $this->data['flag']]; + return $this->data['flag']; } public function html(): string diff --git a/resources/views/accounts/_edit_country.blade.php b/resources/views/accounts/_edit_country.blade.php index 0958e237edf..c0b0ba4fd4a 100644 --- a/resources/views/accounts/_edit_country.blade.php +++ b/resources/views/accounts/_edit_country.blade.php @@ -15,7 +15,7 @@