the browser-facing portion of osu!
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Change parameter for country flag view

Also pass single modifier as string.

nanaya 7d8036f3 e1547125

+33 -39
+2 -2
app/Libraries/LocaleMeta.php
··· 208 208 $this->data = static::MAPPINGS[$locale]; 209 209 } 210 210 211 - public function flag(): string 211 + public function flag(): array 212 212 { 213 - return $this->data['flag']; 213 + return ['acronym' => $this->data['flag']]; 214 214 } 215 215 216 216 public function html(): string
+1 -2
resources/views/accounts/_edit_country.blade.php
··· 15 15 <div class="account-edit-entry__group"> 16 16 <p> 17 17 @include('objects._flag_country', [ 18 - 'countryCode' => $user->country_acronym, 19 - 'countryName' => null, 18 + 'country' => ['acronym' => $user->country_acronym], 20 19 'modifiers' => 'wiki', 21 20 ]) 22 21 {{ $user->country->name }}
+2 -2
resources/views/accounts/_edit_sessions.blade.php
··· 32 32 <span class="user-session-list-session__ip" title="{{$session['ip']}}"> 33 33 <span class="user-session-list-session__icon"> 34 34 @include('objects._flag_country', [ 35 - 'countryCode' => $session['country']['code'], 36 - 'modifiers' => ['flat'], 35 + 'country' => ['acronym' => $session['country']['code']], 36 + 'modifiers' => 'flat', 37 37 ]) 38 38 </span> 39 39
+2 -3
resources/views/forum/topics/_post_info.blade.php
··· 79 79 'country' => $user->country->getKey(), 80 80 ])}}"> 81 81 @include('objects._flag_country', [ 82 - 'countryCode' => $user->country->getKey(), 83 - 'countryName' => $user->country->name, 84 - 'modifiers' => ['medium'], 82 + 'country' => $user->country, 83 + 'modifiers' => 'medium', 85 84 ]) 86 85 </a> 87 86 </div>
+2 -2
resources/views/home/_landing_locales.blade.php
··· 6 6 <span class="landing-nav__link js-menu" data-menu-target="landing--locale"> 7 7 <span class="landing-nav__locale-flag"> 8 8 @include('objects._flag_country', [ 9 - 'countryCode' => $currentLocaleMeta->flag(), 9 + 'country' => $currentLocaleMeta->flag(), 10 10 ]) 11 11 </span> 12 12 ··· 38 38 39 39 <span class="landing-nav__locale-flag"> 40 40 @include('objects._flag_country', [ 41 - 'countryCode' => $localeMeta->flag(), 41 + 'country' => $localeMeta->flag(), 42 42 ]) 43 43 </span> 44 44
+2 -2
resources/views/layout/header_mobile/_locales.blade.php
··· 17 17 18 18 <span class="navbar-mobile-item__locale-flag"> 19 19 @include('objects._flag_country', [ 20 - 'countryCode' => $currentLocaleMeta->flag(), 20 + 'country' => $currentLocaleMeta->flag(), 21 21 'modifiers' => ['small', 'flat'], 22 22 ]) 23 23 </span> ··· 39 39 > 40 40 <span class="navbar-mobile-item__locale-flag"> 41 41 @include('objects._flag_country', [ 42 - 'countryCode' => $localeMeta->flag(), 42 + 'country' => $localeMeta->flag(), 43 43 'modifiers' => ['small', 'flat'], 44 44 ]) 45 45 </span>
+4 -4
resources/views/layout/nav2/_locales.blade.php
··· 7 7 data-click-menu-target="nav2-locale-popup" 8 8 > 9 9 @include('objects._flag_country', [ 10 - 'countryCode' => $currentLocaleMeta->flag(), 11 - 'modifiers' => ['flat'], 10 + 'country' => $currentLocaleMeta->flag(), 11 + 'modifiers' => 'flat', 12 12 ]) 13 13 </button> 14 14 ··· 38 38 <span class="nav2-locale-item"> 39 39 <span class="nav2-locale-item__flag"> 40 40 @include('objects._flag_country', [ 41 - 'countryCode' => $localeMeta->flag(), 42 - 'modifiers' => ['flat'], 41 + 'country' => $localeMeta->flag(), 42 + 'modifiers' => 'flat', 43 43 ]) 44 44 </span> 45 45
+2 -3
resources/views/multiplayer/rooms/_rankings_table.blade.php
··· 36 36 <td class="ranking-page-table__column"> 37 37 <div class="ranking-page-table__user-link"> 38 38 @include('objects._flag_country', [ 39 - 'countryName' => $score->user->country->name, 40 - 'countryCode' => $score->user->country->acronym, 41 - 'modifiers' => ['medium'], 39 + 'country' => $score->user->country, 40 + 'modifiers' => 'medium', 42 41 ]) 43 42 <a 44 43 href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode ?? null]) }}"
+3 -3
resources/views/objects/_flag_country.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 <span class="{{ class_with_modifiers('flag-country', $modifiers ?? []) }}" 6 - @if (isset($countryName)) 7 - title="{{ $countryName }}" 6 + @if (isset($country['name'])) 7 + title="{{ $country['name'] }}" 8 8 @endif 9 - style="background-image: url('{{ flag_url($countryCode) }}');" 9 + style="background-image: url('{{ flag_url($country['acronym']) }}');" 10 10 ></span>
+2 -3
resources/views/rankings/_spotlight_rankings_table.blade.php
··· 39 39 <td class="ranking-page-table__column"> 40 40 <div class="ranking-page-table__user-link"> 41 41 @include('objects._flag_country', [ 42 - 'countryName' => $score->user->country->name, 43 - 'countryCode' => $score->user->country->acronym, 44 - 'modifiers' => ['medium'], 42 + 'country' => $score->user->country, 43 + 'modifiers' => 'medium', 45 44 ]) 46 45 <a 47 46 href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
+2 -2
resources/views/rankings/country.blade.php
··· 42 42 'country' => $score->country->acronym, 43 43 ])}}"> 44 44 @include('objects._flag_country', [ 45 - 'countryCode' => $score->country->acronym, 46 - 'modifiers' => ['medium'], 45 + 'country' => ['acronym' => $score->country->acronym], 46 + 'modifiers' => 'medium', 47 47 ]) 48 48 <span class="ranking-page-table__country-link-text"> 49 49 {{ $score->country->name }}
+1 -1
resources/views/rankings/kudosu.blade.php
··· 38 38 <td class="ranking-page-table__column"> 39 39 <div class="ranking-page-table__user-link"> 40 40 @include('objects._flag_country', [ 41 - 'countryCode' => $user->country_acronym, 41 + 'country' => ['acronym' => $user->country_acronym], 42 42 'modifiers' => 'medium', 43 43 ]) 44 44 {!! link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!}
+2 -3
resources/views/rankings/performance.blade.php
··· 117 117 ]) }}" 118 118 > 119 119 @include('objects._flag_country', [ 120 - 'countryName' => $score->user->country->name, 121 - 'countryCode' => $score->user->country->acronym, 122 - 'modifiers' => ['medium'], 120 + 'country' => $score->user->country, 121 + 'modifiers' => 'medium', 123 122 ]) 124 123 </a> 125 124 <a
+2 -3
resources/views/rankings/score.blade.php
··· 51 51 <div class="ranking-page-table__user-link"> 52 52 <a href="{{route('rankings', ['mode' => $mode, 'type' => 'performance', 'country' => $score->user->country->acronym])}}"> 53 53 @include('objects._flag_country', [ 54 - 'countryName' => $score->user->country->name, 55 - 'countryCode' => $score->user->country->acronym, 56 - 'modifiers' => ['medium'], 54 + 'country' => $score->user->country, 55 + 'modifiers' => 'medium', 57 56 ]) 58 57 </a> 59 58 <a
+4 -4
resources/views/wiki/_locale_menu.blade.php
··· 29 29 <span class="btn-osu-big__content"> 30 30 <span class="btn-osu-big__icon-inline btn-osu-big__icon-inline--left"> 31 31 @include('objects._flag_country', [ 32 - 'countryCode' => $displayLocaleMeta->flag(), 33 - 'modifiers' => ['flat'], 32 + 'country' => $displayLocaleMeta->flag(), 33 + 'modifiers' => 'flat', 34 34 ]) 35 35 </span> 36 36 ··· 59 59 <span class="nav2-locale-item nav2-locale-item--no-padding"> 60 60 <span class="nav2-locale-item__flag"> 61 61 @include('objects._flag_country', [ 62 - 'countryCode' => $localeMeta->flag(), 63 - 'modifiers' => ['flat'], 62 + 'country' => $localeMeta->flag(), 63 + 'modifiers' => 'flat', 64 64 ]) 65 65 </span> 66 66