the browser-facing portion of osu!
0
fork

Configure Feed

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

Remove framework helper override

For better interoperability with octane.
Rename trans(_choice) to osu_trans(_choice).

nanaya d0d8ad19 06bea20e

+1012 -1034
+2 -2
app/Exceptions/OrderNotModifiableException.php
··· 19 19 public function __construct(Order $order) 20 20 { 21 21 $key = "store.order.not_modifiable_exception.{$order->status}"; 22 - $trans = trans($key); 22 + $trans = osu_trans($key); 23 23 24 24 parent::__construct( 25 - $trans === $key ? trans('store.order.not_modifiable_exception.default') : $trans 25 + $trans === $key ? osu_trans('store.order.not_modifiable_exception.default') : $trans 26 26 ); 27 27 28 28 $this->order = $order;
+1 -1
app/Exceptions/UserVerificationException.php
··· 17 17 $this->reasonKey = $reasonKey; 18 18 $this->shouldReissue = $shouldReissue; 19 19 20 - $message = trans("user_verification.errors.{$reasonKey}"); 20 + $message = osu_trans("user_verification.errors.{$reasonKey}"); 21 21 22 22 parent::__construct($message); 23 23 }
+2 -2
app/Http/Controllers/AccountController.php
··· 29 29 30 30 $this->middleware(function ($request, $next) { 31 31 if (Auth::check() && Auth::user()->isSilenced()) { 32 - return abort(403, trans('authorization.silenced')); 32 + return abort(403, osu_trans('authorization.silenced')); 33 33 } 34 34 35 35 return $next($request); ··· 75 75 public function cover() 76 76 { 77 77 if (Request::hasFile('cover_file') && !Auth::user()->osu_subscriber) { 78 - return error_popup(trans('errors.supporter_only')); 78 + return error_popup(osu_trans('errors.supporter_only')); 79 79 } 80 80 81 81 try {
+2 -2
app/Http/Controllers/ArtistsController.php
··· 61 61 62 62 if ($artist->user_id) { 63 63 $links[] = [ 64 - 'title' => trans('artist.links.osu'), 64 + 'title' => osu_trans('artist.links.osu'), 65 65 'url' => route('users.show', $artist->user_id), 66 66 'icon' => 'fas fa-user', 67 67 'class' => 'osu', ··· 70 70 71 71 if ($artist->website) { 72 72 $links[] = [ 73 - 'title' => trans('artist.links.site'), 73 + 'title' => osu_trans('artist.links.site'), 74 74 'url' => $artist->website, 75 75 'icon' => 'fas fa-link', 76 76 'class' => 'website',
+1 -1
app/Http/Controllers/BeatmapDiscussionsController.php
··· 172 172 if ($discussion->vote($params)) { 173 173 return $discussion->beatmapset->defaultDiscussionJson(); 174 174 } else { 175 - return error_popup(trans('beatmaps.discussion-votes.update.error')); 175 + return error_popup(osu_trans('beatmaps.discussion-votes.update.error')); 176 176 } 177 177 } 178 178 }
+1 -1
app/Http/Controllers/BeatmapsController.php
··· 81 81 try { 82 82 if ($type !== 'global' || !empty($mods)) { 83 83 if ($currentUser === null || !$currentUser->isSupporter()) { 84 - throw new ScoreRetrievalException(trans('errors.supporter_only')); 84 + throw new ScoreRetrievalException(osu_trans('errors.supporter_only')); 85 85 } 86 86 } 87 87
+1 -1
app/Http/Controllers/Beatmapsets/FavouritesController.php
··· 26 26 switch (request('action')) { 27 27 case 'favourite': 28 28 if ($user->favouriteBeatmapsets()->count() >= $user->beatmapsetFavouriteAllowance()) { 29 - return error_popup(trans('beatmapsets.show.favourites.limit_reached')); 29 + return error_popup(osu_trans('beatmapsets.show.favourites.limit_reached')); 30 30 } 31 31 $beatmapset->favourite($user); 32 32 break;
+1 -1
app/Http/Controllers/BeatmapsetsController.php
··· 164 164 ->count(); 165 165 166 166 if ($recentlyDownloaded > Auth::user()->beatmapsetDownloadAllowance()) { 167 - abort(429, trans('beatmapsets.download.limit_exceeded')); 167 + abort(429, osu_trans('beatmapsets.download.limit_exceeded')); 168 168 } 169 169 170 170 $noVideo = get_bool(Request::input('noVideo', false));
+2 -2
app/Http/Controllers/BlocksController.php
··· 32 32 $currentUser = Auth::user(); 33 33 34 34 if ($currentUser->blocks()->count() >= $currentUser->maxBlocks()) { 35 - return error_popup(trans('users.blocks.too_many')); 35 + return error_popup(osu_trans('users.blocks.too_many')); 36 36 } 37 37 38 38 $targetId = get_int(Request::input('target')); ··· 78 78 ->first(); 79 79 80 80 if (!$block) { 81 - abort(404, trans('users.blocks.not_blocked')); 81 + abort(404, osu_trans('users.blocks.not_blocked')); 82 82 } 83 83 84 84 $user->blocks()->detach($block);
+1 -1
app/Http/Controllers/FallbackController.php
··· 23 23 app('route-section')->setError(404); 24 24 25 25 if (is_json_request()) { 26 - return error_popup(trans('errors.missing_route'), 404); 26 + return error_popup(osu_trans('errors.missing_route'), 404); 27 27 } 28 28 29 29 return ext_view('layout.error', ['statusCode' => 404], 'html', 404);
+1 -1
app/Http/Controllers/FriendsController.php
··· 65 65 $friends = $currentUser->friends(); // don't fetch (avoids potentially instantiating 500+ friend objects) 66 66 67 67 if ($friends->count() >= $currentUser->maxFriends()) { 68 - return error_popup(trans('friends.too_many')); 68 + return error_popup(osu_trans('friends.too_many')); 69 69 } 70 70 71 71 $targetId = get_int(Request::input('target'));
+2 -2
app/Http/Controllers/NewsController.php
··· 201 201 202 202 NewsPost::syncAll(); 203 203 204 - return ['message' => trans('news.store.ok')]; 204 + return ['message' => osu_trans('news.store.ok')]; 205 205 } 206 206 207 207 public function update($id) ··· 210 210 211 211 NewsPost::findOrFail($id)->sync(true); 212 212 213 - return ['message' => trans('news.update.ok')]; 213 + return ['message' => osu_trans('news.update.ok')]; 214 214 } 215 215 216 216 private function sidebarMeta($post)
+1 -1
app/Http/Controllers/OAuth/ClientsController.php
··· 36 36 $client = auth()->user()->oauthClients()->findOrFail($clientId); 37 37 38 38 if (!$client->resetSecret()) { 39 - return error_popup(trans('oauth.client.reset_failed')); 39 + return error_popup(osu_trans('oauth.client.reset_failed')); 40 40 } 41 41 42 42 return json_item($client, 'OAuth\Client', ['redirect', 'secret']);
+1 -1
app/Http/Controllers/Passport/AuthorizationController.php
··· 37 37 ) { 38 38 $redirectUri = presence(trim($request['redirect_uri'])); 39 39 40 - abort_if($redirectUri === null, 400, trans('model_validation.required', ['attribute' => 'redirect_uri'])); 40 + abort_if($redirectUri === null, 400, osu_trans('model_validation.required', ['attribute' => 'redirect_uri'])); 41 41 42 42 if (!auth()->check()) { 43 43 // Breaks when url contains hash ("#").
+8 -8
app/Http/Controllers/PasswordResetController.php
··· 43 43 $error = $this->issue(Request::input('username')); 44 44 45 45 if ($error === null) { 46 - return ['message' => trans('password_reset.notice.sent')]; 46 + return ['message' => osu_trans('password_reset.notice.sent')]; 47 47 } else { 48 48 return response(['form_error' => [ 49 49 'username' => [$error], ··· 67 67 68 68 if (!present($inputKey)) { 69 69 return response(['form_error' => [ 70 - 'key' => [trans('password_reset.error.missing_key')], 70 + 'key' => [osu_trans('password_reset.error.missing_key')], 71 71 ]], 422); 72 72 } 73 73 ··· 82 82 Session::put('password_reset.tries', $tries); 83 83 84 84 return response(['form_error' => [ 85 - 'key' => [trans('password_reset.error.wrong_key')], 85 + 'key' => [osu_trans('password_reset.error.wrong_key')], 86 86 ]], 422); 87 87 } 88 88 ··· 95 95 96 96 UserAccountHistory::logUserResetPassword($user); 97 97 98 - return ['message' => trans('password_reset.notice.saved')]; 98 + return ['message' => osu_trans('password_reset.notice.saved')]; 99 99 } else { 100 100 return response(['form_error' => [ 101 101 'user' => $user->validationErrors()->all(), ··· 113 113 $user = User::findForLogin($username, true); 114 114 115 115 if ($user === null) { 116 - return trans('password_reset.error.user_not_found'); 116 + return osu_trans('password_reset.error.user_not_found'); 117 117 } 118 118 119 119 if (!present($user->user_email)) { 120 - return trans('password_reset.error.contact_support'); 120 + return osu_trans('password_reset.error.contact_support'); 121 121 } 122 122 123 123 if ($user->isPrivileged() && $user->user_password !== '') { 124 - return trans('password_reset.error.is_privileged'); 124 + return osu_trans('password_reset.error.is_privileged'); 125 125 } 126 126 127 127 $session = [ ··· 144 144 { 145 145 $this->clear(); 146 146 147 - return ['message' => trans("password_reset.restart.{$reasonKey}")]; 147 + return ['message' => osu_trans("password_reset.restart.{$reasonKey}")]; 148 148 } 149 149 }
+2 -2
app/Http/Controllers/Payments/PaypalController.php
··· 85 85 86 86 (new OrderCheckout($order, Order::PROVIDER_PAYPAL))->failCheckout(); 87 87 88 - return $this->setAndRedirectCheckoutError($order, trans('store.checkout.declined')); 88 + return $this->setAndRedirectCheckoutError($order, osu_trans('store.checkout.declined')); 89 89 } 90 90 91 91 // Called by Paypal. ··· 126 126 $key = 'paypal/errors.unknown'; 127 127 } 128 128 129 - return trans($key); 129 + return osu_trans($key); 130 130 } 131 131 }
+2 -2
app/Http/Controllers/SessionsController.php
··· 58 58 DatadogLoginAttempt::log('invalid_captcha'); 59 59 } 60 60 61 - return $this->triggerCaptcha(trans('users.login.invalid_captcha'), 422); 61 + return $this->triggerCaptcha(osu_trans('users.login.invalid_captcha'), 422); 62 62 } 63 63 } 64 64 ··· 67 67 $user = User::findForLogin($username); 68 68 69 69 if ($user === null && strpos($username, '@') !== false && !config('osu.user.allow_email_login')) { 70 - $authError = trans('users.login.email_login_disabled'); 70 + $authError = osu_trans('users.login.email_login_disabled'); 71 71 } else { 72 72 $authError = User::attemptLogin($user, $password, $ip); 73 73 }
+1 -1
app/Http/Controllers/Store/CheckoutController.php
··· 67 67 if (!empty($validationErrors)) { 68 68 return $this->setAndRedirectCheckoutError( 69 69 $order, 70 - trans('store.checkout.cart_problems'), 70 + osu_trans('store.checkout.cart_problems'), 71 71 $validationErrors 72 72 ); 73 73 }
+1 -1
app/Http/Controllers/Store/NotificationRequestsController.php
··· 26 26 $product = Product::findOrFail($productId); 27 27 28 28 if ($product->inStock()) { 29 - return error_popup(trans('store.product.notification_in_stock')); 29 + return error_popup(osu_trans('store.product.notification_in_stock')); 30 30 } 31 31 32 32 try {
+1 -1
app/Http/Middleware/CheckUserBanStatus.php
··· 46 46 logout(); 47 47 48 48 if (is_api_request()) { 49 - abort(403, trans('users.disabled.title')); 49 + abort(403, osu_trans('users.disabled.title')); 50 50 } else { 51 51 return ujs_redirect(route('users.disabled')); 52 52 }
+1 -1
app/Http/Middleware/CheckUserRestricted.php
··· 40 40 public function handle($request, Closure $next) 41 41 { 42 42 if ($this->auth->check() && $this->auth->user()->isRestricted()) { 43 - return error_popup(trans('errors.no_restricted_access')); 43 + return error_popup(osu_trans('errors.no_restricted_access')); 44 44 } 45 45 46 46 return $next($request);
+1 -1
app/Libraries/AuthorizationResult.php
··· 49 49 return; 50 50 } 51 51 52 - return trans('authorization.'.$this->rawMessage()); 52 + return osu_trans('authorization.'.$this->rawMessage()); 53 53 } 54 54 55 55 public function ensureCan()
+15 -15
app/Libraries/BeatmapsetDiscussionReview.php
··· 30 30 public static function create(Beatmapset $beatmapset, array $document, User $user) 31 31 { 32 32 if (empty($document)) { 33 - throw new InvariantException(trans('beatmap_discussions.review.validation.invalid_document')); 33 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.invalid_document')); 34 34 } 35 35 36 36 $priorOpenProblemCount = self::getOpenProblemCount($beatmapset); ··· 44 44 $blockCount = 0; 45 45 foreach ($document as $block) { 46 46 if (!isset($block['type'])) { 47 - throw new InvariantException(trans('beatmap_discussions.review.validation.invalid_block_type')); 47 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.invalid_block_type')); 48 48 } 49 49 50 50 $message = get_string($block['text'] ?? null); 51 51 if ($message === null) { 52 - throw new InvariantException(trans('beatmap_discussions.review.validation.missing_text')); 52 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.missing_text')); 53 53 } 54 54 55 55 switch ($block['type']) { ··· 74 74 75 75 case 'paragraph': 76 76 if (mb_strlen($block['text']) > static::BLOCK_TEXT_LENGTH_LIMIT) { 77 - throw new InvariantException(trans('beatmap_discussions.review.validation.block_too_large', ['limit' => static::BLOCK_TEXT_LENGTH_LIMIT])); 77 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.block_too_large', ['limit' => static::BLOCK_TEXT_LENGTH_LIMIT])); 78 78 } 79 79 $output[] = [ 80 80 'type' => 'paragraph', ··· 84 84 85 85 default: 86 86 // invalid block type 87 - throw new InvariantException(trans('beatmap_discussions.review.validation.invalid_block_type')); 87 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.invalid_block_type')); 88 88 } 89 89 $blockCount++; 90 90 } 91 91 92 92 $minIssues = config('osu.beatmapset.discussion_review_min_issues'); 93 93 if (empty($childIds) || count($childIds) < $minIssues) { 94 - throw new InvariantException(trans_choice('beatmap_discussions.review.validation.minimum_issues', $minIssues)); 94 + throw new InvariantException(osu_trans_choice('beatmap_discussions.review.validation.minimum_issues', $minIssues)); 95 95 } 96 96 97 97 $maxBlocks = config('osu.beatmapset.discussion_review_max_blocks'); 98 98 if ($blockCount > $maxBlocks) { 99 - throw new InvariantException(trans_choice('beatmap_discussions.review.validation.too_many_blocks', $maxBlocks)); 99 + throw new InvariantException(osu_trans_choice('beatmap_discussions.review.validation.too_many_blocks', $maxBlocks)); 100 100 } 101 101 102 102 $review = self::createPost( ··· 130 130 public static function update(BeatmapDiscussion $discussion, array $document, User $user) 131 131 { 132 132 if (empty($document)) { 133 - throw new InvariantException(trans('beatmap_discussions.review.validation.invalid_document')); 133 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.invalid_document')); 134 134 } 135 135 136 136 $beatmapset = Beatmapset::findOrFail($discussion->beatmapset_id); // handle deleted beatmapsets ··· 148 148 149 149 foreach ($document as $block) { 150 150 if (!isset($block['type'])) { 151 - throw new InvariantException(trans('beatmap_discussions.review.validation.invalid_block_type')); 151 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.invalid_block_type')); 152 152 } 153 153 154 154 $message = get_string($block['text'] ?? null); 155 155 if ($message === null) { 156 156 // skip empty message check if this is an existing embed 157 157 if ($block['type'] !== 'embed' || !isset($block['discussion_id'])) { 158 - throw new InvariantException(trans('beatmap_discussions.review.validation.missing_text')); 158 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.missing_text')); 159 159 } 160 160 } 161 161 ··· 189 189 190 190 case 'paragraph': 191 191 if (mb_strlen($block['text']) > static::BLOCK_TEXT_LENGTH_LIMIT) { 192 - throw new InvariantException(trans('beatmap_discussions.review.validation.block_too_large', ['limit' => static::BLOCK_TEXT_LENGTH_LIMIT])); 192 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.block_too_large', ['limit' => static::BLOCK_TEXT_LENGTH_LIMIT])); 193 193 } 194 194 $output[] = [ 195 195 'type' => 'paragraph', ··· 199 199 200 200 default: 201 201 // invalid block type 202 - throw new InvariantException(trans('beatmap_discussions.review.validation.invalid_block_type')); 202 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.invalid_block_type')); 203 203 } 204 204 $blockCount++; 205 205 } 206 206 207 207 $minIssues = config('osu.beatmapset.discussion_review_min_issues'); 208 208 if (empty($childIds) || count($childIds) < $minIssues) { 209 - throw new InvariantException(trans_choice('beatmap_discussions.review.validation.minimum_issues', $minIssues)); 209 + throw new InvariantException(osu_trans_choice('beatmap_discussions.review.validation.minimum_issues', $minIssues)); 210 210 } 211 211 212 212 $maxBlocks = config('osu.beatmapset.discussion_review_max_blocks'); 213 213 if ($blockCount > $maxBlocks) { 214 - throw new InvariantException(trans_choice('beatmap_discussions.review.validation.too_many_blocks', $maxBlocks)); 214 + throw new InvariantException(osu_trans_choice('beatmap_discussions.review.validation.too_many_blocks', $maxBlocks)); 215 215 } 216 216 217 217 // ensure all referenced embeds belong to this discussion 218 218 $externalEmbeds = BeatmapDiscussion::whereIn('id', $childIds)->where('parent_id', '<>', $discussion->getKey())->count(); 219 219 if ($externalEmbeds > 0) { 220 - throw new InvariantException(trans('beatmap_discussions.review.validation.external_references')); 220 + throw new InvariantException(osu_trans('beatmap_discussions.review.validation.external_references')); 221 221 } 222 222 223 223 // update the review post
+2 -2
app/Libraries/ChangeUsername.php
··· 25 25 { 26 26 $link = link_to( 27 27 route('support-the-game'), 28 - trans('model_validation.user.change_username.supporter_required.link_text') 28 + osu_trans('model_validation.user.change_username.supporter_required.link_text') 29 29 ); 30 30 31 - return trans('model_validation.user.change_username.supporter_required._', ['link' => $link]); 31 + return osu_trans('model_validation.user.change_username.supporter_required._', ['link' => $link]); 32 32 } 33 33 34 34 public function __construct(User $user, string $newUsername, string $type = 'paid')
+4 -4
app/Libraries/ImageProcessor.php
··· 33 33 public function basicCheck() 34 34 { 35 35 if ($this->inputFileSize > $this->hardMaxFileSize) { 36 - throw new ImageProcessorException(trans('users.show.edit.cover.upload.too_large')); 36 + throw new ImageProcessorException(osu_trans('users.show.edit.cover.upload.too_large')); 37 37 } 38 38 39 39 if ($this->inputDim === null || !in_array($this->inputDim[2], $this->allowedTypes, true)) { 40 - throw new ImageProcessorException(trans('users.show.edit.cover.upload.unsupported_format')); 40 + throw new ImageProcessorException(osu_trans('users.show.edit.cover.upload.unsupported_format')); 41 41 } 42 42 43 43 if ($this->inputDim[0] > $this->hardMaxDim[0] || $this->inputDim[1] > $this->hardMaxDim[1]) { 44 - throw new ImageProcessorException(trans('users.show.edit.cover.upload.too_large')); 44 + throw new ImageProcessorException(osu_trans('users.show.edit.cover.upload.too_large')); 45 45 } 46 46 } 47 47 ··· 75 75 $inputImage = open_image($this->inputPath, $this->inputDim); 76 76 77 77 if ($inputImage === null) { 78 - throw new ImageProcessorException(trans('users.show.edit.cover.upload.broken_file')); 78 + throw new ImageProcessorException(osu_trans('users.show.edit.cover.upload.broken_file')); 79 79 } 80 80 81 81 if (
+4 -4
app/Libraries/OrderCheckout.php
··· 184 184 185 185 // Checkout process level validations, should not be part of OrderItem validation. 186 186 if ($item->product === null || !$item->product->isAvailable()) { 187 - $messages[] = trans('model_validation/store/product.not_available'); 187 + $messages[] = osu_trans('model_validation/store/product.not_available'); 188 188 } 189 189 190 190 if (!$item->product->inStock($item->quantity)) { 191 - $messages[] = trans('model_validation/store/product.insufficient_stock'); 191 + $messages[] = osu_trans('model_validation/store/product.insufficient_stock'); 192 192 } 193 193 194 194 if ($item->quantity > $item->product->max_quantity) { 195 - $messages[] = trans('model_validation/store/product.too_many', ['count' => $item->product->max_quantity]); 195 + $messages[] = osu_trans('model_validation/store/product.too_many', ['count' => $item->product->max_quantity]); 196 196 } 197 197 198 198 if ($shouldShopify && !$item->product->isShopify()) { 199 - $messages[] = trans('model_validation/store/product.must_separate'); 199 + $messages[] = osu_trans('model_validation/store/product.must_separate'); 200 200 } 201 201 202 202 $customClass = $item->getCustomClassInstance();
+9 -9
app/Libraries/Search/BeatmapsetSearchRequestParams.php
··· 121 121 $languages = Language::listing(); 122 122 $genres = Genre::listing(); 123 123 124 - $modes = [['id' => null, 'name' => trans('beatmaps.mode.any')]]; 124 + $modes = [['id' => null, 'name' => osu_trans('beatmaps.mode.any')]]; 125 125 foreach (Beatmap::MODES as $name => $id) { 126 - $modes[] = ['id' => $id, 'name' => trans("beatmaps.mode.{$name}")]; 126 + $modes[] = ['id' => $id, 'name' => osu_trans("beatmaps.mode.{$name}")]; 127 127 } 128 128 129 129 $extras = []; ··· 133 133 $statuses = []; 134 134 135 135 foreach (static::AVAILABLE_EXTRAS as $id) { 136 - $extras[] = ['id' => $id, 'name' => trans("beatmaps.extra.{$id}")]; 136 + $extras[] = ['id' => $id, 'name' => osu_trans("beatmaps.extra.{$id}")]; 137 137 } 138 138 139 139 foreach (static::AVAILABLE_GENERAL as $id) { 140 - $general[] = ['id' => $id, 'name' => trans("beatmaps.general.{$id}")]; 140 + $general[] = ['id' => $id, 'name' => osu_trans("beatmaps.general.{$id}")]; 141 141 } 142 142 143 143 foreach (static::AVAILABLE_PLAYED as $id) { 144 - $played[] = ['id' => $id, 'name' => trans("beatmaps.played.{$id}")]; 144 + $played[] = ['id' => $id, 'name' => osu_trans("beatmaps.played.{$id}")]; 145 145 } 146 146 147 147 foreach (static::AVAILABLE_RANKS as $id) { 148 - $ranks[] = ['id' => $id, 'name' => trans("beatmaps.rank.{$id}")]; 148 + $ranks[] = ['id' => $id, 'name' => osu_trans("beatmaps.rank.{$id}")]; 149 149 } 150 150 151 151 foreach (static::AVAILABLE_STATUSES as $id) { 152 - $statuses[] = ['id' => $id, 'name' => trans("beatmaps.status.{$id}")]; 152 + $statuses[] = ['id' => $id, 'name' => osu_trans("beatmaps.status.{$id}")]; 153 153 } 154 154 155 155 $nsfw = [ 156 - ['id' => false, 'name' => trans('beatmaps.nsfw.exclude')], 157 - ['id' => true, 'name' => trans('beatmaps.nsfw.include')], 156 + ['id' => false, 'name' => osu_trans('beatmaps.nsfw.exclude')], 157 + ['id' => true, 'name' => osu_trans('beatmaps.nsfw.include')], 158 158 ]; 159 159 160 160 return compact('extras', 'general', 'genres', 'languages', 'modes', 'nsfw', 'played', 'ranks', 'statuses');
+1 -1
app/Libraries/UserVerification.php
··· 128 128 129 129 $this->issue(); 130 130 131 - return response(['message' => trans('user_verification.errors.reissued')], 200); 131 + return response(['message' => osu_trans('user_verification.errors.reissued')], 200); 132 132 } 133 133 134 134 public function verify()
+2 -2
app/Libraries/UsernameValidation.php
··· 28 28 $errors->add( 29 29 'username', 30 30 '.username_available_in', 31 - ['duration' => trans_choice('common.count.days', $remaining->days + 1)] 31 + ['duration' => osu_trans_choice('common.count.days', $remaining->days + 1)] 32 32 ); 33 33 } elseif ($remaining->h > 0) { 34 34 $errors->add( 35 35 'username', 36 36 '.username_available_in', 37 - ['duration' => trans_choice('common.count.hours', $remaining->h + 1)] 37 + ['duration' => osu_trans_choice('common.count.hours', $remaining->h + 1)] 38 38 ); 39 39 } else { 40 40 $errors->add('username', '.username_available_soon');
+2 -2
app/Libraries/ValidationErrors.php
··· 29 29 $rawMessage = $this->keyBase.$rawMessage; 30 30 31 31 $attributeKey = $this->keyBase.$this->prefix.'.attributes.'.$column; 32 - $params['attribute'] = Lang::has($attributeKey) ? trans($attributeKey) : $column; 32 + $params['attribute'] = Lang::has($attributeKey) ? osu_trans($attributeKey) : $column; 33 33 34 - $this->errors[$column][] = trans($rawMessage, $params); 34 + $this->errors[$column][] = osu_trans($rawMessage, $params); 35 35 36 36 return $this; 37 37 }
+1 -1
app/Mail/BeatmapsetUpdateNotice.php
··· 48 48 49 49 return $this 50 50 ->text('emails.beatmapset.update_notice') 51 - ->subject(trans('mail.beatmapset_update_notice.subject', [ 51 + ->subject(osu_trans('mail.beatmapset_update_notice.subject', [ 52 52 'title' => $beatmapset->getDisplayTitle($user), 53 53 ])) 54 54 ->with(compact('beatmapset', 'user'));
+1 -1
app/Mail/DonationThanks.php
··· 48 48 config('store.mail.donation_thanks.sender_address'), 49 49 config('store.mail.donation_thanks.sender_name') 50 50 ) 51 - ->subject(trans('mail.donation_thanks.subject')); 51 + ->subject(osu_trans('mail.donation_thanks.subject')); 52 52 } 53 53 }
+1 -1
app/Mail/ForumNewReply.php
··· 37 37 { 38 38 return $this 39 39 ->text('emails.forum.new_reply') 40 - ->subject(trans('mail.forum_new_reply.subject', [ 40 + ->subject(osu_trans('mail.forum_new_reply.subject', [ 41 41 'title' => $this->topic->topic_title, 42 42 ])); 43 43 }
+1 -1
app/Mail/PasswordReset.php
··· 37 37 { 38 38 return $this 39 39 ->text('emails.password_reset') 40 - ->subject(trans('mail.password_reset.subject')); 40 + ->subject(osu_trans('mail.password_reset.subject')); 41 41 } 42 42 }
+1 -1
app/Mail/StorePaymentCompleted.php
··· 39 39 return $this->text('emails.store.payment_completed') 40 40 ->with($this->params) 41 41 ->from('osustore@ppy.sh', 'osu!store team') 42 - ->subject(trans('mail.store_payment_completed.subject')); 42 + ->subject(osu_trans('mail.store_payment_completed.subject')); 43 43 } 44 44 }
+1 -1
app/Mail/SupporterGift.php
··· 41 41 { 42 42 return $this->text('emails.store.supporter_gift') 43 43 ->with($this->params) 44 - ->subject(trans('mail.supporter_gift.subject')); 44 + ->subject(osu_trans('mail.supporter_gift.subject')); 45 45 } 46 46 }
+1 -1
app/Mail/UserEmailUpdated.php
··· 35 35 { 36 36 return $this 37 37 ->text('emails.user_email_updated') 38 - ->subject(trans('mail.user_email_updated.subject')); 38 + ->subject(osu_trans('mail.user_email_updated.subject')); 39 39 } 40 40 }
+1 -1
app/Mail/UserForceReactivation.php
··· 26 26 ->with([ 27 27 'reason' => $this->reason, 28 28 'user' => $this->user, 29 - ])->subject(trans('mail.user_force_reactivation.subject')); 29 + ])->subject(osu_trans('mail.user_force_reactivation.subject')); 30 30 } 31 31 }
+2 -2
app/Mail/UserNotificationDigest.php
··· 50 50 } 51 51 52 52 $this->groups[$key] = [ 53 - 'text' => trans($baseKey, $details), 53 + 'text' => osu_trans($baseKey, $details), 54 54 ]; 55 55 } 56 56 ··· 77 77 78 78 return $this 79 79 ->text('emails.user_notification_digest', compact('groups', 'user')) 80 - ->subject(trans('mail.user_notification_digest.subject')); 80 + ->subject(osu_trans('mail.user_notification_digest.subject')); 81 81 } 82 82 }
+1 -1
app/Mail/UserPasswordUpdated.php
··· 35 35 { 36 36 return $this 37 37 ->text('emails.user_password_updated') 38 - ->subject(trans('mail.user_password_updated.subject')); 38 + ->subject(osu_trans('mail.user_password_updated.subject')); 39 39 } 40 40 }
+1 -1
app/Mail/UserVerification.php
··· 39 39 { 40 40 return $this 41 41 ->text('emails.user_verification') 42 - ->subject(trans('mail.user_verification.subject')); 42 + ->subject(osu_trans('mail.user_verification.subject')); 43 43 } 44 44 }
+2 -2
app/Models/Beatmap.php
··· 310 310 $mode ?? ($mode = $this->mode); 311 311 312 312 if (!static::isModeValid($mode)) { 313 - throw new ScoreRetrievalException(trans('errors.beatmaps.invalid_mode')); 313 + throw new ScoreRetrievalException(osu_trans('errors.beatmaps.invalid_mode')); 314 314 } 315 315 316 316 if ($this->mode !== 'osu' && $this->mode !== $mode) { 317 - throw new ScoreRetrievalException(trans('errors.beatmaps.standard_converts_only')); 317 + throw new ScoreRetrievalException(osu_trans('errors.beatmaps.standard_converts_only')); 318 318 } 319 319 320 320 $mode = studly_case($mode);
+13 -13
app/Models/Beatmapset.php
··· 635 635 $this->resetMemoized(); // ensure we're not using cached/stale event data 636 636 637 637 if (!$this->isPending()) { 638 - throw new InvariantException(trans('beatmaps.nominations.incorrect_state')); 638 + throw new InvariantException(osu_trans('beatmaps.nominations.incorrect_state')); 639 639 } 640 640 641 641 if ($this->hype < $this->requiredHype()) { 642 - throw new InvariantException(trans('beatmaps.nominations.not_enough_hype')); 642 + throw new InvariantException(osu_trans('beatmaps.nominations.not_enough_hype')); 643 643 } 644 644 645 645 // check if there are any outstanding issues still 646 646 if ($this->beatmapDiscussions()->openIssues()->count() > 0) { 647 - throw new InvariantException(trans('beatmaps.nominations.unresolved_issues')); 647 + throw new InvariantException(osu_trans('beatmaps.nominations.unresolved_issues')); 648 648 } 649 649 650 650 if ($this->isLegacyNominationMode()) { ··· 661 661 } 662 662 663 663 if (!$canNominate) { 664 - throw new InvariantException(trans('beatmapsets.nominate.incorrect_mode', ['mode' => implode(', ', $this->playmodesStr())])); 664 + throw new InvariantException(osu_trans('beatmapsets.nominate.incorrect_mode', ['mode' => implode(', ', $this->playmodesStr())])); 665 665 } 666 666 667 667 if (!$canFullNominate && $this->requiresFullBNNomination()) { 668 - throw new InvariantException(trans('beatmapsets.nominate.full_bn_required')); 668 + throw new InvariantException(osu_trans('beatmapsets.nominate.full_bn_required')); 669 669 } 670 670 } else { 671 671 $playmodes = array_values(array_intersect($this->playmodesStr(), $playmodes)); 672 672 673 673 if (empty($playmodes)) { 674 - throw new InvariantException(trans('beatmapsets.nominate.hybrid_requires_modes')); 674 + throw new InvariantException(osu_trans('beatmapsets.nominate.hybrid_requires_modes')); 675 675 } 676 676 677 677 foreach ($playmodes as $mode) { 678 678 if (!$user->isFullBN($mode) && !$user->isNAT($mode)) { 679 679 if (!$user->isLimitedBN($mode)) { 680 - throw new InvariantException(trans('beatmapsets.nominate.incorrect_mode', ['mode' => $mode])); 680 + throw new InvariantException(osu_trans('beatmapsets.nominate.incorrect_mode', ['mode' => $mode])); 681 681 } 682 682 683 683 if ($this->requiresFullBNNomination($mode)) { 684 - throw new InvariantException(trans('beatmapsets.nominate.full_bn_required')); 684 + throw new InvariantException(osu_trans('beatmapsets.nominate.full_bn_required')); 685 685 } 686 686 } 687 687 } ··· 707 707 $modesSatisfied = 0; 708 708 foreach ($requiredNominations as $mode => $count) { 709 709 if ($currentNominations[$mode] > $count) { 710 - throw new InvariantException(trans('beatmaps.nominations.too_many')); 710 + throw new InvariantException(osu_trans('beatmaps.nominations.too_many')); 711 711 } 712 712 713 713 if ($currentNominations[$mode] === $count) { ··· 746 746 if (!$this->isLoveable()) { 747 747 return [ 748 748 'result' => false, 749 - 'message' => trans('beatmaps.nominations.incorrect_state'), 749 + 'message' => osu_trans('beatmaps.nominations.incorrect_state'), 750 750 ]; 751 751 } 752 752 ··· 771 771 if (!$this->isLoved()) { 772 772 return [ 773 773 'result' => false, 774 - 'message' => trans('beatmaps.nominations.incorrect_state'), 774 + 'message' => osu_trans('beatmaps.nominations.incorrect_state'), 775 775 ]; 776 776 } 777 777 ··· 930 930 if (isset($message)) { 931 931 return [ 932 932 'result' => false, 933 - 'message' => trans("model_validation.beatmapset_discussion.hype.{$message}"), 933 + 'message' => osu_trans("model_validation.beatmapset_discussion.hype.{$message}"), 934 934 ]; 935 935 } else { 936 936 return ['result' => true]; ··· 1244 1244 1245 1245 public function toMetaDescription() 1246 1246 { 1247 - $section = trans('layout.menu.beatmaps._'); 1247 + $section = osu_trans('layout.menu.beatmaps._'); 1248 1248 1249 1249 return "osu! » {$section} » {$this->artist} - {$this->title}"; 1250 1250 }
+1 -1
app/Models/Changelog.php
··· 101 101 'user' => $user, 102 102 'user_id' => $user->user_id, 103 103 'prefix' => '*', 104 - 'message' => trans('changelog.generic'), 104 + 'message' => osu_trans('changelog.generic'), 105 105 ]); 106 106 107 107 return $change;
+1 -1
app/Models/ChangelogEntry.php
··· 160 160 public static function placeholder() 161 161 { 162 162 return new static([ 163 - 'title' => trans('changelog.generic'), 163 + 'title' => osu_trans('changelog.generic'), 164 164 'private' => false, 165 165 'major' => false, 166 166 'created_at' => Carbon::createFromTimestamp(0),
+3 -3
app/Models/Chat/Channel.php
··· 291 291 ->exec(); 292 292 293 293 if (count($sent) >= $limit) { 294 - throw new API\ExcessiveChatMessagesException(trans('api.error.chat.limit_exceeded')); 294 + throw new API\ExcessiveChatMessagesException(osu_trans('api.error.chat.limit_exceeded')); 295 295 } 296 296 297 297 $content = str_replace(["\r", "\n"], ' ', trim($content)); 298 298 299 299 if (mb_strlen($content, 'UTF-8') >= config('osu.chat.message_length_limit')) { 300 - throw new API\ChatMessageTooLongException(trans('api.error.chat.too_long')); 300 + throw new API\ChatMessageTooLongException(osu_trans('api.error.chat.too_long')); 301 301 } 302 302 303 303 if (!present($content)) { 304 - throw new API\ChatMessageEmptyException(trans('api.error.chat.empty')); 304 + throw new API\ChatMessageEmptyException(osu_trans('api.error.chat.empty')); 305 305 } 306 306 307 307 $chatFilters = app('chat-filters')->all();
+4 -4
app/Models/Contest.php
··· 150 150 switch ($this->state()) { 151 151 case 'preparing': 152 152 $date = $this->entry_starts_at === null 153 - ? trans('contest.dates.starts.soon') 153 + ? osu_trans('contest.dates.starts.soon') 154 154 : i18n_date($this->entry_starts_at); 155 155 156 - return trans('contest.dates.starts._', ['date' => $date]); 156 + return osu_trans('contest.dates.starts._', ['date' => $date]); 157 157 case 'entry': 158 158 return i18n_date($this->entry_starts_at).' - '.i18n_date($this->entry_ends_at); 159 159 case 'voting': 160 160 return i18n_date($this->voting_starts_at).' - '.i18n_date($this->voting_ends_at); 161 161 default: 162 162 if ($this->voting_ends_at === null) { 163 - return trans('contest.dates.ended_no_date'); 163 + return osu_trans('contest.dates.ended_no_date'); 164 164 } else { 165 - return trans('contest.dates.ended', ['date' => i18n_date($this->voting_ends_at)]); 165 + return osu_trans('contest.dates.ended', ['date' => i18n_date($this->voting_ends_at)]); 166 166 } 167 167 } 168 168 }
+1 -1
app/Models/Forum/Forum.php
··· 371 371 372 372 public function toMetaDescription() 373 373 { 374 - $stack = [trans('forum.title')]; 374 + $stack = [osu_trans('forum.title')]; 375 375 foreach ($this->forum_parents as $forumId => $forumData) { 376 376 $stack[] = $forumData[0]; 377 377 }
+2 -2
app/Models/Store/Order.php
··· 413 413 // TODO: Payment processors should set a context variable flagging the user check to be skipped. 414 414 // This is currently only fine because the Orders controller requires auth. 415 415 if ($user !== null && $this->user_id === $user->getKey() && !$this->canUserCancel()) { 416 - throw new InvariantException(trans('store.order.cancel_not_allowed')); 416 + throw new InvariantException(osu_trans('store.order.cancel_not_allowed')); 417 417 } 418 418 419 419 $this->status = 'cancelled'; ··· 465 465 466 466 // TODO: better validation handling. 467 467 if ($params['product'] === null) { 468 - return trans('model_validation/store/product.not_available'); 468 + return osu_trans('model_validation/store/product.not_available'); 469 469 } 470 470 471 471 $this->saveOrExplode();
+4 -4
app/Models/SupporterTag.php
··· 91 91 $username = $item->extra_data['username'] ?? ''; 92 92 93 93 return $html 94 - ? blade_safe(trans($transKey, [ 94 + ? blade_safe(osu_trans($transKey, [ 95 95 'duration' => e($durationText), 96 96 'name' => e($item->product->name), 97 97 'username' => link_to_user($item->extra_data['target_id'], $username), 98 - ])) : trans($transKey, [ 98 + ])) : osu_trans($transKey, [ 99 99 'duration' => $durationText, 100 100 'name' => $item->product->name, 101 101 'username' => $username, ··· 110 110 $texts = []; 111 111 112 112 if ($years > 0) { 113 - $texts[] = trans_choice('common.count.years', $years, [], $locale); 113 + $texts[] = osu_trans_choice('common.count.years', $years, [], $locale); 114 114 } 115 115 116 116 if ($months > 0) { 117 - $texts[] = trans_choice('common.count.months', $months, [], $locale); 117 + $texts[] = osu_trans_choice('common.count.months', $months, [], $locale); 118 118 } 119 119 120 120 return implode(', ', $texts);
+2 -2
app/Models/Tournament.php
··· 152 152 if ($this->info_url !== null) { 153 153 $links[] = [ 154 154 'url' => $this->info_url, 155 - 'title' => trans('tournament.show.info_page'), 155 + 'title' => osu_trans('tournament.show.info_page'), 156 156 ]; 157 157 } 158 158 159 159 if ($this->isStoreBannerAvailable()) { 160 160 $links[] = [ 161 161 'url' => route('store.products.show', $this->tournament_banner_product_id), 162 - 'title' => trans('tournament.show.banner'), 162 + 'title' => osu_trans('tournament.show.banner'), 163 163 ]; 164 164 } 165 165
+2 -2
app/Models/User.php
··· 1824 1824 if (LoginAttempt::isLocked($ip)) { 1825 1825 DatadogLoginAttempt::log('locked_ip'); 1826 1826 1827 - return trans('users.login.locked_ip'); 1827 + return osu_trans('users.login.locked_ip'); 1828 1828 } 1829 1829 1830 1830 $authError = null; ··· 1848 1848 if ($authError !== null) { 1849 1849 LoginAttempt::logAttempt($ip, $user, 'fail', $password); 1850 1850 1851 - return trans('users.login.failed'); 1851 + return osu_trans('users.login.failed'); 1852 1852 } 1853 1853 1854 1854 LoginAttempt::logLoggedIn($ip, $user);
+1 -1
app/Models/UserNotFound.php
··· 112 112 { 113 113 static $user; 114 114 if (!isset($user)) { 115 - $user = new static(['user_id' => -1, 'username' => trans('supporter_tag.user_search.not_found')]); 115 + $user = new static(['user_id' => -1, 'username' => osu_trans('supporter_tag.user_search.not_found')]); 116 116 } 117 117 118 118 return $user;
+1 -1
app/Models/Wiki/Page.php
··· 425 425 public function title($withSubtitle = false) 426 426 { 427 427 if ($this->page === null) { 428 - return trans('wiki.show.missing_title'); 428 + return osu_trans('wiki.show.missing_title'); 429 429 } 430 430 431 431 $title = presence($this->page['header']['title'] ?? null) ?? $this->defaultTitle;
+6 -6
app/Providers/AuthServiceProvider.php
··· 56 56 }); 57 57 58 58 Passport::tokensCan([ 59 - 'bot' => trans('api.scopes.bot'), 60 - 'forum.write' => trans('api.scopes.forum.write'), 61 - 'chat.write' => trans('api.scopes.chat.write'), 62 - 'friends.read' => trans('api.scopes.friends.read'), 63 - 'identify' => trans('api.scopes.identify'), 64 - 'public' => trans('api.scopes.public'), 59 + 'bot' => osu_trans('api.scopes.bot'), 60 + 'forum.write' => osu_trans('api.scopes.forum.write'), 61 + 'chat.write' => osu_trans('api.scopes.chat.write'), 62 + 'friends.read' => osu_trans('api.scopes.friends.read'), 63 + 'identify' => osu_trans('api.scopes.identify'), 64 + 'public' => osu_trans('api.scopes.public'), 65 65 ]); 66 66 } 67 67 }
+1 -1
app/Transformers/CommentableMetaTransformer.php
··· 28 28 ]; 29 29 } else { 30 30 return [ 31 - 'title' => trans('comments.commentable_name._deleted'), 31 + 'title' => osu_trans('comments.commentable_name._deleted'), 32 32 ]; 33 33 } 34 34 }
+1 -1
app/Transformers/GenreTransformer.php
··· 13 13 { 14 14 return [ 15 15 'id' => $genre->genre_id === 0 ? null : $genre->genre_id, 16 - 'name' => trans('beatmaps.genre.'.str_replace(' ', '-', strtolower($genre->name))), 16 + 'name' => osu_trans('beatmaps.genre.'.str_replace(' ', '-', strtolower($genre->name))), 17 17 ]; 18 18 } 19 19 }
+1 -1
app/Transformers/LanguageTransformer.php
··· 13 13 { 14 14 return [ 15 15 'id' => $language->language_id === 0 ? null : $language->language_id, 16 - 'name' => trans('beatmaps.language.'.str_replace(' ', '-', strtolower($language->name))), 16 + 'name' => osu_trans('beatmaps.language.'.str_replace(' ', '-', strtolower($language->name))), 17 17 ]; 18 18 } 19 19 }
-32
app/framework_helper_overrides.php
··· 12 12 13 13 return htmlspecialchars($value, ENT_QUOTES, 'UTF-8', true); 14 14 } 15 - 16 - function trans($key = null, $replace = [], $locale = null) 17 - { 18 - $translator = app('translator'); 19 - 20 - if (is_null($key)) { 21 - return $translator; 22 - } 23 - 24 - if (!trans_exists($key, $locale)) { 25 - $locale = config('app.fallback_locale'); 26 - } 27 - 28 - return $translator->get($key, $replace, $locale, false); 29 - } 30 - 31 - function trans_choice($key, $number, array $replace = [], $locale = null) 32 - { 33 - if (!trans_exists($key, $locale)) { 34 - $locale = config('app.fallback_locale'); 35 - } 36 - 37 - if (is_array($number) || $number instanceof Countable) { 38 - $number = count($number); 39 - } 40 - 41 - if (!isset($replace['count_delimited'])) { 42 - $replace['count_delimited'] = i18n_number_format($number, null, null, null, $locale); 43 - } 44 - 45 - return app('translator')->choice($key, $number, $replace, $locale); 46 - }
+45 -13
app/helpers.php
··· 427 427 return request()->attributes->get(App\Http\Middleware\AuthApi::REQUEST_OAUTH_TOKEN_KEY); 428 428 } 429 429 430 + function osu_trans($key = null, $replace = [], $locale = null) 431 + { 432 + $translator = app('translator'); 433 + 434 + if (is_null($key)) { 435 + return $translator; 436 + } 437 + 438 + if (!trans_exists($key, $locale)) { 439 + $locale = config('app.fallback_locale'); 440 + } 441 + 442 + return $translator->get($key, $replace, $locale, false); 443 + } 444 + 445 + function osu_trans_choice($key, $number, array $replace = [], $locale = null) 446 + { 447 + if (!trans_exists($key, $locale)) { 448 + $locale = config('app.fallback_locale'); 449 + } 450 + 451 + if (is_array($number) || $number instanceof Countable) { 452 + $number = count($number); 453 + } 454 + 455 + if (!isset($replace['count_delimited'])) { 456 + $replace['count_delimited'] = i18n_number_format($number, null, null, null, $locale); 457 + } 458 + 459 + return app('translator')->choice($key, $number, $replace, $locale); 460 + } 461 + 430 462 function osu_url($key) 431 463 { 432 464 $url = config("osu.urls.{$key}"); ··· 473 505 474 506 $opts = []; 475 507 for ($i = 1; $i <= $max; $i++) { 476 - $opts[$i] = trans_choice('common.count.item', $i); 508 + $opts[$i] = osu_trans_choice('common.count.item', $i); 477 509 } 478 510 479 511 // include selected value separately if it's out of range. 480 512 if ($selected > $max) { 481 - $opts[$selected] = trans_choice('common.count.item', $selected); 513 + $opts[$selected] = osu_trans_choice('common.count.item', $selected); 482 514 } 483 515 484 516 return $opts; ··· 525 557 526 558 function require_login($text_key, $link_text_key) 527 559 { 528 - $title = trans('users.anonymous.login_link'); 529 - $link = Html::link('#', trans($link_text_key), ['class' => 'js-user-link', 'title' => $title]); 530 - $text = trans($text_key, ['link' => $link]); 560 + $title = osu_trans('users.anonymous.login_link'); 561 + $link = Html::link('#', osu_trans($link_text_key), ['class' => 'js-user-link', 'title' => $title]); 562 + $text = osu_trans($text_key, ['link' => $link]); 531 563 532 564 return $text; 533 565 } ··· 567 599 case 1: 568 600 return (string) $array[0]; 569 601 case 2: 570 - return implode(trans("{$key}.two_words_connector"), $array); 602 + return implode(osu_trans("{$key}.two_words_connector"), $array); 571 603 default: 572 - return implode(trans("{$key}.words_connector"), array_slice($array, 0, -1)).trans("{$key}.last_word_connector").array_last($array); 604 + return implode(osu_trans("{$key}.words_connector"), array_slice($array, 0, -1)).osu_trans("{$key}.last_word_connector").array_last($array); 573 605 } 574 606 } 575 607 ··· 710 742 711 743 foreach ($keys as $key) { 712 744 if (trans_exists($key, $checkLocale)) { 713 - return trans($key); 745 + return osu_trans($key); 714 746 } 715 747 } 716 748 ··· 1032 1064 $formattedDate = i18n_date($user->user_regdate, null, 'year_month'); 1033 1065 1034 1066 if ($user->user_regdate < Carbon\Carbon::createFromDate(2008, 1, 1)) { 1035 - return '<div title="'.$tooltipDate.'">'.trans('users.show.first_members').'</div>'; 1067 + return '<div title="'.$tooltipDate.'">'.osu_trans('users.show.first_members').'</div>'; 1036 1068 } 1037 1069 1038 - return trans('users.show.joined_at', [ 1070 + return osu_trans('users.show.joined_at', [ 1039 1071 'date' => "<strong title='{$tooltipDate}'>{$formattedDate}</strong>", 1040 1072 ]); 1041 1073 } ··· 1049 1081 ); 1050 1082 1051 1083 if ($pattern !== null) { 1052 - $formatter->setPattern(trans("common.datetime.{$pattern}.php")); 1084 + $formatter->setPattern(osu_trans("common.datetime.{$pattern}.php")); 1053 1085 } 1054 1086 1055 1087 return $formatter->format($datetime); ··· 1619 1651 1620 1652 $basename = snake_case(get_class_basename(get_class($e))); 1621 1653 $key = "errors.search.${basename}"; 1622 - $text = trans($key); 1654 + $text = osu_trans($key); 1623 1655 1624 - return $text === $key ? trans('errors.search.default') : $text; 1656 + return $text === $key ? osu_trans('errors.search.default') : $text; 1625 1657 } 1626 1658 1627 1659 /**
+1 -1
bin/phpunit.sh
··· 4 4 5 5 export APP_URL=http://localhost 6 6 7 - exec vendor/bin/phpunit --prepend=app/framework_helper_overrides.php "$@" 7 + exec vendor/bin/phpunit "$@"
-20
bootstrap/autoload.php
··· 1 - <?php 2 - 3 - define('LARAVEL_START', microtime(true)); 4 - 5 - // fixes some laravel features. 6 - require_once __DIR__.'/../app/framework_helper_overrides.php'; 7 - 8 - /* 9 - |-------------------------------------------------------------------------- 10 - | Register The Composer Auto Loader 11 - |-------------------------------------------------------------------------- 12 - | 13 - | Composer provides a convenient, automatically generated class loader 14 - | for our application. We just need to utilize it! We'll require it 15 - | into the script here so that we do not have to worry about the 16 - | loading of any our classes "manually". Feels great to relax. 17 - | 18 - */ 19 - 20 - require __DIR__.'/../vendor/autoload.php';
+24 -26
public/index.php
··· 1 1 <?php 2 2 3 - /** 4 - * Laravel - A PHP Framework For Web Artisans. 5 - * 6 - * @author Taylor Otwell <taylor@laravel.com> 7 - */ 3 + use Illuminate\Contracts\Http\Kernel; 4 + use Illuminate\Http\Request; 5 + 6 + define('LARAVEL_START', microtime(true)); 8 7 9 8 /* 10 9 |-------------------------------------------------------------------------- 11 - | Register The Auto Loader 10 + | Check If The Application Is Under Maintenance 12 11 |-------------------------------------------------------------------------- 13 12 | 14 - | Composer provides a convenient, automatically generated class loader for 15 - | our application. We just need to utilize it! We'll simply require it 16 - | into the script here so that we don't have to worry about manual 17 - | loading any of our classes later on. It feels nice to relax. 13 + | If the application is in maintenance / demo mode via the "down" command 14 + | we will load this file so that any pre-rendered content can be shown 15 + | instead of starting the framework, which could cause an exception. 18 16 | 19 17 */ 20 18 21 - require __DIR__.'/../bootstrap/autoload.php'; 19 + if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) { 20 + require __DIR__.'/../storage/framework/maintenance.php'; 21 + } 22 22 23 23 /* 24 24 |-------------------------------------------------------------------------- 25 - | Turn On The Lights 25 + | Register The Auto Loader 26 26 |-------------------------------------------------------------------------- 27 27 | 28 - | We need to illuminate PHP development, so let us turn on the lights. 29 - | This bootstraps the framework and gets it ready for use, then it 30 - | will load up this application so that we can run it and send 31 - | the responses back to the browser and delight our users. 28 + | Composer provides a convenient, automatically generated class loader for 29 + | this application. We just need to utilize it! We'll simply require it 30 + | into the script here so we don't need to manually load our classes. 32 31 | 33 32 */ 34 33 35 - $app = require_once __DIR__.'/../bootstrap/app.php'; 34 + require __DIR__.'/../vendor/autoload.php'; 36 35 37 36 /* 38 37 |-------------------------------------------------------------------------- 39 38 | Run The Application 40 39 |-------------------------------------------------------------------------- 41 40 | 42 - | Once we have the application, we can simply call the run method, 43 - | which will execute the request and send the response back to 44 - | the client's browser allowing them to enjoy the creative 45 - | and wonderful application we have prepared for them. 41 + | Once we have the application, we can handle the incoming request using 42 + | the application's HTTP kernel. Then, we will send the response back 43 + | to this client's browser, allowing them to enjoy our application. 46 44 | 47 45 */ 48 46 49 - $kernel = $app->make('Illuminate\Contracts\Http\Kernel'); 47 + $app = require_once __DIR__.'/../bootstrap/app.php'; 50 48 51 - $response = $kernel->handle( 52 - $request = Illuminate\Http\Request::capture() 53 - ); 49 + $kernel = $app->make(Kernel::class); 54 50 55 - $response->send(); 51 + $response = tap($kernel->handle( 52 + $request = Request::capture() 53 + ))->send(); 56 54 57 55 $kernel->terminate($request, $response);
+6 -6
resources/views/accounts/_edit_email.blade.php
··· 11 11 ]) !!} 12 12 <div class="account-edit__section"> 13 13 <h2 class="account-edit__section-title"> 14 - {{ trans('accounts.edit.email.title') }} 14 + {{ osu_trans('accounts.edit.email.title') }} 15 15 </h2> 16 16 </div> 17 17 ··· 26 26 > 27 27 28 28 <div class="account-edit-entry__label"> 29 - {{ trans('accounts.edit.password.current') }} 29 + {{ osu_trans('accounts.edit.password.current') }} 30 30 </div> 31 31 32 32 <div class="account-edit-entry__error js-form-error--error"></div> ··· 42 42 > 43 43 44 44 <div class="account-edit-entry__label"> 45 - {{ trans('accounts.edit.email.new') }} 45 + {{ osu_trans('accounts.edit.email.new') }} 46 46 </div> 47 47 48 48 <div class="account-edit-entry__error js-form-error--error"></div> ··· 56 56 > 57 57 58 58 <div class="account-edit-entry__label"> 59 - {{ trans('accounts.edit.email.new_confirmation') }} 59 + {{ osu_trans('accounts.edit.email.new_confirmation') }} 60 60 </div> 61 61 62 62 <div class="account-edit-entry__error js-form-error--error"></div> ··· 65 65 66 66 <div class="account-edit__input-group"> 67 67 <div class="account-edit-entry account-edit-entry--no-label"> 68 - <button class="btn-osu-big btn-osu-big--account-edit" type="submit" data-disable-with="{{ trans('common.buttons.saving') }}"> 68 + <button class="btn-osu-big btn-osu-big--account-edit" type="submit" data-disable-with="{{ osu_trans('common.buttons.saving') }}"> 69 69 <div class="btn-osu-big__content"> 70 70 <div class="btn-osu-big__left"> 71 - {{ trans('accounts.update_email.update') }} 71 + {{ osu_trans('accounts.update_email.update') }} 72 72 </div> 73 73 74 74 <div class="btn-osu-big__icon">
+1 -1
resources/views/accounts/_edit_entry_simple.blade.php
··· 17 17 > 18 18 19 19 <div class="account-edit-entry__label"> 20 - {{ trans("accounts.edit.profile.user.{$field}") }} 20 + {{ osu_trans("accounts.edit.profile.user.{$field}") }} 21 21 </div> 22 22 23 23 @include('accounts._edit_entry_status')
+1 -1
resources/views/accounts/_edit_entry_status.blade.php
··· 8 8 </div> 9 9 10 10 <div class="account-edit-status__content account-edit-status__content--saved"> 11 - {{ trans('common.saved') }} 11 + {{ osu_trans('common.saved') }} 12 12 </div> 13 13 </div>
+8 -8
resources/views/accounts/_edit_notifications.blade.php
··· 8 8 <div class="account-edit"> 9 9 <div class="account-edit__section"> 10 10 <h2 class="account-edit__section-title"> 11 - {{ trans('accounts.notifications.title') }} 11 + {{ osu_trans('accounts.notifications.title') }} 12 12 </h2> 13 13 </div> 14 14 ··· 27 27 ]) 28 28 29 29 <span class="account-edit-entry__checkbox-label"> 30 - {{ trans('accounts.notifications.topic_auto_subscribe') }} 30 + {{ osu_trans('accounts.notifications.topic_auto_subscribe') }} 31 31 </span> 32 32 33 33 <div class="account-edit-entry__checkbox-status"> ··· 53 53 ]) 54 54 55 55 <span class="account-edit-entry__checkbox-label"> 56 - {{ trans('accounts.notifications.comment_reply') }} 56 + {{ osu_trans('accounts.notifications.comment_reply') }} 57 57 </span> 58 58 59 59 <div class="account-edit-entry__checkbox-status"> ··· 67 67 @foreach (UserNotificationOption::BEATMAPSET_DISQUALIFIABLE_NOTIFICATIONS as $notificationType) 68 68 <div class="account-edit-entry account-edit-entry--no-label"> 69 69 <div class="account-edit-entry__checkboxes-label"> 70 - {{ trans("accounts.notifications.$notificationType") }} 70 + {{ osu_trans("accounts.notifications.$notificationType") }} 71 71 </div> 72 72 <form 73 73 class="account-edit-entry__checkboxes js-account-edit" ··· 87 87 ]) 88 88 89 89 <span class="account-edit-entry__checkbox-label"> 90 - {{ trans("beatmaps.mode.{$key}") }} 90 + {{ osu_trans("beatmaps.mode.{$key}") }} 91 91 </span> 92 92 </label> 93 93 @endforeach ··· 103 103 <div class="account-edit__input-group"> 104 104 <div class="account-edit-entry"> 105 105 <div class="account-edit-entry__label account-edit-entry__label--top-pinned"> 106 - {{ trans('accounts.notifications.options._') }} 106 + {{ osu_trans('accounts.notifications.options._') }} 107 107 </div> 108 108 109 109 <form ··· 113 113 data-url="{{ route('account.notification-options') }}" 114 114 > 115 115 @foreach (UserNotificationOption::DELIVERY_MODES as $mode) 116 - <div>{{ trans("accounts.notifications.options.{$mode}") }}</div> 116 + <div>{{ osu_trans("accounts.notifications.options.{$mode}") }}</div> 117 117 @endforeach 118 118 119 119 <div>@include('accounts._edit_entry_status')</div> ··· 134 134 @endforeach 135 135 136 136 <span class="account-edit-entry__checkbox-label account-edit-entry__checkbox-label--grid"> 137 - {{ trans("accounts.notifications.options.{$name}") }} 137 + {{ osu_trans("accounts.notifications.options.{$name}") }} 138 138 </span> 139 139 @endforeach 140 140 </form>
+3 -3
resources/views/accounts/_edit_oauth.blade.php
··· 5 5 <div class="account-edit"> 6 6 <div class="account-edit__section"> 7 7 <h2 class="account-edit__section-title"> 8 - {{ trans('accounts.oauth.title') }} 8 + {{ osu_trans('accounts.oauth.title') }} 9 9 </h2> 10 10 </div> 11 11 12 12 <div class="account-edit__input-groups"> 13 13 <div class="account-edit__input-group"> 14 14 <div class="account-edit-entry"> 15 - <div class="account-edit-entry__label account-edit-entry__label--top-pinned">{{ trans('accounts.oauth.authorized_clients') }}</div> 15 + <div class="account-edit-entry__label account-edit-entry__label--top-pinned">{{ osu_trans('accounts.oauth.authorized_clients') }}</div> 16 16 <div class="account-edit__input-groups"> 17 17 <div class="js-react--authorized-clients"></div> 18 18 </div> ··· 21 21 22 22 <div class="account-edit__input-group"> 23 23 <div class="account-edit-entry"> 24 - <div class="account-edit-entry__label account-edit-entry__label--top-pinned">{{ trans('accounts.oauth.own_clients') }}</div> 24 + <div class="account-edit-entry__label account-edit-entry__label--top-pinned">{{ osu_trans('accounts.oauth.own_clients') }}</div> 25 25 <div class="account-edit__input-groups"> 26 26 <div class="js-react--own-clients"></div> 27 27 </div>
+5 -5
resources/views/accounts/_edit_options.blade.php
··· 8 8 <div class="account-edit"> 9 9 <div class="account-edit__section"> 10 10 <h2 class="account-edit__section-title"> 11 - {{ trans('accounts.options.title') }} 11 + {{ osu_trans('accounts.options.title') }} 12 12 </h2> 13 13 </div> 14 14 ··· 16 16 <div class="account-edit__input-group"> 17 17 <div class="account-edit-entry account-edit-entry--no-label"> 18 18 <div class="account-edit-entry__checkboxes-label"> 19 - {{ trans('accounts.options.beatmapset_download._') }} 19 + {{ osu_trans('accounts.options.beatmapset_download._') }} 20 20 </div> 21 21 <form 22 22 class="account-edit-entry__checkboxes account-edit-entry__checkboxes--vertical js-account-edit" ··· 43 43 ]) 44 44 45 45 <span class="account-edit-entry__checkbox-label"> 46 - {{ trans("accounts.options.beatmapset_download.{$name}") }} 46 + {{ osu_trans("accounts.options.beatmapset_download.{$name}") }} 47 47 </span> 48 48 49 49 @if (!$statusIsRendered) ··· 74 74 ]) 75 75 76 76 <span class="account-edit-entry__checkbox-label"> 77 - {{ trans('accounts.options.beatmapset_title_show_original') }} 77 + {{ osu_trans('accounts.options.beatmapset_title_show_original') }} 78 78 </span> 79 79 80 80 <div class="account-edit-entry__checkbox-status"> ··· 94 94 ]) 95 95 96 96 <span class="account-edit-entry__checkbox-label"> 97 - {{ trans('accounts.options.beatmapset_show_nsfw') }} 97 + {{ osu_trans('accounts.options.beatmapset_show_nsfw') }} 98 98 </span> 99 99 100 100 <div class="account-edit-entry__checkbox-status">
+6 -6
resources/views/accounts/_edit_password.blade.php
··· 11 11 ]) !!} 12 12 <div class="account-edit__section"> 13 13 <h2 class="account-edit__section-title"> 14 - {{ trans('accounts.edit.password.title') }} 14 + {{ osu_trans('accounts.edit.password.title') }} 15 15 </h2> 16 16 </div> 17 17 ··· 26 26 > 27 27 28 28 <div class="account-edit-entry__label"> 29 - {{ trans('accounts.edit.password.current') }} 29 + {{ osu_trans('accounts.edit.password.current') }} 30 30 </div> 31 31 32 32 <div class="account-edit-entry__error js-form-error--error"></div> ··· 43 43 > 44 44 45 45 <div class="account-edit-entry__label"> 46 - {{ trans('accounts.edit.password.new') }} 46 + {{ osu_trans('accounts.edit.password.new') }} 47 47 </div> 48 48 49 49 <div class="account-edit-entry__error js-form-error--error"></div> ··· 58 58 > 59 59 60 60 <div class="account-edit-entry__label"> 61 - {{ trans('accounts.edit.password.new_confirmation') }} 61 + {{ osu_trans('accounts.edit.password.new_confirmation') }} 62 62 </div> 63 63 64 64 <div class="account-edit-entry__error js-form-error--error"></div> ··· 67 67 68 68 <div class="account-edit__input-group"> 69 69 <div class="account-edit-entry account-edit-entry--no-label"> 70 - <button class="btn-osu-big btn-osu-big--account-edit" type="submit" data-disable-with="{{ trans('common.buttons.saving') }}"> 70 + <button class="btn-osu-big btn-osu-big--account-edit" type="submit" data-disable-with="{{ osu_trans('common.buttons.saving') }}"> 71 71 <div class="btn-osu-big__content"> 72 72 <div class="btn-osu-big__left"> 73 - {{ trans('accounts.update_password.update') }} 73 + {{ osu_trans('accounts.update_password.update') }} 74 74 </div> 75 75 76 76 <div class="btn-osu-big__icon">
+2 -2
resources/views/accounts/_edit_playstyles.blade.php
··· 5 5 <div class="account-edit"> 6 6 <div class="account-edit__section"> 7 7 <h2 class="account-edit__section-title"> 8 - {{ trans('accounts.playstyles.title') }} 8 + {{ osu_trans('accounts.playstyles.title') }} 9 9 </h2> 10 10 </div> 11 11 ··· 27 27 ]) 28 28 29 29 <span class="account-edit-entry__checkbox-label"> 30 - {{ trans("accounts.playstyles.{$key}") }} 30 + {{ osu_trans("accounts.playstyles.{$key}") }} 31 31 </span> 32 32 </label> 33 33 @endforeach
+5 -5
resources/views/accounts/_edit_privacy.blade.php
··· 5 5 <div class="account-edit"> 6 6 <div class="account-edit__section"> 7 7 <h2 class="account-edit__section-title"> 8 - {{ trans('accounts.privacy.title') }} 8 + {{ osu_trans('accounts.privacy.title') }} 9 9 </h2> 10 10 </div> 11 11 ··· 24 24 ]) 25 25 26 26 <span class="account-edit-entry__checkbox-label"> 27 - {{ trans('accounts.privacy.friends_only') }} 27 + {{ osu_trans('accounts.privacy.friends_only') }} 28 28 </span> 29 29 30 30 <div class="account-edit-entry__checkbox-status"> ··· 46 46 ]) 47 47 48 48 <span class="account-edit-entry__checkbox-label"> 49 - {{ trans('accounts.privacy.hide_online') }} 49 + {{ osu_trans('accounts.privacy.hide_online') }} 50 50 </span> 51 51 52 52 <div class="account-edit-entry__checkbox-status"> ··· 59 59 <div class="account-edit__input-group"> 60 60 <div class="account-edit-entry"> 61 61 <div class="account-edit-entry__label account-edit-entry__label--top-pinned js-account-edit-blocklist-count"> 62 - {{ trans('users.blocks.blocked_count', ['count' => count($blocks)]) }} 62 + {{ osu_trans('users.blocks.blocked_count', ['count' => count($blocks)]) }} 63 63 </div> 64 64 <div class="block-list"> 65 - <a class='block-list__toggle js-account-edit-blocklist' href='#'>{{trans('common.buttons.show')}}</a> 65 + <a class='block-list__toggle js-account-edit-blocklist' href='#'>{{osu_trans('common.buttons.show')}}</a> 66 66 <div class="block-list__content hidden"> 67 67 @foreach ($blocks as $block) 68 68 <div class="block-list-item">
+6 -6
resources/views/accounts/_edit_sessions.blade.php
··· 5 5 <div class="account-edit"> 6 6 <div class="account-edit__section"> 7 7 <h2 class="account-edit__section-title"> 8 - {{trans('accounts.security.title')}} 8 + {{osu_trans('accounts.security.title')}} 9 9 </h2> 10 10 </div> 11 11 12 12 <div class="account-edit__input-groups"> 13 13 <div class="account-edit__input-group"> 14 14 <div class="account-edit-entry"> 15 - <div class="account-edit-entry__label account-edit-entry__label--top-pinned">{{trans('accounts.security.web_sessions')}}</div> 15 + <div class="account-edit-entry__label account-edit-entry__label--top-pinned">{{osu_trans('accounts.security.web_sessions')}}</div> 16 16 <div class="user-session-list"> 17 17 @foreach ($sessions as $sessionId => $session) 18 18 <div class="user-session-list-session"> ··· 23 23 <span class="user-session-list-session__title"> 24 24 {{$session['mobile'] ? $session['device'] : $session['platform']}} ({{$session['browser']}}) 25 25 @if($currentSessionId === $sessionId) 26 - <span class="user-session-list-session__current-badge">{{trans('accounts.security.current_session')}}</span> 26 + <span class="user-session-list-session__current-badge">{{osu_trans('accounts.security.current_session')}}</span> 27 27 @endif 28 28 </span> 29 29 </div> 30 30 <div class="user-session-list-session__details"> 31 - <span class="user-session-list-session__last-active">{{trans('accounts.security.last_active')}} {!! timeago($session['last_visit']) !!}</span> 31 + <span class="user-session-list-session__last-active">{{osu_trans('accounts.security.last_active')}} {!! timeago($session['last_visit']) !!}</span> 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', [ ··· 44 44 type="button" 45 45 data-method="delete" 46 46 data-remote="1" 47 - data-confirm="{{trans('accounts.security.end_session_confirmation')}}" 47 + data-confirm="{{osu_trans('accounts.security.end_session_confirmation')}}" 48 48 data-reload-on-success="1" 49 49 data-url="{{route('account.sessions.destroy', ['session' => $sessionId])}}" 50 - >{{trans('accounts.security.end_session')}}<i class="fas fa-fw fa-sign-out-alt user-session-list-session__logout-icon"></i></button> 50 + >{{osu_trans('accounts.security.end_session')}}<i class="fas fa-fw fa-sign-out-alt user-session-list-session__logout-icon"></i></button> 51 51 </div> 52 52 </div> 53 53 @endforeach
+3 -3
resources/views/accounts/_edit_signature.blade.php
··· 10 10 ]) !!} 11 11 <div class="account-edit__section"> 12 12 <h2 class="account-edit__section-title"> 13 - {{ trans('accounts.edit.signature.title') }} 13 + {{ osu_trans('accounts.edit.signature.title') }} 14 14 </h2> 15 15 </div> 16 16 ··· 51 51 <button 52 52 class="btn-osu-big btn-osu-big--account-edit" 53 53 type="submit" 54 - data-disable-with="{{ trans('common.buttons.saving') }}" 54 + data-disable-with="{{ osu_trans('common.buttons.saving') }}" 55 55 @if (Auth::user()->isSilenced()) 56 56 disabled 57 57 @endif 58 58 > 59 59 <div class="btn-osu-big__content"> 60 60 <div class="btn-osu-big__left"> 61 - {{ trans('accounts.edit.signature.update') }} 61 + {{ osu_trans('accounts.edit.signature.update') }} 62 62 </div> 63 63 64 64 <div class="btn-osu-big__icon">
+11 -11
resources/views/accounts/edit.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('accounts.edit.title_compact')]) 5 + @extends('master', ['titlePrepend' => osu_trans('accounts.edit.title_compact')]) 6 6 7 7 @section('content') 8 8 @if (Auth::user()->isSilenced() && !Auth::user()->isRestricted()) 9 9 @include('objects._notification_banner', [ 10 10 'type' => 'alert', 11 - 'title' => trans('users.silenced_banner.title'), 12 - 'message' => trans('users.silenced_banner.message'), 11 + 'title' => osu_trans('users.silenced_banner.title'), 12 + 'message' => osu_trans('users.silenced_banner.message'), 13 13 ]) 14 14 @endif 15 15 ··· 19 19 <div class="account-edit account-edit--first"> 20 20 <div class="account-edit__section"> 21 21 <h2 class="account-edit__section-title"> 22 - {{ trans('accounts.edit.profile.title') }} 22 + {{ osu_trans('accounts.edit.profile.title') }} 23 23 </h2> 24 24 </div> 25 25 ··· 27 27 <div class="account-edit__input-group"> 28 28 <div class="account-edit-entry account-edit-entry--read-only"> 29 29 <div class="account-edit-entry__label"> 30 - {{ trans('accounts.edit.username') }} 30 + {{ osu_trans('accounts.edit.username') }} 31 31 </div> 32 32 <div class="account-edit-entry__input"> 33 33 {{ Auth::user()->username }} ··· 37 37 <a class="btn-osu-big btn-osu-big--account-edit" href="{{route('store.products.show', 'username-change')}}"> 38 38 <div class="btn-osu-big__content"> 39 39 <div class="btn-osu-big__left"> 40 - {{ trans('common.buttons.change') }} 40 + {{ osu_trans('common.buttons.change') }} 41 41 </div> 42 42 43 43 <div class="btn-osu-big__icon"> ··· 67 67 <div class="account-edit"> 68 68 <div class="account-edit__section"> 69 69 <h2 class="account-edit__section-title"> 70 - {{ trans('accounts.edit.avatar.title') }} 70 + {{ osu_trans('accounts.edit.avatar.title') }} 71 71 </h2> 72 72 </div> 73 73 ··· 79 79 80 80 <div class="account-edit-entry__drop-overlay"> 81 81 <span> 82 - {{ trans('common.dropzone.target') }} 82 + {{ osu_trans('common.dropzone.target') }} 83 83 </span> 84 84 </div> 85 85 ··· 96 96 > 97 97 <div class="btn-osu-big__content"> 98 98 <div class="btn-osu-big__left"> 99 - {{ trans('common.buttons.upload_image') }} 99 + {{ osu_trans('common.buttons.upload_image') }} 100 100 </div> 101 101 102 102 <div class="btn-osu-big__icon"> ··· 116 116 </label> 117 117 118 118 <div class="account-edit-entry__rules"> 119 - {!! trans('accounts.edit.avatar.rules', [ 119 + {!! osu_trans('accounts.edit.avatar.rules', [ 120 120 'link' => link_to( 121 121 wiki_url('Rules'), 122 - trans('accounts.edit.avatar.rules_link') 122 + osu_trans('accounts.edit.avatar.rules_link') 123 123 ) 124 124 ]) !!} 125 125 </div>
+4 -4
resources/views/accounts/verification_completed.blade.php
··· 4 4 --}} 5 5 @extends('master', [ 6 6 'blank' => true, 7 - 'titlePrepend' => trans('accounts.verification_completed.title'), 7 + 'titlePrepend' => osu_trans('accounts.verification_completed.title'), 8 8 ]) 9 9 10 10 @section('content') ··· 14 14 15 15 <div class="dialog-form__row dialog-form__row--title"> 16 16 <div class="dialog-form__logo"></div> 17 - <h1 class="dialog-form__title">{{ trans('users.verify.title') }}</h1> 17 + <h1 class="dialog-form__title">{{ osu_trans('users.verify.title') }}</h1> 18 18 </div> 19 19 20 20 <div class="dialog-form__row dialog-form__row--verification-completed"> ··· 24 24 </div> 25 25 26 26 <div class="account-verification-message__title"> 27 - {{ trans('accounts.verification_completed.title') }} 27 + {{ osu_trans('accounts.verification_completed.title') }} 28 28 </div> 29 29 30 30 <div class="account-verification-message__text"> 31 - {{ trans('accounts.verification_completed.text') }} 31 + {{ osu_trans('accounts.verification_completed.text') }} 32 32 </div> 33 33 </div> 34 34 </div>
+3 -3
resources/views/accounts/verification_invalid.blade.php
··· 4 4 --}} 5 5 @extends('master', [ 6 6 'blank' => true, 7 - 'titlePrepend' => trans('accounts.verification_invalid.title'), 7 + 'titlePrepend' => osu_trans('accounts.verification_invalid.title'), 8 8 ]) 9 9 10 10 @section('content') ··· 14 14 15 15 <div class="dialog-form__row dialog-form__row--title"> 16 16 <div class="dialog-form__logo"></div> 17 - <h1 class="dialog-form__title">{{ trans('users.verify.title') }}</h1> 17 + <h1 class="dialog-form__title">{{ osu_trans('users.verify.title') }}</h1> 18 18 </div> 19 19 20 20 <div class="dialog-form__row dialog-form__row--verification-invalid"> 21 21 <div class="account-verification-message"> 22 22 <div class="account-verification-message__title"> 23 - {{ trans('accounts.verification_invalid.title') }} 23 + {{ osu_trans('accounts.verification_invalid.title') }} 24 24 </div> 25 25 </div> 26 26 </div>
+2 -2
resources/views/admin/_header.blade.php
··· 5 5 @php 6 6 $links = [[ 7 7 'url' => route('admin.root'), 8 - 'title' => trans('layout.header.admin.root'), 8 + 'title' => osu_trans('layout.header.admin.root'), 9 9 ]]; 10 10 11 11 if (isset($title)) { 12 12 $links[] = compact('title'); 13 13 } else { 14 - $title = trans('layout.header.admin.root'); 14 + $title = osu_trans('layout.header.admin.root'); 15 15 } 16 16 @endphp 17 17 @include('layout._page_header_v4', ['params' => [
+5 -5
resources/views/admin/beatmapsets/cover.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('layout.header.admin.beatmapset_covers')]) 5 + @extends('master', ['titlePrepend' => osu_trans('layout.header.admin.beatmapset_covers')]) 6 6 7 7 @section('content') 8 8 @include('admin/_header') ··· 16 16 data-method="POST" 17 17 data-url="{{ route('admin.beatmapsets.covers.regenerate', $beatmapset->beatmapset_id) }}" 18 18 data-reload-on-success="1" 19 - data-disable-with="{{ trans('admin.beatmapsets.covers.regenerating') }}" 19 + data-disable-with="{{ osu_trans('admin.beatmapsets.covers.regenerating') }}" 20 20 > 21 21 <i class="fas fa-fw fa-sync"></i> 22 - {{trans('admin.beatmapsets.covers.regenerate')}} 22 + {{osu_trans('admin.beatmapsets.covers.regenerate')}} 23 23 </button> 24 24 <button 25 25 class="btn-osu-big btn-osu-big--rounded-thin" ··· 27 27 data-method="POST" 28 28 data-url="{{ route('admin.beatmapsets.covers.remove', $beatmapset->beatmapset_id) }}" 29 29 data-reload-on-success="1" 30 - data-disable-with="{{ trans('admin.beatmapsets.covers.removing') }}" 30 + data-disable-with="{{ osu_trans('admin.beatmapsets.covers.removing') }}" 31 31 > 32 32 <i class="fas fa-fw fa-trash"></i> 33 - {{trans('admin.beatmapsets.covers.remove')}} 33 + {{osu_trans('admin.beatmapsets.covers.remove')}} 34 34 </button> 35 35 @foreach (array_merge(['raw', 'fullsize'], $beatmapset->coverSizes()) as $size) 36 36 <h3>{{$size}}</h3>
+7 -7
resources/views/admin/beatmapsets/show.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('layout.header.admin.beatmapset')]) 5 + @extends('master', ['titlePrepend' => osu_trans('layout.header.admin.beatmapset')]) 6 6 7 7 @section('content') 8 8 @include('admin/_header') ··· 10 10 <h1>{{ $beatmapset->title }} - {{ $beatmapset->artist }}</h1> 11 11 12 12 <ul> 13 - <li>{{ trans('admin.beatmapsets.show.discussion._') }}: 13 + <li>{{ osu_trans('admin.beatmapsets.show.discussion._') }}: 14 14 @if ($beatmapset->discussion_enabled) 15 - {{ trans('admin.beatmapsets.show.discussion.active') }} 15 + {{ osu_trans('admin.beatmapsets.show.discussion.active') }} 16 16 @else 17 - {{ trans('admin.beatmapsets.show.discussion.inactive') }} 17 + {{ osu_trans('admin.beatmapsets.show.discussion.inactive') }} 18 18 / 19 19 <a 20 20 href="{{ route('admin.beatmapsets.update', [ ··· 22 22 'beatmapset[discussion_enabled]' => true, 23 23 ]) }}" 24 24 data-method="PUT" 25 - data-confirm="{{ trans('admin.beatmapsets.show.discussion.activate_confirm') }}" 26 - >{{ trans('admin.beatmapsets.show.discussion.activate') }}</a> 25 + data-confirm="{{ osu_trans('admin.beatmapsets.show.discussion.activate_confirm') }}" 26 + >{{ osu_trans('admin.beatmapsets.show.discussion.activate') }}</a> 27 27 @endif 28 28 </li> 29 - <li><a href="{{ route('admin.beatmapsets.covers', $beatmapset->beatmapset_id) }}">{{ trans('admin.beatmapsets.show.covers') }}</a></li> 29 + <li><a href="{{ route('admin.beatmapsets.covers', $beatmapset->beatmapset_id) }}">{{ osu_trans('admin.beatmapsets.show.covers') }}</a></li> 30 30 </ul> 31 31 </div> 32 32 @endsection
+1 -1
resources/views/admin/contests/index.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('layout.header.admin.contests')]) 5 + @extends('master', ['titlePrepend' => osu_trans('layout.header.admin.contests')]) 6 6 7 7 8 8 @section('content')
+1 -1
resources/views/admin/contests/show.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('layout.header.admin.contest').' / '.$contest->name]) 5 + @extends('master', ['titlePrepend' => osu_trans('layout.header.admin.contest').' / '.$contest->name]) 6 6 7 7 @section('content') 8 8 @include('objects.css-override', ['mapping' => [
+7 -7
resources/views/admin/forum/forum_covers/index.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('admin.forum.forum-covers.index.title')]) 5 + @extends('master', ['titlePrepend' => osu_trans('admin.forum.forum-covers.index.title')]) 6 6 7 7 @section('content') 8 8 @include('admin/_header') ··· 13 13 <h2> 14 14 {!! link_to( 15 15 route('forum.forums.show', $forum->forum_id), 16 - trans('admin.forum.forum-covers.index.forum-name', ['id' => $forum->forum_id, 'name' => $forum->forum_name]) 16 + osu_trans('admin.forum.forum-covers.index.forum-name', ['id' => $forum->forum_id, 'name' => $forum->forum_name]) 17 17 ) !!} 18 18 </h2> 19 19 ··· 22 22 'default-topic' => ['cover' => $forum->cover->defaultTopicCover ?? null, 'key' => 'default_topic_cover'] 23 23 ] as $type => $cover) 24 24 <div class="forum-cover-admin-item__cover"> 25 - <h3>{{ trans("admin.forum.forum-covers.index.type-title.{$type}") }}</h3> 25 + <h3>{{ osu_trans("admin.forum.forum-covers.index.type-title.{$type}") }}</h3> 26 26 27 27 @if ($cover['cover'] !== null && $cover['cover']->fileUrl() !== null) 28 28 <div class="forum-cover-admin-item__cover-image" ··· 38 38 39 39 <label> 40 40 <input name="forum_cover[{{ $cover['key'] }}][_delete]" value="1" type="checkbox" /> 41 - {{ trans('admin.forum.forum-covers.index.delete') }} 41 + {{ osu_trans('admin.forum.forum-covers.index.delete') }} 42 42 </label> 43 - <button class="btn-osu-big">{{ trans('admin.forum.forum-covers.index.submit.update') }}</button> 43 + <button class="btn-osu-big">{{ osu_trans('admin.forum.forum-covers.index.submit.update') }}</button> 44 44 {!! Form::close() !!} 45 45 @else 46 - {{ trans('admin.forum.forum-covers.index.no-cover') }} 46 + {{ osu_trans('admin.forum.forum-covers.index.no-cover') }} 47 47 48 48 {!! Form::open(['url' => route('admin.forum.forum-covers.store'), 'method' => 'POST', 'files' => true]) !!} 49 49 <input name="_method" value="POST" type="hidden" /> 50 50 <input name="forum_cover[forum_id]" value="{{ $forum->forum_id }}" type="hidden" /> 51 51 <input name="forum_cover[{{ $cover['key'] }}][cover_file]" type="file"> 52 - <button class="btn-osu-big">{{ trans('admin.forum.forum-covers.index.submit.save') }}</button> 52 + <button class="btn-osu-big">{{ osu_trans('admin.forum.forum-covers.index.submit.save') }}</button> 53 53 {!! Form::close() !!} 54 54 @endif 55 55 </div>
+1 -1
resources/views/admin/logs/index.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('admin.logs.index.title')]) 5 + @extends('master', ['titlePrepend' => osu_trans('admin.logs.index.title')]) 6 6 7 7 @section('content') 8 8 @include('admin/_header')
+6 -6
resources/views/admin/pages/root.blade.php
··· 7 7 @section('content') 8 8 @include('admin._header') 9 9 <div class="osu-page osu-page--admin"> 10 - <h2 class="title">{{ trans('admin.pages.root.sections.general') }}</h2> 10 + <h2 class="title">{{ osu_trans('admin.pages.root.sections.general') }}</h2> 11 11 <ul> 12 12 <li> 13 13 <a href="{{ route('admin.logs.index') }}"> 14 - {{ trans('admin.logs.index.title') }} 14 + {{ osu_trans('admin.logs.index.title') }} 15 15 </a> 16 16 </li> 17 17 <li> ··· 19 19 </li> 20 20 </ul> 21 21 22 - <h2 class="title">{{ trans('admin.pages.root.sections.store') }}</h2> 22 + <h2 class="title">{{ osu_trans('admin.pages.root.sections.store') }}</h2> 23 23 <ul> 24 24 <li> 25 25 <a href="{{ route('admin.store.orders.index') }}"> 26 - {{ trans('admin.store.orders.index.title') }} 26 + {{ osu_trans('admin.store.orders.index.title') }} 27 27 </a> 28 28 </li> 29 29 </ul> 30 30 31 - <h2 class="title">{{ trans('admin.pages.root.sections.forum') }}</h2> 31 + <h2 class="title">{{ osu_trans('admin.pages.root.sections.forum') }}</h2> 32 32 <ul> 33 33 <li> 34 34 <a href="{{ route('admin.forum.forum-covers.index') }}"> 35 - {{ trans('admin.forum.forum-covers.index.title') }} 35 + {{ osu_trans('admin.forum.forum-covers.index.title') }} 36 36 </a> 37 37 </li> 38 38 </ul>
+4 -4
resources/views/admin/store/orders/show.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('layout.header.admin.store_orders')]) 5 + @extends('master', ['titlePrepend' => osu_trans('layout.header.admin.store_orders')]) 6 6 7 7 @section('content') 8 8 ··· 47 47 <div> 48 48 <div class="panel panel-info"> 49 49 <div class="panel-heading"> 50 - <div class="panel-title">{{ trans("store.admin.warehouse") }}</div> 50 + <div class="panel-title">{{ osu_trans("store.admin.warehouse") }}</div> 51 51 </div> 52 52 53 53 <table class="table table-striped"> 54 54 <thead> 55 - <th>{{ trans("store.product.name") }}</th> 56 - <th>{{ trans("store.order.item.quantity") }}</th> 55 + <th>{{ osu_trans("store.product.name") }}</th> 56 + <th>{{ osu_trans("store.order.item.quantity") }}</th> 57 57 </thead> 58 58 <tbody> 59 59 @foreach ($ordersItemsQuantities as $ordersItemsQuantity)
+5 -5
resources/views/artists/index.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @extends('master', [ 6 - 'pageDescription' => trans('artist.page_description'), 6 + 'pageDescription' => osu_trans('artist.page_description'), 7 7 ]) 8 8 9 9 @section('content') 10 10 @include('layout._page_header_v4', ['params' => [ 11 11 'links' => [[ 12 - 'title' => trans('layout.header.artists.index'), 12 + 'title' => osu_trans('layout.header.artists.index'), 13 13 'url' => route('artists.index'), 14 14 ]], 15 15 'linksBreadcrumb' => true, ··· 18 18 <div class="osu-page osu-page--artists"> 19 19 <div class="page-contents page-contents--artist"> 20 20 <div class="page-contents__artist-left"> 21 - <div class="artist__description artist__description--index">{!! trans('artist.index.description') !!}</div> 21 + <div class="artist__description artist__description--index">{!! osu_trans('artist.index.description') !!}</div> 22 22 <div class="artist__index"> 23 23 @foreach ($artists as $artist) 24 24 <div class="artist__box{{$artist->visible ? '' : ' artist__box--hidden'}}"> ··· 29 29 @endif 30 30 @if($artist->hasNewTracks()) 31 31 <span class="artist__badge-wrapper"> 32 - <span class="pill-badge pill-badge--yellow pill-badge--with-shadow">{{trans('common.badges.new')}}</span> 32 + <span class="pill-badge pill-badge--yellow pill-badge--with-shadow">{{osu_trans('common.badges.new')}}</span> 33 33 </span> 34 34 @endif 35 35 </div> 36 36 <a href="{{route('artists.show', $artist)}}" class="artist__name">{{$artist->name}}</a> 37 - <div class="artist__track-count">{{trans_choice('artist.songs.count', $artist->tracks_count)}}</div> 37 + <div class="artist__track-count">{{osu_trans_choice('artist.songs.count', $artist->tracks_count)}}</div> 38 38 </div> 39 39 @endforeach 40 40 </div>
+5 -5
resources/views/artists/show.blade.php
··· 5 5 @php 6 6 $headerLinks = [ 7 7 [ 8 - 'title' => trans('layout.header.artists.index'), 8 + 'title' => osu_trans('layout.header.artists.index'), 9 9 'url' => route('artists.index'), 10 10 ], 11 11 [ ··· 41 41 <div class="page-contents page-contents--artist"> 42 42 <div class="page-contents__artist-left"> 43 43 @if (!$artist->visible) 44 - <div class="artist__admin-note">{{ trans('artist.admin.hidden') }}</div> 44 + <div class="artist__admin-note">{{ osu_trans('artist.admin.hidden') }}</div> 45 45 @endif 46 46 <div class="artist__description"> 47 47 <h1>{{ $artist->name }}</h1> ··· 60 60 @if ($album['is_new']) 61 61 <span class="artist-album__badge"> 62 62 <span class="pill-badge pill-badge--yellow pill-badge--with-shadow"> 63 - {{trans('common.badges.new')}} 63 + {{osu_trans('common.badges.new')}} 64 64 </span> 65 65 </span> 66 66 @endif ··· 77 77 <div class="artist-album"> 78 78 <div class="artist-album__header"> 79 79 <div class="artist-album__header-overlay" style="background-image: url({{$images['header_url']}});"></div> 80 - <span class="artist-album__title">{{trans('artist.songs._')}}</span> 80 + <span class="artist-album__title">{{osu_trans('artist.songs._')}}</span> 81 81 </div> 82 82 <div class="js-react--artistTracklist" data-src="singles-json-{{$artist->id}}"></div> 83 83 <script id="singles-json-{{$artist->id}}" type="application/json"> ··· 111 111 <img class="artist-sidebar-album__cover" src="{{$album['cover_url']}}"> 112 112 @if ($album['is_new']) 113 113 <span class="artist__badge-wrapper"> 114 - <span class="pill-badge pill-badge--yellow pill-badge--with-shadow">{{trans('common.badges.new')}}</span> 114 + <span class="pill-badge pill-badge--yellow pill-badge--with-shadow">{{osu_trans('common.badges.new')}}</span> 115 115 </span> 116 116 @endif 117 117 </div>
+2 -2
resources/views/beatmap_discussion_posts/_item.blade.php
··· 17 17 srcSet="{{$beatmapset->coverURL('list')}} 1x, {{$beatmapset->coverURL('list@2x')}} 2x"> 18 18 </a> 19 19 <div class="beatmap-discussion-timestamp__icon beatmapset-activities__timeline-icon-margin"> 20 - <span class="fas fa-reply" title="{{ trans('common.buttons.reply') }}"></span> 20 + <span class="fas fa-reply" title="{{ osu_trans('common.buttons.reply') }}"></span> 21 21 </div> 22 22 </div> 23 23 </div> ··· 33 33 <span class="beatmap-discussion-post__info">{!! timeago($post->created_at) !!}</span> 34 34 @if ($post->deleted_at !== null) 35 35 <span class="beatmap-discussion-post__info"> 36 - {{ trans('beatmap_discussions.item.deleted_at') }}: {!! timeago($post->deleted_at) !!} 36 + {{ osu_trans('beatmap_discussions.item.deleted_at') }}: {!! timeago($post->deleted_at) !!} 37 37 </span> 38 38 @endif 39 39 </div>
+1 -1
resources/views/beatmap_discussion_posts/index.blade.php
··· 10 10 <div class="osu-page osu-page--generic"> 11 11 <div class="beatmapset-activities"> 12 12 @if (isset($user)) 13 - <h2>{{ trans('users.beatmapset_activities.title', ['user' => $user->username]) }}</h2> 13 + <h2>{{ osu_trans('users.beatmapset_activities.title', ['user' => $user->username]) }}</h2> 14 14 @endif 15 15 16 16 <div>
+2 -2
resources/views/beatmap_discussions/_item.blade.php
··· 23 23 </a> 24 24 <div class="beatmap-discussion-timestamp__icon beatmapset-activities__timeline-icon-margin"> 25 25 <span class="beatmap-discussion-message-type beatmap-discussion-message-type--{{str_replace('_', '-', $discussion->message_type)}}"> 26 - <span class="{{$postTypeToIcon[$discussion->message_type]}}" title="{{trans("beatmaps.discussions.message_type.{$discussion->message_type}")}}"></span> 26 + <span class="{{$postTypeToIcon[$discussion->message_type]}}" title="{{osu_trans("beatmaps.discussions.message_type.{$discussion->message_type}")}}"></span> 27 27 </span> 28 28 </div> 29 29 </div> ··· 40 40 <span class="beatmap-discussion-post__info">{!! timeago($discussion->created_at) !!}</span> 41 41 @if ($discussion->deleted_at !== null) 42 42 <span class="beatmap-discussion-post__info"> 43 - {{ trans('beatmap_discussions.item.deleted_at') }}: {!! timeago($discussion->deleted_at) !!} 43 + {{ osu_trans('beatmap_discussions.item.deleted_at') }}: {!! timeago($discussion->deleted_at) !!} 44 44 </span> 45 45 @endif 46 46 </div>
+13 -13
resources/views/beatmap_discussions/index.blade.php
··· 14 14 @include('layout._page_header_v4', ['params' => ['theme' => 'beatmapsets']]) 15 15 <div class="osu-page osu-page--generic"> 16 16 <div class="beatmapset-activities"> 17 - <h3>{{ trans('beatmap_discussions.index.title') }}</h3> 17 + <h3>{{ osu_trans('beatmap_discussions.index.title') }}</h3> 18 18 19 19 <form class="simple-form simple-form--search-box"> 20 20 <h2 class="simple-form__row simple-form__row--title"> 21 - {{ trans('beatmap_discussions.index.form._') }} 21 + {{ osu_trans('beatmap_discussions.index.form._') }} 22 22 </h2> 23 23 24 24 <label class="simple-form__row"> 25 25 <div class="simple-form__label"> 26 - {{ trans('beatmap_discussions.index.form.username') }} 26 + {{ osu_trans('beatmap_discussions.index.form.username') }} 27 27 </div> 28 28 29 29 <input ··· 35 35 36 36 <div class="simple-form__row"> 37 37 <div class="simple-form__label"> 38 - {{ trans('beatmap_discussions.index.form.beatmapset_status._') }} 38 + {{ osu_trans('beatmap_discussions.index.form.beatmapset_status._') }} 39 39 </div> 40 40 <div class="simple-form__select"> 41 41 <div class="form-select form-select--simple-form"> ··· 45 45 value="{{$option}}" 46 46 {{ $option === $search['beatmapset_status'] ? "selected" : "" }} 47 47 > 48 - {{ trans("beatmap_discussions.index.form.beatmapset_status.{$option}") }} 48 + {{ osu_trans("beatmap_discussions.index.form.beatmapset_status.{$option}") }} 49 49 </option> 50 50 @endforeach 51 51 </select> ··· 55 55 56 56 <div class="simple-form__row"> 57 57 <div class="simple-form__label"> 58 - {{ trans('beatmap_discussions.index.form.mode') }} 58 + {{ osu_trans('beatmap_discussions.index.form.mode') }} 59 59 </div> 60 60 <div class="simple-form__select"> 61 61 <div class="form-select form-select--simple-form"> 62 62 <select class="form-select__input" name="mode"> 63 63 <option> 64 - {{ trans('beatmaps.mode.all') }} 64 + {{ osu_trans('beatmaps.mode.all') }} 65 65 </option> 66 66 @foreach (App\Models\Beatmap::MODES as $modeStr => $modeInt) 67 67 <option 68 68 value="{{ $modeStr }}" 69 69 {{ isset($search['mode']) && $modeStr === $search['mode'] ? "selected" : "" }} 70 70 > 71 - {{ trans("beatmaps.mode.{$modeStr}") }} 71 + {{ osu_trans("beatmaps.mode.{$modeStr}") }} 72 72 </option> 73 73 @endforeach 74 74 </select> ··· 78 78 79 79 <div class="simple-form__row"> 80 80 <div class="simple-form__label"> 81 - {{ trans('beatmap_discussions.index.form.types') }} 81 + {{ osu_trans('beatmap_discussions.index.form.types') }} 82 82 </div> 83 83 <div class="simple-form__checkboxes-inline"> 84 84 @foreach (array_keys(App\Models\BeatmapDiscussion::MESSAGE_TYPES) as $messageType) ··· 88 88 'name' => 'message_types[]', 89 89 'value' => $messageType, 90 90 ]) 91 - {{ trans("beatmaps.discussions.message_type.{$messageType}") }} 91 + {{ osu_trans("beatmaps.discussions.message_type.{$messageType}") }} 92 92 </label> 93 93 @endforeach 94 94 </div> ··· 100 100 'checked' => $search['only_unresolved'], 101 101 'name' => 'only_unresolved', 102 102 ]) 103 - {{ trans('beatmap_discussions.index.form.only_unresolved') }} 103 + {{ osu_trans('beatmap_discussions.index.form.only_unresolved') }} 104 104 </label> 105 105 </div> 106 106 ··· 111 111 'checked' => $search['with_deleted'], 112 112 'name' => 'with_deleted', 113 113 ]) 114 - {{ trans('beatmap_discussions.index.form.deleted') }} 114 + {{ osu_trans('beatmap_discussions.index.form.deleted') }} 115 115 </label> 116 116 </div> 117 117 @endif ··· 120 120 <button class="btn-osu-big btn-osu-big--rounded" type="submit"> 121 121 <span class="btn-osu-big__content"> 122 122 <span class="btn-osu-big__left"> 123 - {{ trans('common.buttons.search') }} 123 + {{ osu_trans('common.buttons.search') }} 124 124 </span> 125 125 <span class="btn-osu-big__icon btn-osu-big__icon--normal"> 126 126 <i class="fas fa-search"></i>
+2 -2
resources/views/beatmapset_activities/_user.blade.php
··· 28 28 <span class="{{$bn}}__user-text u-ellipsis-overflow">{{$user->username}}</span> 29 29 </a> 30 30 @if (!$user->isBot()) 31 - <a class="{{$bn}}__user-modding-history-link" href="{{route('users.modding.index', $user)}}" title="{{trans('beatmap_discussion_posts.item.modding_history_link')}}"> 31 + <a class="{{$bn}}__user-modding-history-link" href="{{route('users.modding.index', $user)}}" title="{{osu_trans('beatmap_discussion_posts.item.modding_history_link')}}"> 32 32 <i class='fas fa-align-left'></i> 33 33 </a> 34 34 @endif 35 35 @else 36 36 <span class="{{$bn}}__user-link"> 37 - <span class="{{$bn}}__user-text u-ellipsis-overflow">{{ trans('users.deleted') }}</span> 37 + <span class="{{$bn}}__user-text u-ellipsis-overflow">{{ osu_trans('users.deleted') }}</span> 38 38 </span> 39 39 @endif 40 40 </div>
+1 -1
resources/views/beatmapset_discussion_votes/index.blade.php
··· 10 10 <div class="osu-page osu-page--generic"> 11 11 <div class="beatmapset-activities"> 12 12 @if (isset($user)) 13 - <h2>{{ trans('users.beatmapset_activities.title', ['user' => $user->username]) }}</h2> 13 + <h2>{{ osu_trans('users.beatmapset_activities.title', ['user' => $user->username]) }}</h2> 14 14 @endif 15 15 16 16 @foreach ($votes as $vote)
+7 -7
resources/views/beatmapset_events/index.blade.php
··· 10 10 <div class="osu-layout__row osu-layout__row--page"> 11 11 <div class="beatmapset-activities"> 12 12 @if (isset($user)) 13 - <h2>{{ trans('users.beatmapset_activities.title', ['user' => $user->username]) }}</h2> 13 + <h2>{{ osu_trans('users.beatmapset_activities.title', ['user' => $user->username]) }}</h2> 14 14 @endif 15 15 16 16 <form class="simple-form simple-form--search-box"> 17 17 <h2 class="simple-form__row simple-form__row--title"> 18 - {{ trans('beatmap_discussions.index.form._') }} 18 + {{ osu_trans('beatmap_discussions.index.form._') }} 19 19 </h2> 20 20 21 21 <label class="simple-form__row"> 22 22 <div class="simple-form__label"> 23 - {{ trans('beatmap_discussions.index.form.username') }} 23 + {{ osu_trans('beatmap_discussions.index.form.username') }} 24 24 </div> 25 25 26 26 <input ··· 32 32 33 33 <div class="simple-form__row"> 34 34 <div class="simple-form__label"> 35 - {{ trans('beatmapset_events.index.form.types') }} 35 + {{ osu_trans('beatmapset_events.index.form.types') }} 36 36 </div> 37 37 <div class="simple-form__checkboxes-overflow"> 38 38 @php ··· 57 57 'type' => 'checkbox', 58 58 'value' => $type, 59 59 ]) 60 - {{ trans("beatmapset_events.type.{$type}") }} 60 + {{ osu_trans("beatmapset_events.type.{$type}") }} 61 61 </label> 62 62 </div> 63 63 @endforeach ··· 66 66 67 67 <div class="simple-form__row"> 68 68 <div class="simple-form__label"> 69 - {{ trans('beatmapset_events.index.form.period') }} 69 + {{ osu_trans('beatmapset_events.index.form.period') }} 70 70 </div> 71 71 72 72 <input ··· 96 96 <button class="btn-osu-big btn-osu-big--rounded" type="submit"> 97 97 <span class="btn-osu-big__content"> 98 98 <span class="btn-osu-big__left"> 99 - {{ trans('common.buttons.search') }} 99 + {{ osu_trans('common.buttons.search') }} 100 100 </span> 101 101 <span class="btn-osu-big__icon btn-osu-big__icon--normal"> 102 102 <i class="fas fa-search"></i>
+1 -1
resources/views/beatmapsets/discussion.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @extends('master', [ 6 - 'titlePrepend' => trans('beatmaps.discussions.show.title', [ 6 + 'titlePrepend' => osu_trans('beatmaps.discussions.show.title', [ 7 7 'title' => $beatmapset->getDisplayTitle(auth()->user()), 8 8 'mapper' => $beatmapset->user->username ?? '?', 9 9 ]),
+1 -1
resources/views/beatmapsets/index.blade.php
··· 6 6 $canAdvancedSearch = priv_check('BeatmapsetAdvancedSearch')->can(); 7 7 @endphp 8 8 @extends('master', [ 9 - 'pageDescription' => trans('beatmapsets.index.title'), 9 + 'pageDescription' => osu_trans('beatmapsets.index.title'), 10 10 ]) 11 11 12 12 @section('content')
+1 -1
resources/views/beatmapsets/show.blade.php
··· 5 5 @if (optional(Auth::user())->isAdmin()) 6 6 @php 7 7 $extraFooterLinks = [ 8 - trans('common.buttons.admin') => route('admin.beatmapsets.show', $beatmapset->getKey()), 8 + osu_trans('common.buttons.admin') => route('admin.beatmapsets.show', $beatmapset->getKey()), 9 9 ]; 10 10 @endphp 11 11 @endif
+1 -1
resources/views/changelog/index.blade.php
··· 19 19 } 20 20 } 21 21 22 - $titlePrepend = count($keys) > 0 ? trans('changelog.index.page_title._'.implode('_', array_keys($keys)), $keys) : null; 22 + $titlePrepend = count($keys) > 0 ? osu_trans('changelog.index.page_title._'.implode('_', array_keys($keys)), $keys) : null; 23 23 @endphp 24 24 @extends('master', compact('titlePrepend')) 25 25
+6 -6
resources/views/client_verifications/completed.blade.php
··· 4 4 --}} 5 5 @extends('master', [ 6 6 'blank' => true, 7 - 'titlePrepend' => trans('client_verifications.completed.title'), 7 + 'titlePrepend' => osu_trans('client_verifications.completed.title'), 8 8 ]) 9 9 10 10 @section('content') ··· 14 14 15 15 <div class="dialog-form__row dialog-form__row--title"> 16 16 <div class="dialog-form__logo"></div> 17 - <h1 class="dialog-form__title">{{ trans('client_verifications.create.title') }}</h1> 17 + <h1 class="dialog-form__title">{{ osu_trans('client_verifications.create.title') }}</h1> 18 18 </div> 19 19 20 20 <div class="dialog-form__row dialog-form__row--client-verification-completed"> ··· 24 24 </div> 25 25 26 26 <div class="account-verification-message__title"> 27 - {{ trans('client_verifications.completed.title') }} 27 + {{ osu_trans('client_verifications.completed.title') }} 28 28 </div> 29 29 </div> 30 30 </div> 31 31 32 32 <div class="dialog-form__row dialog-form__row--client-verification-completed-buttons"> 33 33 <a href="{{ route('home') }}" class="dialog-form__button"> 34 - {{ trans('client_verifications.completed.home') }} 34 + {{ osu_trans('client_verifications.completed.home') }} 35 35 </a> 36 36 37 37 <button 38 38 class="dialog-form__extra-link dialog-form__extra-link--small" 39 - data-confirm="{{ trans('users.logout_confirm') }}" 39 + data-confirm="{{ osu_trans('users.logout_confirm') }}" 40 40 data-method="DELETE" 41 41 data-remote="1" 42 42 data-url="{{ route('logout', ['redirect_home' => 1]) }}" 43 43 > 44 - {{ trans('client_verifications.completed.logout') }} 44 + {{ osu_trans('client_verifications.completed.logout') }} 45 45 </button> 46 46 </div> 47 47 </div>
+8 -8
resources/views/client_verifications/create.blade.php
··· 35 35 36 36 <div class="dialog-form__row dialog-form__row--title"> 37 37 <div class="dialog-form__logo"></div> 38 - <h1 class="dialog-form__title">{{ trans('client_verifications.create.title') }}</h1> 38 + <h1 class="dialog-form__title">{{ osu_trans('client_verifications.create.title') }}</h1> 39 39 </div> 40 40 41 41 <div class="dialog-form__row dialog-form__row--label"> 42 42 <p class="dialog-form__client-request"> 43 - {{ trans('client_verifications.create.confirm') }} 43 + {{ osu_trans('client_verifications.create.confirm') }} 44 44 </p> 45 45 </div> 46 46 47 47 <div class="dialog-form__row dialog-form__row--wrong-user"> 48 - {!! trans('common.wrong_user._', [ 48 + {!! osu_trans('common.wrong_user._', [ 49 49 'user' => e($user->username), 50 50 'logout_link' => link_to_route( 51 51 'logout', 52 - trans('common.wrong_user.logout_link'), 52 + osu_trans('common.wrong_user.logout_link'), 53 53 [], 54 54 [ 55 55 'class' => 'dialog-form__extra-link', 56 - 'data-confirm' => trans('users.logout_confirm'), 56 + 'data-confirm' => osu_trans('users.logout_confirm'), 57 57 'data-method' => 'DELETE', 58 58 'data-reload-on-success' => '1', 59 59 'data-remote' => '1', ··· 70 70 ]) !!} 71 71 <input type="hidden" name="ch" value="{{ $hash }}" /> 72 72 73 - <button class="dialog-form__button" data-disable-with="{{ trans('common.buttons.authorising') }}"> 74 - {{ trans('common.buttons.authorise') }} 73 + <button class="dialog-form__button" data-disable-with="{{ osu_trans('common.buttons.authorising') }}"> 74 + {{ osu_trans('common.buttons.authorise') }} 75 75 </button> 76 76 {!! Form::close() !!} 77 77 ··· 79 79 href="{{ route('home') }}" 80 80 class="dialog-form__button dialog-form__button--cancel" 81 81 > 82 - {{ trans('common.buttons.cancel') }} 82 + {{ osu_trans('common.buttons.cancel') }} 83 83 </a> 84 84 </div> 85 85 </div>
+1 -1
resources/views/contests/_voting-entrylist.blade.php
··· 15 15 <div class='contest__buttons'> 16 16 <a class="btn-osu-big btn-osu-big--contest-download" href="{{$contest->getExtraOptions()['beatmapset_dl']}}"> 17 17 <div class="btn-osu-big__content"> 18 - <div class="btn-osu-big__left"><span class="btn-osu-big__text-top">{{ trans('contest.entry.download') }}</span></div> 18 + <div class="btn-osu-big__left"><span class="btn-osu-big__text-top">{{ osu_trans('contest.entry.download') }}</span></div> 19 19 <span class="fas fa-download"></span> 20 20 </div> 21 21 </a>
+1 -1
resources/views/contests/base.blade.php
··· 6 6 $links = [ 7 7 [ 8 8 'url' => route('contests.index'), 9 - 'title' => trans('contest.index.nav_title'), 9 + 'title' => osu_trans('contest.index.nav_title'), 10 10 ], 11 11 [ 12 12 'url' => $contestMeta->url(),
+4 -4
resources/views/contests/enter.blade.php
··· 8 8 <div class="contest__description">{!! markdown($contestMeta->description_enter) !!}</div> 9 9 @include('contests._countdown', ['deadline' => $contestMeta->currentPhaseEndDate()]) 10 10 @if (!Auth::check()) 11 - <div class='contest__voting-notice contest__voting-notice--padding'>{{trans('contest.entry.login_required')}}</div> 11 + <div class='contest__voting-notice contest__voting-notice--padding'>{{osu_trans('contest.entry.login_required')}}</div> 12 12 @else 13 13 @if (Auth::user()->isSilenced() || Auth::user()->isRestricted()) 14 - <div class='contest__voting-notice contest__voting-notice--padding'>{{trans('contest.entry.silenced_or_restricted')}}</div> 14 + <div class='contest__voting-notice contest__voting-notice--padding'>{{osu_trans('contest.entry.silenced_or_restricted')}}</div> 15 15 @else 16 16 @if (!$contestMeta->isSubmissionOpen()) 17 17 @if ($contestMeta->entry_starts_at !== null && $contestMeta->entry_starts_at->isPast()) 18 - <div class='contest__voting-notice'>{{trans('authorization.contest.entry.over')}}</div> 18 + <div class='contest__voting-notice'>{{osu_trans('authorization.contest.entry.over')}}</div> 19 19 <div class='js-react--userContestEntry'></div> 20 20 @else 21 - <div class='contest__voting-notice contest__voting-notice--padding'>{{trans('contest.entry.preparation')}}</div> 21 + <div class='contest__voting-notice contest__voting-notice--padding'>{{osu_trans('contest.entry.preparation')}}</div> 22 22 @endif 23 23 @else 24 24 <div class='js-react--userContestEntry'></div>
+2 -2
resources/views/contests/index.blade.php
··· 7 7 8 8 @section('content') 9 9 @include('layout._page_header_v4', ['params' => [ 10 - 'links' => [['url' => route('contests.index'), 'title' => trans('contest.index.nav_title')]], 10 + 'links' => [['url' => route('contests.index'), 'title' => osu_trans('contest.index.nav_title')]], 11 11 'linksBreadcrumb' => true, 12 12 'theme' => 'contests', 13 13 ]]) ··· 16 16 <div class="contest-list"> 17 17 <div class="contest-list-legend"> 18 18 @foreach (['entry', 'voting', 'results'] as $state) 19 - <div class="contest-list-legend__item contest-list-legend__item--{{$state}}">{{trans("contest.states.$state")}}</div> 19 + <div class="contest-list-legend__item contest-list-legend__item--{{$state}}">{{osu_trans("contest.states.$state")}}</div> 20 20 @endforeach 21 21 </div> 22 22 @foreach ($contests as $contest)
+1 -1
resources/views/contests/voting.blade.php
··· 8 8 <div class="contest__description">{!! markdown($contestMeta->description_voting) !!}</div> 9 9 @include('contests._countdown', ['deadline' => $contestMeta->currentPhaseEndDate()]) 10 10 @if ($contestMeta->voting_ends_at !== null && $contestMeta->voting_ends_at->isPast()) 11 - <div class='contest__voting-notice'>{{trans('contest.voting.over')}}</div> 11 + <div class='contest__voting-notice'>{{osu_trans('contest.voting.over')}}</div> 12 12 @endif 13 13 @if (count($contests) === 1) 14 14 @include('contests._voting-entrylist', ['contest' => $contests->first()])
+4 -4
resources/views/emails/beatmapset/update_notice.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.beatmapset_update_notice.new', ['title' => $beatmapset->title]) !!} 7 + {!! osu_trans('mail.beatmapset_update_notice.new', ['title' => $beatmapset->title]) !!} 8 8 9 - {!! trans('mail.beatmapset_update_notice.visit') !!} 9 + {!! osu_trans('mail.beatmapset_update_notice.visit') !!} 10 10 {!! route('beatmapsets.discussion', $beatmapset) !!} 11 11 12 - {!! trans('mail.beatmapset_update_notice.unwatch') !!} 12 + {!! osu_trans('mail.beatmapset_update_notice.unwatch') !!} 13 13 {!! route('follows.index', ['subtype' => 'modding']) !!} 14 14 15 15 @include('emails._signature')
+4 -4
resources/views/emails/forum/new_reply.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.forum_new_reply.new', ['title' => $topic->topic_title]) !!} 7 + {!! osu_trans('mail.forum_new_reply.new', ['title' => $topic->topic_title]) !!} 8 8 9 - {!! trans('mail.forum_new_reply.visit') !!} 9 + {!! osu_trans('mail.forum_new_reply.visit') !!} 10 10 {!! post_url($topic->topic_id, 'unread', false) !!} 11 11 12 - {!! trans('mail.forum_new_reply.unwatch') !!} 12 + {!! osu_trans('mail.forum_new_reply.unwatch') !!} 13 13 {!! route('follows.index', ['subtype' => 'forum_topic']) !!} 14 14 15 15 @include('emails._signature')
+4 -4
resources/views/emails/password_reset.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.password_reset.requested') !!} 7 + {!! osu_trans('mail.password_reset.requested') !!} 8 8 9 - {!! trans('mail.password_reset.code') !!} {{ $key }} 9 + {!! osu_trans('mail.password_reset.code') !!} {{ $key }} 10 10 11 - {!! trans('mail.common.report') !!} 11 + {!! osu_trans('mail.common.report') !!} 12 12 13 13 @include('emails._signature')
+11 -11
resources/views/emails/store/donation_thanks.blade.php
··· 21 21 && trans_exists('mail.donation_thanks.support.first', app()->getLocale()) 22 22 ) 23 23 24 - {!! trans('mail.donation_thanks.translation') !!} 24 + {!! osu_trans('mail.donation_thanks.translation') !!} 25 25 26 26 ============================== 27 27 28 - {!! trans('mail.common.hello', ['user' => $donor->username]) !!} 28 + {!! osu_trans('mail.common.hello', ['user' => $donor->username]) !!} 29 29 30 - {!! trans('mail.donation_thanks.support._', [ 31 - 'support' => trans('mail.donation_thanks.support.'.($continued ? 'repeat' : 'first')), 30 + {!! osu_trans('mail.donation_thanks.support._', [ 31 + 'support' => osu_trans('mail.donation_thanks.support.'.($continued ? 'repeat' : 'first')), 32 32 ]) !!} 33 - {!! trans('mail.donation_thanks.keep_free') !!} 34 - {!! trans('mail.donation_thanks.benefit.'.($isGift ? 'gift' : 'self'), [ 33 + {!! osu_trans('mail.donation_thanks.keep_free') !!} 34 + {!! osu_trans('mail.donation_thanks.benefit.'.($isGift ? 'gift' : 'self'), [ 35 35 'duration' => \App\Models\SupporterTag::getDurationText($duration), 36 36 ]) !!} 37 - {!! trans('mail.donation_thanks.benefit_more') !!} 37 + {!! osu_trans('mail.donation_thanks.benefit_more') !!} 38 38 39 - {!! trans('mail.donation_thanks.keep_running', [ 40 - 'minutes' => trans_choice('common.count.minutes', $minutes), 39 + {!! osu_trans('mail.donation_thanks.keep_running', [ 40 + 'minutes' => osu_trans_choice('common.count.minutes', $minutes), 41 41 ]) !!} 42 42 43 - {!! trans('mail.donation_thanks.feedback') !!} 43 + {!! osu_trans('mail.donation_thanks.feedback') !!} 44 44 45 - {!! trans('mail.common.closing') !!} 45 + {!! osu_trans('mail.common.closing') !!} 46 46 Dean Herbert (peppy) 47 47 @endif
+8 -8
resources/views/emails/store/payment_completed.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 6 - {!! trans('mail.common.hello', ['user' => $order->user->username]) !!} 6 + {!! osu_trans('mail.common.hello', ['user' => $order->user->username]) !!} 7 7 8 - {!! trans('mail.store_payment_completed.thank_you') !!} 8 + {!! osu_trans('mail.store_payment_completed.thank_you') !!} 9 9 10 10 @foreach ($order->items as $item) 11 11 {!! i18n_number_format($item->quantity) !!} x {!! $item->getDisplayName(false) !!} ({!! currency($item->subtotal()) !!}) 12 12 @endforeach 13 13 14 14 @if ($order->shipping > 0) 15 - {!! trans('mail.store_payment_completed.shipping') !!} ({{ currency($order->shipping) }}) 15 + {!! osu_trans('mail.store_payment_completed.shipping') !!} ({{ currency($order->shipping) }}) 16 16 @endif 17 - {!! trans('mail.store_payment_completed.total') !!} ({{ currency($order->getTotal()) }}) 17 + {!! osu_trans('mail.store_payment_completed.total') !!} ({{ currency($order->getTotal()) }}) 18 18 19 19 @if ($order->requiresShipping()) 20 - {!! trans('mail.store_payment_completed.prepare_shipping') !!} 20 + {!! osu_trans('mail.store_payment_completed.prepare_shipping') !!} 21 21 @else 22 - {!! trans('mail.store_payment_completed.processing') !!} 22 + {!! osu_trans('mail.store_payment_completed.processing') !!} 23 23 @endif 24 24 {!! route('store.invoice.show', $order) !!} 25 25 26 - {!! trans('mail.store_payment_completed.questions') !!} 26 + {!! osu_trans('mail.store_payment_completed.questions') !!} 27 27 28 - {!! trans('mail.common.closing') !!} 28 + {!! osu_trans('mail.common.closing') !!} 29 29 The osu!store team
+7 -7
resources/views/emails/store/supporter_gift.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $giftee->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $giftee->username]) !!} 6 6 7 - {!! trans('mail.supporter_gift.gifted') !!} 8 - {!! trans('mail.supporter_gift.duration', ['duration' => \App\Models\SupporterTag::getDurationText($duration)]) !!} 9 - {!! trans('mail.supporter_gift.features') !!} 7 + {!! osu_trans('mail.supporter_gift.gifted') !!} 8 + {!! osu_trans('mail.supporter_gift.duration', ['duration' => \App\Models\SupporterTag::getDurationText($duration)]) !!} 9 + {!! osu_trans('mail.supporter_gift.features') !!} 10 10 {!! route('support-the-game') !!} 11 - {!! trans('mail.supporter_gift.anonymous_gift') !!} 12 - {!! trans('mail.supporter_gift.anonymous_gift_maybe_not') !!} 11 + {!! osu_trans('mail.supporter_gift.anonymous_gift') !!} 12 + {!! osu_trans('mail.supporter_gift.anonymous_gift_maybe_not') !!} 13 13 14 - {!! trans('mail.common.closing') !!} 14 + {!! osu_trans('mail.common.closing') !!} 15 15 osu! Management
+5 -5
resources/views/emails/user_email_updated.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.user_email_updated.changed_to', ['email' => $user->user_email]) !!} 8 - {!! trans('mail.user_email_updated.sent') !!} 9 - {!! trans('mail.user_email_updated.check') !!} 7 + {!! osu_trans('mail.user_email_updated.changed_to', ['email' => $user->user_email]) !!} 8 + {!! osu_trans('mail.user_email_updated.sent') !!} 9 + {!! osu_trans('mail.user_email_updated.check') !!} 10 10 11 - {!! trans('mail.common.report') !!} 11 + {!! osu_trans('mail.common.report') !!} 12 12 13 13 @include('emails._signature')
+4 -4
resources/views/emails/user_force_reactivation.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.user_force_reactivation.main') !!} 7 + {!! osu_trans('mail.user_force_reactivation.main') !!} 8 8 9 - {!! trans('mail.user_force_reactivation.reason') !!} {!! trans("users.force_reactivation.reason.{$reason}") !!} 9 + {!! osu_trans('mail.user_force_reactivation.reason') !!} {!! osu_trans("users.force_reactivation.reason.{$reason}") !!} 10 10 11 - {!! trans('mail.user_force_reactivation.perform_reset', ['url' => route('password-reset')]) !!} 11 + {!! osu_trans('mail.user_force_reactivation.perform_reset', ['url' => route('password-reset')]) !!} 12 12 13 13 @include('emails._signature')
+3 -3
resources/views/emails/user_notification_digest.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.user_notification_digest.new') !!} 7 + {!! osu_trans('mail.user_notification_digest.new') !!} 8 8 9 9 @foreach ($groups as $group) 10 10 {!! $group['text'] !!}: ··· 14 14 15 15 @endforeach 16 16 17 - {!! trans('mail.user_notification_digest.settings') !!} 17 + {!! osu_trans('mail.user_notification_digest.settings') !!} 18 18 {!! route('account.edit') !!}#notifications 19 19 20 20 @include('emails._signature')
+3 -3
resources/views/emails/user_password_updated.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.user_password_updated.confirmation') !!} 7 + {!! osu_trans('mail.user_password_updated.confirmation') !!} 8 8 9 - {!! trans('mail.common.report') !!} 9 + {!! osu_trans('mail.common.report') !!} 10 10 11 11 @include('emails._signature')
+7 -7
resources/views/emails/user_verification.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - {!! trans('mail.common.hello', ['user' => $user->username]) !!} 5 + {!! osu_trans('mail.common.hello', ['user' => $user->username]) !!} 6 6 7 - {!! trans('mail.user_verification.action_from._', [ 8 - 'country' => $requestCountry ?? trans('mail.user_verification.action_from.unknown_country'), 7 + {!! osu_trans('mail.user_verification.action_from._', [ 8 + 'country' => $requestCountry ?? osu_trans('mail.user_verification.action_from.unknown_country'), 9 9 ]) !!} 10 10 11 - {!! trans('mail.user_verification.code') !!} {{ $keys['main'] }} 12 - {!! trans('mail.user_verification.code_hint') !!} 11 + {!! osu_trans('mail.user_verification.code') !!} {{ $keys['main'] }} 12 + {!! osu_trans('mail.user_verification.code_hint') !!} 13 13 14 - {!! trans('mail.user_verification.link') !!} 14 + {!! osu_trans('mail.user_verification.link') !!} 15 15 16 16 {{ route('account.verify', ['key' => $keys['link']]) }} 17 17 18 - {!! trans('mail.user_verification.report') !!} 18 + {!! osu_trans('mail.user_verification.report') !!} 19 19 20 20 @include('emails._signature')
+1 -1
resources/views/follows/_subtypes.blade.php
··· 8 8 href="{{ route('follows.index', ['subtype' => $menuSubtype]) }}" 9 9 class="page-tabs__tab {{ $subtype === $menuSubtype ? 'page-tabs__tab--active' : '' }}" 10 10 > 11 - {{ trans("follows.{$menuSubtype}.title") }} 11 + {{ osu_trans("follows.{$menuSubtype}.title") }} 12 12 </a> 13 13 @endforeach 14 14 </div>
+1 -1
resources/views/follows/comment.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('follows.comment.page_title')]) 5 + @extends('master', ['titlePrepend' => osu_trans('follows.comment.page_title')]) 6 6 7 7 @section('content') 8 8 <div class="js-react--follows-comment osu-layout osu-layout--full"></div>
+3 -3
resources/views/follows/forum_topic.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('forum.topic_watches.index.title_compact')]) 5 + @extends('master', ['titlePrepend' => osu_trans('forum.topic_watches.index.title_compact')]) 6 6 7 7 @section('content') 8 8 @include('home._user_header_default', ['themeOverride' => 'settings']) ··· 13 13 <div class="grid-items"> 14 14 <div class="counter-box counter-box--info"> 15 15 <div class="counter-box__title"> 16 - {{ trans('forum.topic_watches.index.box.total') }} 16 + {{ osu_trans('forum.topic_watches.index.box.total') }} 17 17 </div> 18 18 <div class="counter-box__count"> 19 19 {{ i18n_number_format($counts['total']) }} ··· 22 22 23 23 <div class="counter-box counter-box--info"> 24 24 <div class="counter-box__title"> 25 - {{ trans('forum.topic_watches.index.box.unread') }} 25 + {{ osu_trans('forum.topic_watches.index.box.unread') }} 26 26 </div> 27 27 <div class="counter-box__count"> 28 28 {{ i18n_number_format($counts['unread']) }}
+5 -5
resources/views/follows/forum_topic/_topic_buttons.blade.php
··· 8 8 href="#" 9 9 data-remote="1" 10 10 data-method="POST" 11 - data-confirm="{{ trans('forum.topic_watches.topic_buttons.mark_read.confirmation') }}" 12 - title="{{ trans('forum.topic_watches.topic_buttons.mark_read.title') }}" 11 + data-confirm="{{ osu_trans('forum.topic_watches.topic_buttons.mark_read.confirmation') }}" 12 + title="{{ osu_trans('forum.topic_watches.topic_buttons.mark_read.title') }}" 13 13 > 14 14 <i class="fas fa-check"></i> 15 15 </a> ··· 21 21 <button 22 22 type="button" 23 23 class="btn-circle btn-circle--topic-entry {{ $watch->mail ? 'btn-circle--activated' : '' }}" 24 - title="{{ trans('forum.topics.watch.'.($watch->mail ? 'tooltip_mail_disable' : 'tooltip_mail_enable')) }}" 24 + title="{{ osu_trans('forum.topics.watch.'.($watch->mail ? 'tooltip_mail_disable' : 'tooltip_mail_enable')) }}" 25 25 data-url="{{ route('forum.topic-watches.update', [ 26 26 $topic, 27 27 'state' => $watch->mail ? 'watching' : 'watching_mail', ··· 39 39 <button 40 40 type="button" 41 41 class="btn-circle btn-circle--topic-entry" 42 - title="{{ trans('forum.topic_watches.topic_buttons.remove.title') }}" 42 + title="{{ osu_trans('forum.topic_watches.topic_buttons.remove.title') }}" 43 43 data-url="{{ route('forum.topic-watches.update', [ 44 44 $topic, 45 45 'state' => 'not_watching', ··· 48 48 data-remote="1" 49 49 data-reload-on-success="1" 50 50 data-method="PUT" 51 - data-confirm="{{ trans('forum.topic_watches.topic_buttons.remove.confirmation') }}" 51 + data-confirm="{{ osu_trans('forum.topic_watches.topic_buttons.remove.confirmation') }}" 52 52 > 53 53 <span class="btn-circle__content"> 54 54 <i class="fas fa-trash"></i>
+1 -1
resources/views/follows/mapping.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('follows.mapping.page_title')]) 5 + @extends('master', ['titlePrepend' => osu_trans('follows.mapping.page_title')]) 6 6 7 7 @section('content') 8 8 <div class="js-react--follows-mapping osu-layout osu-layout--full"></div>
+12 -12
resources/views/follows/modding.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('beatmapset_watches.index.title_compact')]) 5 + @extends('master', ['titlePrepend' => osu_trans('beatmapset_watches.index.title_compact')]) 6 6 7 7 @section('content') 8 8 @include('home._user_header_default', ['themeOverride' => 'settings']) ··· 13 13 <div class="grid-items"> 14 14 <div class="counter-box counter-box--info"> 15 15 <div class="counter-box__title"> 16 - {{ trans('beatmapset_watches.index.counts.total') }} 16 + {{ osu_trans('beatmapset_watches.index.counts.total') }} 17 17 </div> 18 18 <div class="counter-box__count"> 19 19 {{ i18n_number_format($totalCount) }} ··· 22 22 23 23 <div class="counter-box counter-box--info"> 24 24 <div class="counter-box__title"> 25 - {{ trans('beatmapset_watches.index.counts.unread') }} 25 + {{ osu_trans('beatmapset_watches.index.counts.unread') }} 26 26 </div> 27 27 <div class="counter-box__count"> 28 28 {{ i18n_number_format($unreadCount) }} ··· 32 32 33 33 <div class="beatmapset-watches"> 34 34 <div class="beatmapset-watches__description"> 35 - {{ trans('beatmapset_watches.index.description') }} 35 + {{ osu_trans('beatmapset_watches.index.description') }} 36 36 </div> 37 37 38 38 <div class="beatmapset-watches__table-container"> ··· 40 40 <tr class="beatmapset-watches__row"> 41 41 <th class="beatmapset-watches__heading"></th> 42 42 <th class="beatmapset-watches__heading"> 43 - {{ trans('beatmapset_watches.index.table.title') }} 43 + {{ osu_trans('beatmapset_watches.index.table.title') }} 44 44 </th> 45 45 <th class="beatmapset-watches__heading"> 46 - {{ trans('beatmapset_watches.index.table.state') }} 46 + {{ osu_trans('beatmapset_watches.index.table.state') }} 47 47 </th> 48 48 <th class="beatmapset-watches__heading"> 49 - {{ trans('beatmapset_watches.index.table.open_issues') }} 49 + {{ osu_trans('beatmapset_watches.index.table.open_issues') }} 50 50 </th> 51 51 <th class="beatmapset-watches__heading"> 52 - {{ trans('beatmapset_watches.index.table.last_update') }} 52 + {{ osu_trans('beatmapset_watches.index.table.last_update') }} 53 53 </th> 54 54 <th class="beatmapset-watches__heading"></th> 55 55 </tr> ··· 78 78 </td> 79 79 80 80 <td class="beatmapset-watches__col"> 81 - {{ trans("beatmapsets.show.status.{$watch->beatmapset->status()}") }} 81 + {{ osu_trans("beatmapsets.show.status.{$watch->beatmapset->status()}") }} 82 82 </td> 83 83 84 84 <td class="beatmapset-watches__col"> ··· 100 100 data-method="DELETE" 101 101 data-url="{{ route('beatmapsets.watches.destroy', $watch->beatmapset) }}" 102 102 data-reload-on-success="1" 103 - data-confirm="{{ trans('common.confirmation') }}" 104 - title="{{ trans('common.buttons.watch.to_0') }}" 103 + data-confirm="{{ osu_trans('common.confirmation') }}" 104 + title="{{ osu_trans('common.buttons.watch.to_0') }}" 105 105 > 106 106 <i class="fas fa-eye-slash"></i> 107 107 </button> ··· 111 111 @else 112 112 <tr> 113 113 <td colspan="6"> 114 - {{ trans('beatmapset_watches.index.table.empty') }} 114 + {{ osu_trans('beatmapset_watches.index.table.empty') }} 115 115 </td> 116 116 </tr> 117 117 @endif
+2 -2
resources/views/forum/_header.blade.php
··· 9 9 if ($isIndex) { 10 10 $links = [ 11 11 [ 12 - 'title' => trans('forum.forums.index.title'), 12 + 'title' => osu_trans('forum.forums.index.title'), 13 13 'url' => route('forum.forums.index'), 14 14 ] 15 15 ]; 16 16 } else { 17 17 $links = []; 18 18 $links[] = [ 19 - 'title' => trans('forum.title'), 19 + 'title' => osu_trans('forum.title'), 20 20 'url' => route('forum.forums.index'), 21 21 ]; 22 22
+15 -15
resources/views/forum/_post_toolbar.blade.php
··· 12 12 > 13 13 <button 14 14 class="btn-circle btn-circle--bbcode js-bbcode-btn--bold" 15 - title="{{ trans("bbcode.bold") }}" 15 + title="{{ osu_trans("bbcode.bold") }}" 16 16 type="button" 17 17 > 18 18 <span class="btn-circle__content"> ··· 22 22 23 23 <button 24 24 class="btn-circle btn-circle--bbcode js-bbcode-btn--italic" 25 - title="{{ trans("bbcode.italic") }}" 25 + title="{{ osu_trans("bbcode.italic") }}" 26 26 type="button" 27 27 > 28 28 <span class="btn-circle__content"> ··· 32 32 33 33 <button 34 34 class="btn-circle btn-circle--bbcode js-bbcode-btn--strikethrough" 35 - title="{{ trans("bbcode.strikethrough") }}" 35 + title="{{ osu_trans("bbcode.strikethrough") }}" 36 36 type="button" 37 37 > 38 38 <span class="btn-circle__content"> ··· 42 42 43 43 <button 44 44 class="btn-circle btn-circle--bbcode js-bbcode-btn--heading" 45 - title="{{ trans("bbcode.heading") }}" 45 + title="{{ osu_trans("bbcode.heading") }}" 46 46 type="button" 47 47 > 48 48 <span class="btn-circle__content"> ··· 52 52 53 53 <button 54 54 class="btn-circle btn-circle--bbcode js-bbcode-btn--link" 55 - title="{{ trans("bbcode.link") }}" 55 + title="{{ osu_trans("bbcode.link") }}" 56 56 type="button" 57 57 > 58 58 <span class="btn-circle__content"> ··· 62 62 63 63 <button 64 64 class="btn-circle btn-circle--bbcode js-bbcode-btn--spoilerbox" 65 - title="{{ trans("bbcode.spoilerbox") }}" 65 + title="{{ osu_trans("bbcode.spoilerbox") }}" 66 66 type="button" 67 67 > 68 68 <i class="fas fa-barcode"></i> ··· 70 70 71 71 <button 72 72 class="btn-circle btn-circle--bbcode js-bbcode-btn--list-numbered" 73 - title="{{ trans("bbcode.list_numbered") }}" 73 + title="{{ osu_trans("bbcode.list_numbered") }}" 74 74 type="button" 75 75 > 76 76 <span class="btn-circle__content"> ··· 80 80 81 81 <button 82 82 class="btn-circle btn-circle--bbcode js-bbcode-btn--list" 83 - title="{{ trans("bbcode.list") }}" 83 + title="{{ osu_trans("bbcode.list") }}" 84 84 type="button" 85 85 > 86 86 <span class="btn-circle__content"> ··· 90 90 91 91 <button 92 92 class="btn-circle btn-circle--bbcode js-bbcode-btn--image" 93 - title="{{ trans("bbcode.image") }}" 93 + title="{{ osu_trans("bbcode.image") }}" 94 94 type="button" 95 95 > 96 96 <span class="btn-circle__content"> ··· 98 98 </span> 99 99 </button> 100 100 101 - <label class="bbcode-size-select" title="{{ trans("bbcode.size._") }}"> 101 + <label class="bbcode-size-select" title="{{ osu_trans("bbcode.size._") }}"> 102 102 <span class="bbcode-size-select__label"> 103 - {{ trans("bbcode.size._") }} 103 + {{ osu_trans("bbcode.size._") }} 104 104 </span> 105 105 <i class="fas fa-chevron-down"></i> 106 106 107 107 <select class="bbcode-size-select__select js-bbcode-btn--size"> 108 - <option value="50">{{ trans("bbcode.size.tiny") }}</option> 109 - <option value="85">{{ trans("bbcode.size.small") }}</option> 110 - <option value="100" selected>{{ trans("bbcode.size.normal") }}</option> 111 - <option value="150">{{ trans("bbcode.size.large") }}</option> 108 + <option value="50">{{ osu_trans("bbcode.size.tiny") }}</option> 109 + <option value="85">{{ osu_trans("bbcode.size.small") }}</option> 110 + <option value="100" selected>{{ osu_trans("bbcode.size.normal") }}</option> 111 + <option value="150">{{ osu_trans("bbcode.size.large") }}</option> 112 112 </select> 113 113 </label> 114 114 </div>
+3 -3
resources/views/forum/forums/_forum.blade.php
··· 29 29 <div class="forum-item__latest-post"> 30 30 @if (($lastTopic = $lastTopics[$forum->getKey()] ?? null) !== null) 31 31 <span class="forum-item__latest-post-label"> 32 - {{ trans('forum.forums.latest_post') }} 32 + {{ osu_trans('forum.forums.latest_post') }} 33 33 </span> 34 34 <a 35 35 class="u-ellipsis-overflow" 36 36 href="{{ post_url($lastTopic->topic_id, "unread", false) }}" 37 37 > 38 38 @if ($lastTopic->topic_replies > 0) 39 - {{ trans('forum.topic.reply_title_prefix') }}: 39 + {{ osu_trans('forum.topic.reply_title_prefix') }}: 40 40 @endif 41 41 {{ $lastTopic->topic_title }} 42 42 </a> 43 43 44 44 <div> 45 - {!! trans("forum.topic.latest_post", [ 45 + {!! osu_trans("forum.topic.latest_post", [ 46 46 "when" => timeago($lastTopic->topic_last_post_time), 47 47 "user" => link_to_user( 48 48 $lastTopic->topic_last_poster_id,
+2 -2
resources/views/forum/forums/_mark_as_read.blade.php
··· 10 10 11 11 <button 12 12 class="{{ $blockClass }}" 13 - data-disable-with="{{ trans('forum.mark_as_read.busy') }}" 13 + data-disable-with="{{ osu_trans('forum.mark_as_read.busy') }}" 14 14 data-method="POST" 15 15 data-remote="1" 16 16 data-url="{{ route('forum.forums.mark-as-read', ['forum_id' => optional($forum)->getKey(), 'recursive' => $recursive]) }}" ··· 18 18 disabled 19 19 @endif 20 20 > 21 - {{ $forum === null ? trans('forum.mark_as_read.forums') : trans('forum.mark_as_read.forum') }} 21 + {{ $forum === null ? osu_trans('forum.mark_as_read.forums') : osu_trans('forum.mark_as_read.forum') }} 22 22 </button>
+2 -2
resources/views/forum/forums/_new_topic.blade.php
··· 15 15 ]; 16 16 if (!auth()->check()) { 17 17 $icon = 'fas fa-sign-in-alt'; 18 - $text = trans('forum.topic.new_topic_login'); 18 + $text = osu_trans('forum.topic.new_topic_login'); 19 19 } 20 20 } else { 21 21 $element = 'span'; ··· 34 34 @if ($withIcon ?? true) 35 35 <i class="{{ $icon ?? 'fas fa-plus' }}"></i> 36 36 @endif 37 - {{ $text ?? trans('forum.topic.new_topic') }} 37 + {{ $text ?? osu_trans('forum.topic.new_topic') }} 38 38 </{!! $element !!}>
+8 -8
resources/views/forum/forums/_topic.blade.php
··· 19 19 20 20 <div class="forum-topic-entry__col forum-topic-entry__col--icon"> 21 21 @if (isset($topicReplyStatus[$topic->getKey()])) 22 - <span class="forum-topic-entry__replied" title="{{ trans('forum.topic.has_replied') }}"></span> 22 + <span class="forum-topic-entry__replied" title="{{ osu_trans('forum.topic.has_replied') }}"></span> 23 23 @endif 24 24 25 25 <a ··· 62 62 <div> 63 63 @if ($includeForumName ?? false) 64 64 <span class="forum-topic-entry__detail"> 65 - {!! trans('forum.topic.in_forum', [ 65 + {!! osu_trans('forum.topic.in_forum', [ 66 66 'forum' => link_to( 67 67 route('forum.forums.show', $topic->forum), 68 68 $topic->forum->forum_name ··· 72 72 @endif 73 73 74 74 <span class="forum-topic-entry__detail"> 75 - {!! trans('forum.topic.started_by', [ 75 + {!! osu_trans('forum.topic.started_by', [ 76 76 'user' => tag('span', [ 77 77 'class' => 'forum-topic-entry__user-icon', 78 78 'style' => user_color_style($topic->topic_first_poster_colour, 'background-color'), ··· 104 104 hidden-xs 105 105 "> 106 106 <div> 107 - {!! trans_choice( 107 + {!! osu_trans_choice( 108 108 'common.count.post', 109 109 $topic->topic_replies + 1, 110 110 ['count_delimited' => tag('strong', ['class' => 'forum-topic-entry__count'], e(i18n_number_format($topic->topic_replies + 1)))] ··· 112 112 </div> 113 113 114 114 <div> 115 - {!! trans_choice( 115 + {!! osu_trans_choice( 116 116 'common.count.view', 117 117 $topic->topic_views, 118 118 ['count_delimited' => tag('strong', ['class' => 'forum-topic-entry__count'], e(i18n_number_format($topic->topic_views)))] ··· 121 121 122 122 @if ($topic->isFeatureTopic()) 123 123 <div> 124 - {!! trans_choice( 124 + {!! osu_trans_choice( 125 125 'common.count.star_priority', 126 126 $topic->osu_starpriority, 127 127 ['count_delimited' => tag('strong', ['class' => 'forum-topic-entry__count'], e(i18n_number_format($topic->osu_starpriority)))] ··· 132 132 133 133 <div class="forum-topic-entry__content forum-topic-entry__content--right"> 134 134 <div class="u-ellipsis-overflow"> 135 - {!! trans( 135 + {!! osu_trans( 136 136 $topic->topic_replies === 0 ? 'forum.topic.started_by_verbose' : 'forum.topic.latest_reply_by', 137 137 ['user' => link_to_user( 138 138 $topic->topic_last_poster_id, ··· 152 152 <a 153 153 class="forum-topic-entry__col forum-topic-entry__col--last-link" 154 154 href="{{ post_url($topic->topic_id, "unread", false) }}" 155 - title="{{ trans("forum.topic.go_to_latest") }}" 155 + title="{{ osu_trans("forum.topic.go_to_latest") }}" 156 156 > 157 157 <i class="fas fa-chevron-right"></i> 158 158 </a>
+1 -1
resources/views/forum/forums/_topics.blade.php
··· 4 4 --}} 5 5 @if (count($topics) === 0) 6 6 <li class="forum-topic-entry"> 7 - {{ trans('forum.forums.topics.empty') }} 7 + {{ osu_trans('forum.forums.topics.empty') }} 8 8 </li> 9 9 @else 10 10 @foreach($topics as $topic)
+3 -3
resources/views/forum/forums/_topics_sort.blade.php
··· 8 8 if (optional($forum ?? null)->isFeatureForum()) { 9 9 $menu['feature-votes'] = [ 10 10 'url' => route('forum.forums.show', ['forum' => $forum, 'sort' => 'feature-votes']), 11 - 'title' => trans('sort.forum_topics.feature_votes'), 11 + 'title' => osu_trans('sort.forum_topics.feature_votes'), 12 12 ]; 13 13 } 14 14 @endphp ··· 16 16 @php 17 17 $defaultMenu = ['new' => [ 18 18 'url' => route('forum.forums.show', ['forum' => $forum]), 19 - 'title' => trans('sort.forum_topics.new'), 19 + 'title' => osu_trans('sort.forum_topics.new'), 20 20 ]]; 21 21 22 22 if (!isset($sort) || !isset($menu[$sort])) { ··· 25 25 @endphp 26 26 <div class="sort sort--forum-topics"> 27 27 <div class="sort__items"> 28 - <span class="sort__item sort__item--title">{{ trans('sort._') }}</span> 28 + <span class="sort__item sort__item--title">{{ osu_trans('sort._') }}</span> 29 29 30 30 @foreach ($defaultMenu + $menu as $menuSort => $menuItem) 31 31 <a
+1 -1
resources/views/forum/forums/index.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @extends('master', [ 6 - 'pageDescription' => trans('forum.title'), 6 + 'pageDescription' => osu_trans('forum.title'), 7 7 'searchParams' => ['mode' => 'forum_post'], 8 8 ]) 9 9
+3 -3
resources/views/forum/forums/show.blade.php
··· 31 31 32 32 @if ($forum->subforums()->exists()) 33 33 <div class="forum-list"> 34 - <h2 class="title title--no-margin">{{ trans("forum.subforums") }}</h2> 34 + <h2 class="title title--no-margin">{{ osu_trans("forum.subforums") }}</h2> 35 35 36 36 <ul class="forum-list__items"> 37 37 @foreach ($forum->subforums as $subforum) ··· 45 45 <div class="forum-list"> 46 46 <div class="forum-list__header"> 47 47 <h2 class="title title--no-margin"> 48 - {{ trans('forum.pinned_topics') }} 48 + {{ osu_trans('forum.pinned_topics') }} 49 49 </h2> 50 50 </div> 51 51 ··· 59 59 <div id="topics" class="forum-list"> 60 60 <div class="forum-list__header"> 61 61 <h2 class="title title--no-margin"> 62 - {{ trans('forum.topics._') }} 62 + {{ osu_trans('forum.topics._') }} 63 63 </h2> 64 64 65 65 <div class="forum-list__menu">
+2 -2
resources/views/forum/posts/_button_delete.blade.php
··· 32 32 33 33 $class .= " js-post-delete-toggle--{$type}"; 34 34 35 - $label = trans("forum.{$objectString}.actions.{$deleteString}"); 36 - $confirmation = trans("forum.{$objectString}.confirm_{$deleteString}"); 35 + $label = osu_trans("forum.{$objectString}.actions.{$deleteString}"); 36 + $confirmation = osu_trans("forum.{$objectString}.confirm_{$deleteString}"); 37 37 $url = route("forum.{$objectRouteString}.{$deleteString}", $object); 38 38 @endphp 39 39 <button
+2 -2
resources/views/forum/posts/_button_edit.blade.php
··· 16 16 data-url="{{ route('forum.posts.edit', $post) }}" 17 17 data-remote="1" 18 18 @if ($type === 'circle') 19 - title="{{ trans('forum.post.actions.edit') }}" 19 + title="{{ osu_trans('forum.post.actions.edit') }}" 20 20 @endif 21 21 > 22 22 @if ($type === 'circle') ··· 24 24 <i class="fas fa-pencil-alt"></i> 25 25 </span> 26 26 @else 27 - {{ trans('forum.post.actions.edit') }} 27 + {{ osu_trans('forum.post.actions.edit') }} 28 28 @endif 29 29 </button>
+2 -2
resources/views/forum/posts/_button_quote.blade.php
··· 16 16 data-url="{{ route('forum.posts.raw', ['post' => $post, 'quote' => 1]) }}" 17 17 data-remote="1" 18 18 @if ($type === 'circle') 19 - title="{{ trans('forum.topics.actions.reply_with_quote') }}" 19 + title="{{ osu_trans('forum.topics.actions.reply_with_quote') }}" 20 20 @endif 21 21 > 22 22 @if ($type === 'circle') ··· 24 24 <i class="fas fa-comment"></i> 25 25 </span> 26 26 @else 27 - {{ trans('forum.topics.actions.reply_with_quote') }} 27 + {{ osu_trans('forum.topics.actions.reply_with_quote') }} 28 28 @endif 29 29 </button>
+2 -2
resources/views/forum/posts/_button_report.blade.php
··· 14 14 class="{{ $class }}" 15 15 data-tooltip-position="top center" 16 16 @if ($type === 'circle') 17 - title="{{ trans('forum.post.actions.report') }}" 17 + title="{{ osu_trans('forum.post.actions.report') }}" 18 18 @endif 19 19 > 20 20 @if ($type === 'circle') ··· 22 22 <i class="fas fa-exclamation-triangle"></i> 23 23 </span> 24 24 @else 25 - {{ trans('forum.post.actions.report') }} 25 + {{ osu_trans('forum.post.actions.report') }} 26 26 @endif 27 27 </button>
+6 -6
resources/views/forum/topics/_cover_editor.blade.php
··· 7 7 class="js-click-menu btn-osu-big btn-osu-big--forum-secondary" 8 8 data-click-menu-target="forum-cover-edit" 9 9 > 10 - {{ trans('forum.covers.edit') }} 10 + {{ osu_trans('forum.covers.edit') }} 11 11 </button> 12 12 13 13 <div ··· 33 33 <span class="btn-osu-big__loading-spinner"> 34 34 {!! spinner(['center-inline']) !!} 35 35 </span> 36 - {{ trans('forum.covers.create.button') }} 36 + {{ osu_trans('forum.covers.create.button') }} 37 37 <input class="fileupload" type="file" /> 38 38 </label> 39 39 ··· 44 44 btn-osu-big btn-osu-big--forum-cover 45 45 btn-osu-big--forum-cover-edit 46 46 " 47 - data-destroy-confirm="{{ trans('forum.covers.destroy.confirm') }}" 47 + data-destroy-confirm="{{ osu_trans('forum.covers.destroy.confirm') }}" 48 48 > 49 49 <span class="btn-osu-big__loading-spinner"> 50 50 {!! spinner(['center-inline']) !!} 51 51 </span> 52 52 53 - {{ trans('forum.covers.destroy._') }} 53 + {{ osu_trans('forum.covers.destroy._') }} 54 54 </button> 55 55 </div> 56 56 57 57 <p class="forum-cover-edit__info"> 58 - {{ trans('forum.covers.create.info', ['dimensions' => implode('x', $cover['dimensions'])]) }} 58 + {{ osu_trans('forum.covers.create.info', ['dimensions' => implode('x', $cover['dimensions'])]) }} 59 59 </p> 60 60 61 61 <div 62 62 class="forum-cover-edit__overlay js-forum-cover--overlay" 63 63 data-state="hidden"> 64 - {{ trans('common.dropzone.target') }} 64 + {{ osu_trans('common.dropzone.target') }} 65 65 </div> 66 66 </div>
+12 -12
resources/views/forum/topics/_create_poll.blade.php
··· 9 9 <div class="simple-form"> 10 10 <label class="simple-form__row"> 11 11 <div class="simple-form__label"> 12 - {{ trans('forum.topics.create.poll.title') }} 12 + {{ osu_trans('forum.topics.create.poll.title') }} 13 13 </div> 14 14 <input 15 15 class="simple-form__input" ··· 20 20 21 21 <label class="simple-form__row"> 22 22 <div class="simple-form__label"> 23 - {{ trans('forum.topics.create.poll.options') }} 24 - <p class="simple-form__info">{{ trans('forum.topics.create.poll.options_info') }}</p> 23 + {{ osu_trans('forum.topics.create.poll.options') }} 24 + <p class="simple-form__info">{{ osu_trans('forum.topics.create.poll.options_info') }}</p> 25 25 </div> 26 26 <textarea 27 27 class="simple-form__input simple-form__input--full-height" ··· 32 32 33 33 <label class="simple-form__row simple-form__row--half"> 34 34 <div class="simple-form__label"> 35 - {{ trans('forum.topics.create.poll.max_options') }} 36 - <p class="simple-form__info">{{ trans('forum.topics.create.poll.max_options_info') }}</p> 35 + {{ osu_trans('forum.topics.create.poll.max_options') }} 36 + <p class="simple-form__info">{{ osu_trans('forum.topics.create.poll.max_options_info') }}</p> 37 37 </div> 38 38 <input 39 39 class="simple-form__input simple-form__input--small" ··· 44 44 45 45 <label class="simple-form__row simple-form__row--half"> 46 46 <div class="simple-form__label"> 47 - {{ trans('forum.topics.create.poll.length') }} 48 - <p class="simple-form__info">{{ trans('forum.topics.create.poll.length_info') }}</p> 47 + {{ osu_trans('forum.topics.create.poll.length') }} 48 + <p class="simple-form__info">{{ osu_trans('forum.topics.create.poll.length_info') }}</p> 49 49 </div> 50 50 <div class="simple-form__input-group"> 51 51 <input ··· 54 54 value="{{ optional($topic)->poll_length > 0 ? $topic->poll_length_days : '' }}" 55 55 /> 56 56 <span class="simple-form__input-group-label simple-form__input-group-label--suffix"> 57 - {{ trans('forum.topics.create.poll.length_days_suffix') }} 57 + {{ osu_trans('forum.topics.create.poll.length_days_suffix') }} 58 58 </span> 59 59 </div> 60 60 </label> ··· 66 66 'name' => 'forum_topic_poll[vote_change]', 67 67 ]) 68 68 69 - {{ trans('forum.topics.create.poll.vote_change') }} 70 - <span class="simple-form__info">{{ trans('forum.topics.create.poll.vote_change_info') }}</span> 69 + {{ osu_trans('forum.topics.create.poll.vote_change') }} 70 + <span class="simple-form__info">{{ osu_trans('forum.topics.create.poll.vote_change_info') }}</span> 71 71 </div> 72 72 </label> 73 73 ··· 78 78 'name' => 'forum_topic_poll[hide_results]', 79 79 ]) 80 80 81 - {{ trans('forum.topics.create.poll.hide_results') }} 82 - <span class="simple-form__info">{{ trans('forum.topics.create.poll.hide_results_info') }}</span> 81 + {{ osu_trans('forum.topics.create.poll.hide_results') }} 82 + <span class="simple-form__info">{{ osu_trans('forum.topics.create.poll.hide_results_info') }}</span> 83 83 </div> 84 84 </label> 85 85 </div>
+5 -5
resources/views/forum/topics/_edit_poll.blade.php
··· 11 11 ]) !!} 12 12 <div class="forum-poll__row forum-poll__row--title"> 13 13 <h2 class="forum-poll__title"> 14 - {{ trans('forum.topics.show.poll.edit') }} 14 + {{ osu_trans('forum.topics.show.poll.edit') }} 15 15 </h2> 16 16 17 17 <span class="forum-poll__warning"> 18 - {{ trans('forum.topics.show.poll.edit_warning') }} 18 + {{ osu_trans('forum.topics.show.poll.edit_warning') }} 19 19 </span> 20 20 </div> 21 21 ··· 26 26 <button 27 27 class="btn-osu-big btn-osu-big--forum-primary" 28 28 type="submit" 29 - data-disable-with="{{ trans('common.buttons.saving') }}" 29 + data-disable-with="{{ osu_trans('common.buttons.saving') }}" 30 30 > 31 - {{ trans('common.buttons.save') }} 31 + {{ osu_trans('common.buttons.save') }} 32 32 </button> 33 33 </div> 34 34 ··· 37 37 class="js-forum-poll--switch-edit btn-osu-big btn-osu-big--forum-secondary" 38 38 type="button" 39 39 > 40 - {{ trans('common.buttons.cancel') }} 40 + {{ osu_trans('common.buttons.cancel') }} 41 41 </button> 42 42 </div> 43 43 </div>
+8 -8
resources/views/forum/topics/_feature_vote.blade.php
··· 4 4 --}} 5 5 <div class="forum-topic-feature-vote"> 6 6 <div class="forum-topic-feature-vote__info"> 7 - {!! trans('forum.topics.show.feature_vote.info._', [ 8 - 'feature_request' => '<strong>'.trans('forum.topics.show.feature_vote.info.feature_request').'</strong>', 9 - 'supporters' => link_to(route('support-the-game'), trans('forum.topics.show.feature_vote.info.supporters')), 7 + {!! osu_trans('forum.topics.show.feature_vote.info._', [ 8 + 'feature_request' => '<strong>'.osu_trans('forum.topics.show.feature_vote.info.feature_request').'</strong>', 9 + 'supporters' => link_to(route('support-the-game'), osu_trans('forum.topics.show.feature_vote.info.supporters')), 10 10 ]) !!} 11 11 </div> 12 12 ··· 26 26 </div> 27 27 28 28 <div> 29 - {{ trans('forum.topics.show.feature_vote.current', [ 29 + {{ osu_trans('forum.topics.show.feature_vote.current', [ 30 30 'count' => i18n_number_format($topic->osu_starpriority), 31 31 ]) }} 32 32 </div> ··· 38 38 data-url="{{ route('forum.topics.vote-feature', $topic->getKey()) }}" 39 39 data-method="POST" 40 40 data-remote=1 41 - data-disable-with="{{ trans('common.buttons.saving') }}" 41 + data-disable-with="{{ osu_trans('common.buttons.saving') }}" 42 42 @if (Auth::user()->osu_featurevotes < App\Models\Forum\FeatureVote::COST) 43 43 disabled 44 44 @endif 45 45 > 46 - {{ trans('forum.topics.show.feature_vote.do') }} 46 + {{ osu_trans('forum.topics.show.feature_vote.do') }} 47 47 </button> 48 48 </div> 49 49 50 50 <div class="forum-topic-feature-vote__remaining"> 51 - {!! trans('forum.topics.show.feature_vote.user.current', [ 52 - 'votes' => '<strong>'.trans_choice('forum.topics.show.feature_vote.user.count', Auth::user()->osu_featurevotes).'</strong>', 51 + {!! osu_trans('forum.topics.show.feature_vote.user.current', [ 52 + 'votes' => '<strong>'.osu_trans_choice('forum.topics.show.feature_vote.user.count', Auth::user()->osu_featurevotes).'</strong>', 53 53 ]) !!} 54 54 </div> 55 55 @endif
+1 -1
resources/views/forum/topics/_header_breadcrumb_small.blade.php
··· 7 7 "> 8 8 <li class="sticky-header-breadcrumbs__item"> 9 9 <a href="{{ route('forum.forums.index') }}" class="sticky-header-breadcrumbs__link"> 10 - {{ trans('forum.title') }} 10 + {{ osu_trans('forum.title') }} 11 11 </a> 12 12 </li> 13 13
+1 -1
resources/views/forum/topics/_header_deleted_counter.blade.php
··· 8 8 @endphp 9 9 <div class="counter-box counter-box--info"> 10 10 <div class="counter-box__title"> 11 - {{ trans('forum.topics.show.deleted-posts') }} 11 + {{ osu_trans('forum.topics.show.deleted-posts') }} 12 12 </div> 13 13 14 14 <div data-total="{{ $total }}" class="counter-box__count js-forum__deleted-count">
+3 -3
resources/views/forum/topics/_header_title.blade.php
··· 13 13 <button 14 14 type="button" 15 15 class="js-forum-topic-title--edit-start btn-circle" 16 - title="{{ trans('forum.topics.edit_title.start') }}" 16 + title="{{ osu_trans('forum.topics.edit_title.start') }}" 17 17 > 18 18 <span class="btn-circle__content"> 19 19 <i class="fas fa-pencil-alt"></i> ··· 40 40 <button 41 41 type="button" 42 42 class="js-forum-topic-title--save btn-circle" 43 - title="{{ trans('common.buttons.save') }}" 43 + title="{{ osu_trans('common.buttons.save') }}" 44 44 > 45 45 <span class="btn-circle__content"> 46 46 <i class="fas fa-check"></i> ··· 52 52 <button 53 53 type="button" 54 54 class="js-forum-topic-title--cancel btn-circle" 55 - title="{{ trans('common.buttons.cancel') }}" 55 + title="{{ osu_trans('common.buttons.cancel') }}" 56 56 > 57 57 <span class="btn-circle__content"> 58 58 <i class="fas fa-times"></i>
+1 -1
resources/views/forum/topics/_header_total_counter.blade.php
··· 7 7 @endphp 8 8 <div class="counter-box counter-box--info"> 9 9 <div class="counter-box__title"> 10 - {{ trans('forum.topics.show.total_posts') }} 10 + {{ osu_trans('forum.topics.show.total_posts') }} 11 11 </div> 12 12 13 13 <div data-total="{{ $total }}" class="counter-box__count js-forum__total-count">
+1 -1
resources/views/forum/topics/_issue_tag.blade.php
··· 15 15 {{ $state ? 'btn-circle--activated' : '' }} 16 16 " 17 17 data-topic-id="{{ $topic->topic_id }}" 18 - title="{{ trans('forum.topics.issue_tag_'.$issueTag.'.to_'.(int) !$state) }}" 18 + title="{{ osu_trans('forum.topics.issue_tag_'.$issueTag.'.to_'.(int) !$state) }}" 19 19 data-url="{{ route('forum.topics.issue-tag', [ 20 20 $topic, 21 21 'state' => !$state,
+3 -3
resources/views/forum/topics/_lock.blade.php
··· 16 16 {{ $topic->isLocked() ? 'btn-circle--activated' : '' }} 17 17 " 18 18 data-topic-id="{{ $topic->topic_id }}" 19 - title="{{ trans("forum.topics.lock.to_{$actionInt}") }}" 19 + title="{{ osu_trans("forum.topics.lock.to_{$actionInt}") }}" 20 20 data-remote="1" 21 21 data-url="{{ route('forum.topics.lock', [ 22 22 $topic, 23 23 'lock' => $actionInt, 24 24 ]) }}" 25 25 data-method="post" 26 - data-confirm="{{ trans("forum.topics.lock.to_{$actionInt}_confirm") }}" 26 + data-confirm="{{ osu_trans("forum.topics.lock.to_{$actionInt}_confirm") }}" 27 27 > 28 28 <span class="btn-circle__content"> 29 29 <i class="fas fa-lock"></i> ··· 34 34 <div 35 35 class="btn-circle btn-circle--topic-nav btn-circle--blank" 36 36 data-tooltip-float="fixed" 37 - title="{{ trans('forum.topics.lock.is_locked') }}" 37 + title="{{ osu_trans('forum.topics.lock.is_locked') }}" 38 38 > 39 39 <span class="btn-circle__content"> 40 40 <i class="fas fa-lock"></i>
+3 -3
resources/views/forum/topics/_moderate_move.blade.php
··· 7 7 data-target="#forum-topic-move-modal" 8 8 data-toggle="modal" 9 9 type="button" 10 - title="{{ trans('forum.topics.moderate_move.title') }}" 10 + title="{{ osu_trans('forum.topics.moderate_move.title') }}" 11 11 > 12 12 <span class="btn-circle__content"> 13 13 <i class="fas fa-arrows-alt"></i> ··· 23 23 <div class="modal-body modal-body--page"> 24 24 {!! Form::open(['url' => route('forum.topics.move', $topic->topic_id), 'data-remote' => true]) !!} 25 25 <h1 class="modal-body__title"> 26 - {{ trans('forum.topics.moderate_move.title') }} 26 + {{ osu_trans('forum.topics.moderate_move.title') }} 27 27 </h1> 28 28 29 29 <p> ··· 43 43 </p> 44 44 45 45 <p class="text-right"> 46 - <button class="btn-osu-big btn-osu-big--forum-primary">{{ trans('common.buttons.save') }}</button> 46 + <button class="btn-osu-big btn-osu-big--forum-primary">{{ osu_trans('common.buttons.save') }}</button> 47 47 </p> 48 48 {!! Form::close() !!} 49 49 </div>
+2 -2
resources/views/forum/topics/_moderate_pin.blade.php
··· 36 36 ]) }}" 37 37 data-remote="1" 38 38 data-method="post" 39 - data-confirm="{{ trans("forum.topics.moderate_pin.to_{$actionInt}_confirm") }}" 40 - title="{{ trans("forum.topics.moderate_pin.to_{$actionInt}") }}" 39 + data-confirm="{{ osu_trans("forum.topics.moderate_pin.to_{$actionInt}_confirm") }}" 40 + title="{{ osu_trans("forum.topics.moderate_pin.to_{$actionInt}") }}" 41 41 > 42 42 <span class="btn-circle__content"> 43 43 <i class="fas fa-{{ $attrs['icon'] }}"></i>
+1 -1
resources/views/forum/topics/_moderate_toggle_deleted.blade.php
··· 11 11 {{ $showDeleted ? '' : 'btn-circle--activated' }} 12 12 js-forum-topic-moderate--toggle-deleted 13 13 " 14 - title="{{ trans('forum.topics.moderate_toggle_deleted.' . ($showDeleted ? 'hide' : 'show')) }}" 14 + title="{{ osu_trans('forum.topics.moderate_toggle_deleted.' . ($showDeleted ? 'hide' : 'show')) }}" 15 15 data-show-deleted="{{ $showDeleted ? 1 : 0 }}" 16 16 > 17 17 <span class="btn-circle__content">
+12 -12
resources/views/forum/topics/_nav.blade.php
··· 78 78 href="{{ route('search', ['mode' => 'forum_post', 'topic_id' => $topic->getKey()]) }}" 79 79 class="btn-circle btn-circle--topic-nav" 80 80 data-tooltip-float="fixed" 81 - title="{{ trans('forum.topics.actions.search') }}" 81 + title="{{ osu_trans('forum.topics.actions.search') }}" 82 82 > 83 83 <span class="btn-circle__content"> 84 84 <i class="fas fa-search"></i> ··· 92 92 class="js-forum-posts-seek--jump btn-circle btn-circle--topic-nav" 93 93 data-jump-target="first" 94 94 data-tooltip-float="fixed" 95 - title="{{ trans('forum.topic.jump.first') }}" 95 + title="{{ osu_trans('forum.topic.jump.first') }}" 96 96 > 97 97 <span class="btn-circle__content"> 98 98 <i class="fas fa-angle-double-left"></i> ··· 104 104 class="js-forum-posts-seek--jump btn-circle btn-circle--topic-nav" 105 105 data-jump-target="previous" 106 106 data-tooltip-float="fixed" 107 - title="{{ trans('forum.topic.jump.previous') }}" 107 + title="{{ osu_trans('forum.topic.jump.previous') }}" 108 108 > 109 109 <span class="btn-circle__content"> 110 110 <i class="fas fa-angle-left"></i> ··· 148 148 <div 149 149 class="js-forum-topic-post-jump--cover forum-topic-nav__counter-cover" 150 150 data-tooltip-float="fixed" 151 - title="{{ trans('forum.topic.jump.enter') }}" 151 + title="{{ osu_trans('forum.topic.jump.enter') }}" 152 152 ></div> 153 153 </div> 154 154 ··· 157 157 class="js-forum-posts-seek--jump btn-circle btn-circle--topic-nav" 158 158 data-jump-target="next" 159 159 data-tooltip-float="fixed" 160 - title="{{ trans('forum.topic.jump.next') }}" 160 + title="{{ osu_trans('forum.topic.jump.next') }}" 161 161 > 162 162 <span class="btn-circle__content"> 163 163 <i class="fas fa-angle-right"></i> ··· 169 169 class="js-forum-posts-seek--jump btn-circle btn-circle--topic-nav" 170 170 data-jump-target="last" 171 171 data-tooltip-float="fixed" 172 - title="{{ trans('forum.topic.jump.last') }}" 172 + title="{{ osu_trans('forum.topic.jump.last') }}" 173 173 > 174 174 <span class="btn-circle__content"> 175 175 <i class="fas fa-angle-double-right"></i> ··· 186 186 <div 187 187 class="btn-circle btn-circle--topic-nav btn-circle--blank" 188 188 data-tooltip-float="fixed" 189 - title="{{ trans('forum.topics.lock.is_locked') }}" 189 + title="{{ osu_trans('forum.topics.lock.is_locked') }}" 190 190 > 191 191 <span class="btn-circle__content"> 192 192 <i class="fas fa-lock"></i> ··· 199 199 type="button" 200 200 class="btn-circle btn-circle--topic-nav js-forum-topic-reply--toggle" 201 201 data-tooltip-float="fixed" 202 - title="{{ trans('forum.topics.actions.reply') }}" 202 + title="{{ osu_trans('forum.topics.actions.reply') }}" 203 203 > 204 204 <span class="btn-circle__content"> 205 205 <i class="fas fa-reply"></i> ··· 210 210 type="button" 211 211 class="btn-circle btn-circle--topic-nav js-user-link" 212 212 data-tooltip-float="fixed" 213 - title="{{ trans('forum.topics.actions.login_reply') }}" 213 + title="{{ osu_trans('forum.topics.actions.login_reply') }}" 214 214 > 215 215 <span class="btn-circle__content"> 216 216 <i class="fas fa-reply"></i> ··· 225 225 href="{{ route('search', ['mode' => 'forum_post', 'topic_id' => $topic->getKey()]) }}" 226 226 class="btn-circle btn-circle--topic-nav" 227 227 data-tooltip-float="fixed" 228 - title="{{ trans('forum.topics.actions.search') }}" 228 + title="{{ osu_trans('forum.topics.actions.search') }}" 229 229 > 230 230 <span class="btn-circle__content"> 231 231 <i class="fas fa-search"></i> ··· 240 240 <span class="btn-osu-big__content"> 241 241 <span class="btn-osu-big__left"> 242 242 <span class="btn-osu-big__text-top"> 243 - {{ trans('forum.topics.actions.reply') }} 243 + {{ osu_trans('forum.topics.actions.reply') }} 244 244 </span> 245 245 </span> 246 246 ··· 261 261 262 262 <span class="btn-osu-big__left"> 263 263 <span class="btn-osu-big__text-top"> 264 - {{ trans('forum.topics.actions.login_reply') }} 264 + {{ osu_trans('forum.topics.actions.login_reply') }} 265 265 </span> 266 266 </span> 267 267 </span>
+3 -3
resources/views/forum/topics/_poll_form.blade.php
··· 46 46 class="js-checkbox-validation--submit btn-osu-big btn-osu-big--forum-primary" 47 47 disabled 48 48 > 49 - {{ trans('forum.topics.show.poll.vote') }} 49 + {{ osu_trans('forum.topics.show.poll.vote') }} 50 50 </button> 51 51 </div> 52 52 @endif ··· 58 58 data-target-page="results" 59 59 type="button" 60 60 > 61 - {{ trans('forum.topics.show.poll.button.view_results') }} 61 + {{ osu_trans('forum.topics.show.poll.button.view_results') }} 62 62 </button> 63 63 </div> 64 64 @endif ··· 69 69 type="button" 70 70 class="js-forum-poll--switch-edit btn-osu-big btn-osu-big--forum-secondary" 71 71 > 72 - {{ trans('forum.topics.show.poll.button.edit') }} 72 + {{ osu_trans('forum.topics.show.poll.button.edit') }} 73 73 </button> 74 74 </div> 75 75 @endif
+7 -7
resources/views/forum/topics/_poll_results.blade.php
··· 17 17 18 18 <div class="forum-poll__row forum-poll__row--details"> 19 19 <div class="forum-poll__detail"> 20 - {{ trans('forum.topics.show.poll.detail.total', ['count' => $pollSummary['total']]) }} 20 + {{ osu_trans('forum.topics.show.poll.detail.total', ['count' => $pollSummary['total']]) }} 21 21 </div> 22 22 23 23 @if ($topic->pollEnd() !== null) 24 24 <div class="forum-poll__detail forum-poll__detail--sub"> 25 25 @if ($topic->pollEnd()->isFuture()) 26 - {!! trans('forum.topics.show.poll.detail.end_time', ['time' => js_localtime($topic->pollEnd())]) !!} 26 + {!! osu_trans('forum.topics.show.poll.detail.end_time', ['time' => js_localtime($topic->pollEnd())]) !!} 27 27 @else 28 - {!! trans('forum.topics.show.poll.detail.ended', ['time' => js_localtime($topic->pollEnd())]) !!} 28 + {!! osu_trans('forum.topics.show.poll.detail.ended', ['time' => js_localtime($topic->pollEnd())]) !!} 29 29 @endif 30 30 </div> 31 31 32 32 @if (!$canViewResults) 33 33 <div class="forum-poll__detail forum-poll__detail--sub"> 34 - {{ trans('forum.topics.show.poll.detail.results_hidden') }} 34 + {{ osu_trans('forum.topics.show.poll.detail.results_hidden') }} 35 35 </div> 36 36 @endif 37 37 @endif ··· 47 47 data-target-page="form" 48 48 > 49 49 @if ($buttons['changeVote']) 50 - {{ trans('forum.topics.show.poll.button.change_vote') }} 50 + {{ osu_trans('forum.topics.show.poll.button.change_vote') }} 51 51 @else 52 - {{ trans('forum.topics.show.poll.button.vote') }} 52 + {{ osu_trans('forum.topics.show.poll.button.vote') }} 53 53 @endif 54 54 </button> 55 55 </div> ··· 61 61 type="button" 62 62 class="js-forum-poll--switch-edit btn-osu-big btn-osu-big--forum-secondary" 63 63 > 64 - {{ trans('forum.topics.show.poll.button.edit') }} 64 + {{ osu_trans('forum.topics.show.poll.button.edit') }} 65 65 </button> 66 66 </div> 67 67 @endif
+2 -2
resources/views/forum/topics/_post.blade.php
··· 37 37 @if (isset($topic) && $topic->topic_poster === $post->poster_id) 38 38 <div class="forum-post__header-content-item"> 39 39 <span class="forum-user-badge"> 40 - {{ trans('forum.post.info.topic_starter') }} 40 + {{ osu_trans('forum.post.info.topic_starter') }} 41 41 </span> 42 42 </div> 43 43 @endif ··· 86 86 @if($post->post_edit_count > 0) 87 87 <div class="forum-post__content forum-post__content--footer"> 88 88 {!! 89 - trans_choice('forum.post.edited', $post->post_edit_count, [ 89 + osu_trans_choice('forum.post.edited', $post->post_edit_count, [ 90 90 'user' => link_to_user($post->lastEditorNormalized(), null, '', []), 91 91 'when' => timeago($post->post_edit_time), 92 92 ])
+11 -11
resources/views/forum/topics/_post_edit_form.blade.php
··· 18 18 @if ($type === 'reply') 19 19 <div class="bbcode-editor__header"> 20 20 <h2 class="bbcode-editor__title"> 21 - {{ trans('forum.post.create.title.reply') }} 21 + {{ osu_trans('forum.post.create.title.reply') }} 22 22 </h2> 23 23 </div> 24 24 @endif ··· 27 27 @if ($type === 'create') 28 28 <input 29 29 class="bbcode-editor__input-title" 30 - placeholder="{{ trans("forum.topic.create.placeholder.title") }}" 30 + placeholder="{{ osu_trans("forum.topic.create.placeholder.title") }}" 31 31 name="title" 32 32 /> 33 33 @endif ··· 43 43 {{ in_array($type, ['edit', 'reply'], true) ? 'js-quick-submit' : '' }} 44 44 " 45 45 name="body" 46 - placeholder="{{ trans('forum.topic.create.placeholder.body') }}" 46 + placeholder="{{ osu_trans('forum.topic.create.placeholder.body') }}" 47 47 data-blur-on-submit-disable="1" 48 48 required 49 49 {{ $type === 'create' ? 'autofocus' : '' }} ··· 79 79 type="button" 80 80 class="js-ujs-submit-disable js-edit-post-cancel btn-osu-big btn-osu-big--forum-secondary" 81 81 > 82 - {{ trans('forum.topic.post_edit.cancel') }} 82 + {{ osu_trans('forum.topic.post_edit.cancel') }} 83 83 </button> 84 84 </div> 85 85 @endif ··· 90 90 type="button" 91 91 class="js-forum-topic-reply--deactivate btn-osu-big btn-osu-big--forum-secondary" 92 92 > 93 - {{ trans('forum.topic.create.close') }} 93 + {{ osu_trans('forum.topic.create.close') }} 94 94 </button> 95 95 </div> 96 96 @endif ··· 102 102 class="js-bbcode-preview--hide btn-osu-big btn-osu-big--forum-secondary" 103 103 {{ $enabled ? '' : 'disabled' }} 104 104 > 105 - {{ trans('forum.topic.create.preview_hide') }} 105 + {{ osu_trans('forum.topic.create.preview_hide') }} 106 106 </button> 107 107 </div> 108 108 ··· 112 112 class="js-bbcode-preview--show btn-osu-big btn-osu-big--forum-secondary" 113 113 {{ $enabled ? '' : 'disabled' }} 114 114 > 115 - {{ trans('forum.topic.create.preview') }} 115 + {{ osu_trans('forum.topic.create.preview') }} 116 116 </button> 117 117 </div> 118 118 @endif ··· 121 121 <button 122 122 class="btn-osu-big btn-osu-big--forum-primary" 123 123 type="submit" 124 - data-disable-with="{{ trans('common.buttons.saving') }}" 124 + data-disable-with="{{ osu_trans('common.buttons.saving') }}" 125 125 {{ $enabled ? '' : 'disabled' }} 126 126 > 127 127 @if ($type === 'reply') 128 - {{ trans('forum.topic.post_reply') }} 128 + {{ osu_trans('forum.topic.post_reply') }} 129 129 @elseif ($type === 'edit') 130 - {{ trans("forum.topic.post_edit.post") }} 130 + {{ osu_trans("forum.topic.post_edit.post") }} 131 131 @elseif ($type === 'create') 132 - {{ trans('forum.topic.create.submit') }} 132 + {{ osu_trans('forum.topic.create.submit') }} 133 133 @endif 134 134 </button> 135 135 </div>
+1 -1
resources/views/forum/topics/_post_info.blade.php
··· 90 90 @if ($user->getKey() !== null) 91 91 <div class="forum-post-info__row forum-post-info__row--posts"> 92 92 <a href="{{ route("users.posts", $user) }}"> 93 - {{ trans_choice('forum.post.info.post_count', $user->user_posts) }} 93 + {{ osu_trans_choice('forum.post.info.post_count', $user->user_posts) }} 94 94 </a> 95 95 </div> 96 96
+3 -3
resources/views/forum/topics/_reply.blade.php
··· 6 6 if (priv_check('ForumTopicReply', $topic)->can()) { 7 7 if (!$topic->isActive()) { 8 8 if (priv_check('ForumTopicStore', $topic->forum)->can()) { 9 - $warning = trans('forum.topic.create.necropost.new_topic._', [ 9 + $warning = osu_trans('forum.topic.create.necropost.new_topic._', [ 10 10 'create' => link_to_route( 11 11 'forum.topics.create', 12 - trans('forum.topic.create.necropost.new_topic.create'), 12 + osu_trans('forum.topic.create.necropost.new_topic.create'), 13 13 ['forum_id' => $topic->forum] 14 14 ), 15 15 ]); 16 16 } else { 17 - $warning = e(trans('forum.topic.create.necropost.default')); 17 + $warning = e(osu_trans('forum.topic.create.necropost.default')); 18 18 } 19 19 } 20 20 } else {
+1 -1
resources/views/forum/topics/_watch.blade.php
··· 51 51 data-remote="1" 52 52 data-method="PUT" 53 53 > 54 - {{ trans("forum.topics.watch.to_{$newState}") }} 54 + {{ osu_trans("forum.topics.watch.to_{$newState}") }} 55 55 <span class="simple-menu__item-loading-spinner"> 56 56 {!! spinner() !!} 57 57 </span>
+5 -5
resources/views/forum/topics/create.blade.php
··· 17 17 <div class="forum-topic-title"> 18 18 <div class="forum-topic-title__item"> 19 19 <h1 class="forum-topic-title__title"> 20 - {{ trans('forum.topic.new_topic') }} 20 + {{ osu_trans('forum.topic.new_topic') }} 21 21 </h1> 22 22 </div> 23 23 </div> ··· 37 37 /> 38 38 39 39 <span class="label-toggle__label label-toggle__label--uncheck"> 40 - {{ trans('forum.topics.create.create_poll_button.remove') }} 40 + {{ osu_trans('forum.topics.create.create_poll_button.remove') }} 41 41 </span> 42 42 43 43 <span class="label-toggle__label label-toggle__label--check"> 44 - {{ trans('forum.topics.create.create_poll_button.add') }} 44 + {{ osu_trans('forum.topics.create.create_poll_button.add') }} 45 45 </span> 46 46 </div> 47 47 </label> ··· 56 56 <div class="forum-poll js-form-toggle--form" data-form-toggle-id="poll-create" style="display: none"> 57 57 <div class="forum-poll__row forum-poll__row--title"> 58 58 <h2 class="forum-poll__title"> 59 - {{ trans('forum.topics.create.create_poll') }} 59 + {{ osu_trans('forum.topics.create.create_poll') }} 60 60 </h2> 61 61 </div> 62 62 ··· 65 65 66 66 <div class="js-post-preview--box hidden forum-post-preview"> 67 67 <div class="forum-post-preview__title"> 68 - {{ trans('forum.topics.create.preview') }} 68 + {{ osu_trans('forum.topics.create.preview') }} 69 69 </div> 70 70 71 71 <div class="forum-post-content js-post-preview--preview"></div>
+1 -1
resources/views/forum/topics/replace_button.blade.php
··· 25 25 compact('topic', 'state', 'userCanModerate') 26 26 )->render()) !!}); 27 27 28 - osu.popup({!! json_encode(trans('forum.topics.'.$type.'.to_'.$stateText.'_done')) !!}, 'success'); 28 + osu.popup({!! json_encode(osu_trans('forum.topics.'.$type.'.to_'.$stateText.'_done')) !!}, 'success'); 29 29 });
+4 -4
resources/views/forum/topics/show.blade.php
··· 57 57 @endif 58 58 </div> 59 59 <div class="forum-topic-title__post-time"> 60 - {!! trans("forum.post.posted_at", ["when" => timeago($topic->topic_time)]) !!} 60 + {!! osu_trans("forum.post.posted_at", ["when" => timeago($topic->topic_time)]) !!} 61 61 </div> 62 62 </div> 63 63 ··· 80 80 type="button" 81 81 class="btn-osu-big btn-osu-big--forum-secondary js-forum-topic-title--cancel" 82 82 > 83 - {{ trans('common.buttons.cancel') }} 83 + {{ osu_trans('common.buttons.cancel') }} 84 84 </button> 85 85 </div> 86 86 ··· 89 89 type="button" 90 90 class="btn-osu-big btn-osu-big--forum-primary js-forum-topic-title--save" 91 91 > 92 - {{ trans('common.buttons.save') }} 92 + {{ osu_trans('common.buttons.save') }} 93 93 </button> 94 94 </div> 95 95 ··· 98 98 type="button" 99 99 class="btn-osu-big btn-osu-big--forum-secondary js-forum-topic-title--edit-start" 100 100 > 101 - {{ trans('forum.topics.edit_title.start') }} 101 + {{ osu_trans('forum.topics.edit_title.start') }} 102 102 </button> 103 103 </div> 104 104 @endif
+1 -1
resources/views/friends/index.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('master', ['titlePrepend' => trans('friends.title_compact')]) 5 + @extends('master', ['titlePrepend' => osu_trans('friends.title_compact')]) 6 6 7 7 @section('content') 8 8 <div class="js-react--friends-index osu-layout osu-layout--full"></div>
+2 -2
resources/views/home/_search_page_tabs.blade.php
··· 15 15 href="{{ route('search', ['mode' => $mode, 'query' => request('query')]) }}" 16 16 class="{{ $cssClasses }}" 17 17 > 18 - <span class="fake-bold" data-content="{{ trans("home.search.mode.{$mode}") }}"> 19 - {{ trans("home.search.mode.{$mode}") }} 18 + <span class="fake-bold" data-content="{{ osu_trans("home.search.mode.{$mode}") }}"> 19 + {{ osu_trans("home.search.mode.{$mode}") }} 20 20 </span> 21 21 22 22 @if ($allSearch->hasQuery() && $search !== null && (!$search->isLoginRequired() || auth()->check()))
+4 -4
resources/views/home/_search_results.blade.php
··· 6 6 @if (!auth()->check() && $search->isLoginRequired()) 7 7 <div class="search-result__row search-result__row--notice"> 8 8 <button class="textual-button textual-button--inline js-user-link"> 9 - {{ trans("home.search.{$mode}.login_required") }} 9 + {{ osu_trans("home.search.{$mode}.login_required") }} 10 10 </button> 11 11 </div> 12 12 @elseif ($search->getError() !== null) ··· 15 15 </div> 16 16 @elseif ($search->total() === 0) 17 17 <div class="search-result__row search-result__row--notice"> 18 - {{ trans('home.search.empty_result') }} 18 + {{ osu_trans('home.search.empty_result') }} 19 19 </div> 20 20 @else 21 21 <div class="search-result__row search-result__row--entries-container"> ··· 36 36 class="search-result__row search-result__row--more" 37 37 href="{{ route('search', ['mode' => $mode, 'query' => request('query')]) }}" 38 38 > 39 - {{ trans("home.search.{$mode}.more_simple") }} 39 + {{ osu_trans("home.search.{$mode}.more_simple") }} 40 40 </a> 41 41 @else 42 42 @if (request('mode') === 'user' && $search->overLimit()) 43 43 <div class="search-result__row search-result__row--notice"> 44 - {{ trans("home.search.user.more_hidden", ['max' => config("osu.search.max.user")]) }} 44 + {{ osu_trans("home.search.user.more_hidden", ['max' => config("osu.search.max.user")]) }} 45 45 </div> 46 46 @endif 47 47 <div class="search-result__row search-result__row--paginator">
+3 -3
resources/views/home/_supporter_perk_group.blade.php
··· 21 21 22 22 <div class="supporter-perk-list-group__text"> 23 23 <h4 class="supporter-perk-list-group__title"> 24 - {!! trans("community.support.{$section}.{$name}.title") !!} 24 + {!! osu_trans("community.support.{$section}.{$name}.title") !!} 25 25 </h4> 26 26 <p class="supporter-perk-list-group__content"> 27 - {!! trans("community.support.{$section}.{$name}.description", $options['translation_options'] ?? []) !!} 27 + {!! osu_trans("community.support.{$section}.{$name}.description", $options['translation_options'] ?? []) !!} 28 28 @if (isset($options['link'])) 29 29 {!! link_to( 30 30 $options['link'], 31 - trans("community.support.{$section}.{$name}.link_text"), 31 + osu_trans("community.support.{$section}.{$name}.link_text"), 32 32 [ 33 33 'class' => 'supporter-perk-list-group__link', 34 34 'rel' => 'nofollow noreferrer',
+2 -2
resources/views/home/_supporter_perk_hero.blade.php
··· 19 19 </div> 20 20 <div class="supporter-perk-list-hero__text"> 21 21 <h4 class="supporter-perk-list-hero__title"> 22 - {{ trans("community.support.perks.{$group['name']}.title") }} 22 + {{ osu_trans("community.support.perks.{$group['name']}.title") }} 23 23 </h4> 24 24 <p class="supporter-perk-list-hero__content"> 25 - {{ trans("community.support.perks.{$group['name']}.description") }} 25 + {{ osu_trans("community.support.perks.{$group['name']}.description") }} 26 26 </p> 27 27 </div> 28 28 </div>
+2 -2
resources/views/home/_supporter_perk_image.blade.php
··· 20 20 </div> 21 21 <div class="supporter-perk-list-image__text"> 22 22 <h4 class="supporter-perk-list-image__title"> 23 - {{ trans("community.support.perks.{$group['name']}.title") }} 23 + {{ osu_trans("community.support.perks.{$group['name']}.title") }} 24 24 </h4> 25 25 <p class="supporter-perk-list-image__content"> 26 - {{ trans("community.support.perks.{$group['name']}.description") }} 26 + {{ osu_trans("community.support.perks.{$group['name']}.description") }} 27 27 </p> 28 28 </div> 29 29 </div>
+2 -2
resources/views/home/_supporter_perk_image_group.blade.php
··· 23 23 </div> 24 24 <div class="supporter-perk-list-group__text"> 25 25 <h4 class="supporter-perk-list-group__title"> 26 - {{ trans("community.support.perks.{$name}.title") }} 26 + {{ osu_trans("community.support.perks.{$name}.title") }} 27 27 </h4> 28 28 <p class="supporter-perk-list-group__content"> 29 - {{ trans("community.support.perks.{$name}.description") }} 29 + {{ osu_trans("community.support.perks.{$name}.description") }} 30 30 </p> 31 31 </div> 32 32 </div>
+1 -1
resources/views/home/_user_beatmapset.blade.php
··· 18 18 <div class='user-home-beatmapset__title u-ellipsis-overflow'>{{$beatmapset->title}}</div> 19 19 <div class='user-home-beatmapset__artist u-ellipsis-overflow'>{{$beatmapset->artist}}</div> 20 20 <div class='user-home-beatmapset__creator u-ellipsis-overflow'> 21 - {!! trans('home.user.beatmaps.by_user', ['user' => tag( 21 + {!! osu_trans('home.user.beatmaps.by_user', ['user' => tag( 22 22 'span', 23 23 ['data-user-id' => $beatmapset->user_id, 'class' => 'js-usercard'], 24 24 e($beatmapset->creator)
+4 -4
resources/views/home/_user_header_default.blade.php
··· 13 13 'links' => [ 14 14 [ 15 15 'active' => $currentActive === 'home_controller.index', 16 - 'title' => trans('home.user.title'), 16 + 'title' => osu_trans('home.user.title'), 17 17 'url' => route('home'), 18 18 ], 19 19 [ 20 20 'active' => $currentActive === 'friends_controller.index', 21 - 'title' => trans('friends.title_compact'), 21 + 'title' => osu_trans('friends.title_compact'), 22 22 'url' => route('friends.index'), 23 23 ], 24 24 [ 25 25 'active' => $currentActive === 'follows_controller.index', 26 - 'title' => trans('follows.index.title_compact'), 26 + 'title' => osu_trans('follows.index.title_compact'), 27 27 'url' => route('follows.index', ['subtype' => App\Models\Follow::DEFAULT_SUBTYPE]), 28 28 ], 29 29 [ 30 30 'active' => $currentActive === 'account_controller.edit', 31 - 'title' => trans('accounts.edit.title_compact'), 31 + 'title' => osu_trans('accounts.edit.title_compact'), 32 32 'url' => route('account.edit'), 33 33 ], 34 34 ],
+3 -3
resources/views/home/_user_online_status.blade.php
··· 8 8 <div class="user-online-status"> 9 9 <div class="user-online-status__item"> 10 10 <div class="user-online-status__label"> 11 - {{ trans('home.user.header.stats.friends') }} 11 + {{ osu_trans('home.user.header.stats.friends') }} 12 12 </div> 13 13 <div class="user-online-status__value"> 14 14 {{ i18n_number_format($stats->onlineFriends) }} ··· 17 17 18 18 <div class="user-online-status__item"> 19 19 <div class="user-online-status__label"> 20 - {{ trans('home.user.header.stats.games') }} 20 + {{ osu_trans('home.user.header.stats.games') }} 21 21 </div> 22 22 <div class="user-online-status__value"> 23 23 {{ i18n_number_format($stats->currentGames) }} ··· 26 26 27 27 <div class="user-online-status__item"> 28 28 <div class="user-online-status__label"> 29 - {{ trans('home.user.header.stats.online') }} 29 + {{ osu_trans('home.user.header.stats.online') }} 30 30 </div> 31 31 <div class="user-online-status__value"> 32 32 <strong>{{ i18n_number_format($stats->currentOnline) }}</strong>
+16 -16
resources/views/home/download.blade.php
··· 11 11 ]]) 12 12 @slot('contentAppend') 13 13 <div class="download-page-header"> 14 - <span class="download-page-header__tagline">{!! trans('home.download.tagline') !!}</span> 14 + <span class="download-page-header__tagline">{!! osu_trans('home.download.tagline') !!}</span> 15 15 16 16 <div class="download-page-header__icon"> 17 17 <i class="fas fa-download" aria-hidden="true"></i> 18 18 </div> 19 19 20 20 <a class="btn-osu-big btn-osu-big--download-page" href="{{ config('osu.urls.installer') }}"> 21 - <span class="btn-osu-big__text-top">{{ trans('home.download.action') }}</span> 22 - <span class="btn-osu-big__text-bottom">{{ trans('home.download.os.windows') }}</span> 21 + <span class="btn-osu-big__text-top">{{ osu_trans('home.download.action') }}</span> 22 + <span class="btn-osu-big__text-bottom">{{ osu_trans('home.download.os.windows') }}</span> 23 23 </a> 24 24 25 25 <p class="download-page-header__text"> 26 26 <a class="download-page-header__extra-link" href="{{ config('osu.urls.installer-mirror') }}"> 27 - {{ trans('home.download.mirror') }} 27 + {{ osu_trans('home.download.mirror') }} 28 28 </a> 29 29 &middot; 30 30 <a class="download-page-header__extra-link" href="{{ config('osu.urls.osx') }}"> 31 - {{ trans('home.download.macos-fallback') }} 31 + {{ osu_trans('home.download.macos-fallback') }} 32 32 </a> 33 33 </p> 34 34 </div> ··· 39 39 <div class="download-page__step"> 40 40 <div class="download-page__text download-page__text--title"> 41 41 <span class="download-page__step-number">1</span> 42 - {{ trans("home.download.steps.download.title") }} 42 + {{ osu_trans("home.download.steps.download.title") }} 43 43 </div> 44 44 <div class="download-page__text download-page__text--description"> 45 - {{ trans("home.download.steps.download.description") }} 45 + {{ osu_trans("home.download.steps.download.description") }} 46 46 </div> 47 47 </div> 48 48 <div class="download-page__step"> 49 49 <div class="download-page__text download-page__text--title"> 50 50 <span class="download-page__step-number">2</span> 51 - {{ trans('home.download.steps.register.title') }} 51 + {{ osu_trans('home.download.steps.register.title') }} 52 52 </div> 53 53 <div class="download-page__text download-page__text--description"> 54 - {{ trans('home.download.steps.register.description') }} 54 + {{ osu_trans('home.download.steps.register.description') }} 55 55 </div> 56 56 </div> 57 57 <div class="download-page__step"> 58 58 <div class="download-page__text download-page__text--title"> 59 59 <span class="download-page__step-number">3</span> 60 - {{ trans("home.download.steps.beatmaps.title") }} 60 + {{ osu_trans("home.download.steps.beatmaps.title") }} 61 61 </div> 62 62 <div class="download-page__text download-page__text--description"> 63 - {!! trans('home.download.steps.beatmaps.description._', [ 63 + {!! osu_trans('home.download.steps.beatmaps.description._', [ 64 64 'browse' => tag( 65 65 'a', 66 66 ['href' => route('beatmapsets.index')], 67 - trans('home.download.steps.beatmaps.description.browse') 67 + osu_trans('home.download.steps.beatmaps.description.browse') 68 68 ) 69 69 ]) !!} 70 70 </div> ··· 72 72 73 73 @if (config('services.enchant.id') !== null) 74 74 <div class="download-page__help"> 75 - {!! trans('home.download.help._', [ 75 + {!! osu_trans('home.download.help._', [ 76 76 'support_button' => tag('a', [ 77 77 'class' => 'js-enchant--show', 78 78 'role' => 'button', 79 79 'href' => '#', 80 - ], trans('home.download.help.support_button')), 80 + ], osu_trans('home.download.help.support_button')), 81 81 'help_forum_link' => tag('a', [ 82 82 'href' => route('forum.forums.show', ['forum' => config('osu.forum.help_forum_id')]), 83 - ], trans('home.download.help.help_forum_link')), 83 + ], osu_trans('home.download.help.help_forum_link')), 84 84 ]) !!} 85 85 </div> 86 86 ··· 92 92 <div class="osu-page osu-page--download"> 93 93 <div class="download-page-video"> 94 94 <div class="download-page-video__title"> 95 - {{ trans('home.download.video-guide') }} 95 + {{ osu_trans('home.download.video-guide') }} 96 96 </div> 97 97 98 98 <div class="download-page-video__embed">
+10 -10
resources/views/home/landing.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @extends('master', [ 6 - 'titleOverride' => trans('home.landing.title'), 6 + 'titleOverride' => osu_trans('home.landing.title'), 7 7 'blank' => 'true', 8 8 'bodyAdditionalClasses' => 'osu-layout--body-landing' 9 9 ]) ··· 25 25 href="{{ $links['_'] ?? array_values($links)[0] }}" 26 26 class="landing-nav__link {{ ($section == "home") ? "landing-nav__link--bold" : "" }}" 27 27 > 28 - {{ trans("layout.menu.$section._") }} 28 + {{ osu_trans("layout.menu.$section._") }} 29 29 </a> 30 30 @endforeach 31 31 ··· 83 83 class="landing-nav__link js-nav-toggle js-click-menu js-user-login--menu" 84 84 data-click-menu-target="nav2-login-box" 85 85 > 86 - {{ trans("users.login._") }} 86 + {{ osu_trans("users.login._") }} 87 87 </a> 88 88 </div> 89 89 </div> ··· 117 117 </div> 118 118 119 119 <div class="landing-hero__info"> 120 - {!! trans("home.landing.players", ['count' => i18n_number_format($stats->totalUsers)]) !!}, 121 - {!! trans("home.landing.online", [ 120 + {!! osu_trans("home.landing.players", ['count' => i18n_number_format($stats->totalUsers)]) !!}, 121 + {!! osu_trans("home.landing.online", [ 122 122 'players' => i18n_number_format($stats->currentOnline), 123 123 'games' => i18n_number_format($stats->currentGames)] 124 124 ) !!} ··· 133 133 134 134 <div class="landing-hero__slogan"> 135 135 <h1 class="landing-hero__slogan-main"> 136 - {{ trans('home.landing.slogan.main') }} 136 + {{ osu_trans('home.landing.slogan.main') }} 137 137 </h1> 138 138 139 139 <h2 class="landing-hero__slogan-sub"> 140 - {{ trans('home.landing.slogan.sub') }} 140 + {{ osu_trans('home.landing.slogan.sub') }} 141 141 </h2> 142 142 </div> 143 143 ··· 147 147 <span class="btn-osu-big__content"> 148 148 <span class="btn-osu-big__left"> 149 149 <span class="btn-osu-big__text-top"> 150 - {{ trans("home.landing.download") }} 150 + {{ osu_trans("home.landing.download") }} 151 151 </span> 152 152 </span> 153 153 ··· 178 178 <div class="osu-layout__col osu-layout__col--sm-4"> 179 179 <ul class="landing-sitemap__list"> 180 180 <li class="landing-sitemap__item"> 181 - <div class="landing-sitemap__header">{{ trans("layout.footer.$section._") }}</div> 181 + <div class="landing-sitemap__header">{{ osu_trans("layout.footer.$section._") }}</div> 182 182 </li> 183 183 @foreach ($links as $action => $link) 184 - <li class="landing-sitemap__item"><a href="{{ $link }}" class="landing-sitemap__link">{{ trans("layout.footer.$section.$action") }}</a></li> 184 + <li class="landing-sitemap__item"><a href="{{ $link }}" class="landing-sitemap__link">{{ osu_trans("layout.footer.$section.$action") }}</a></li> 185 185 @endforeach 186 186 </ul> 187 187 </div>
+2 -2
resources/views/home/search.blade.php
··· 26 26 class="search-header__input js-search--input" 27 27 name="query" 28 28 value="{{ request('query') }}" 29 - placeholder="{{ trans('home.search.placeholder') }}" 29 + placeholder="{{ osu_trans('home.search.placeholder') }}" 30 30 data-search-current="{{ request('query') }}" 31 31 data-turbolinks-permanent 32 32 id="search-input" ··· 69 69 @else 70 70 <div class="search-result"> 71 71 <div class="search-result__row search-result__row--notice"> 72 - {{ trans('home.search.keyword_required') }} 72 + {{ osu_trans('home.search.keyword_required') }} 73 73 </div> 74 74 </div> 75 75 @endif
+11 -11
resources/views/home/support-the-game.blade.php
··· 15 15 @if (!empty($supporterStatus)) 16 16 <!-- supporter status --> 17 17 <div class="supporter-status__flex-container"> 18 - <a class="supporter-eyecatch__link" href="{{ route('store.products.show', 'supporter-tag') }}" title="{{ trans('community.support.convinced.support') }}"> 18 + <a class="supporter-eyecatch__link" href="{{ route('store.products.show', 'supporter-tag') }}" title="{{ osu_trans('community.support.convinced.support') }}"> 19 19 <div class="supporter-heart{{ $supporterStatus['current'] ? ' supporter-heart--active' : '' }}"></div> 20 20 </a> 21 21 <div class="supporter-status__flex-container-inner"> ··· 24 24 </div> 25 25 @if ($supporterStatus['expiration'] !== null) 26 26 <div class="supporter-status__text supporter-status__text--first"> 27 - {!! trans('community.support.supporter_status.'.($supporterStatus['current'] ? 'valid_until' : 'was_valid_until'), [ 27 + {!! osu_trans('community.support.supporter_status.'.($supporterStatus['current'] ? 'valid_until' : 'was_valid_until'), [ 28 28 'date' => '<strong>'.i18n_date($supporterStatus['expiration']).'</strong>' 29 29 ]) !!} 30 30 </div> 31 31 @else 32 32 <div class="supporter-status__text"> 33 - {!! trans('community.support.supporter_status.not_yet') !!} 33 + {!! osu_trans('community.support.supporter_status.not_yet') !!} 34 34 </div> 35 35 @endif 36 36 @if ($supporterStatus['tags'] > 0) 37 37 <div class="supporter-status__text"> 38 - {!! trans('community.support.supporter_status.contribution', [ 38 + {!! osu_trans('community.support.supporter_status.contribution', [ 39 39 'dollars' => "<strong>{$supporterStatus['dollars']}</strong>", 40 40 'tags' => "<strong>{$supporterStatus['tags']}</strong>" 41 41 ]) !!} ··· 43 43 @endif 44 44 @if ($supporterStatus['giftedTags'] > 0) 45 45 <div class="supporter-status__text"> 46 - {!! trans('community.support.supporter_status.gifted', [ 46 + {!! osu_trans('community.support.supporter_status.gifted', [ 47 47 'giftedDollars' => "<strong>{$supporterStatus['giftedDollars']}</strong>", 48 48 'giftedTags' => "<strong>{$supporterStatus['giftedTags']}</strong>" 49 49 ]) !!} ··· 76 76 <div class="supporter-quote__signature">— Dean "peppy" Herbert, creator of osu!</div> 77 77 </div> 78 78 <h3 class="supporter__title"> 79 - {{ trans('community.support.why-support.title') }} 79 + {{ osu_trans('community.support.why-support.title') }} 80 80 </h3> 81 81 @include('home._supporter_perk_group', ['group' => $data['support-reasons']]) 82 82 <div class="supporter__block supporter__block--bg-0"> 83 83 <h3 class="supporter__title"> 84 - {{ trans('community.support.perks.title') }} 84 + {{ osu_trans('community.support.perks.title') }} 85 85 </h3> 86 86 </div> 87 87 @foreach($data['perks'] as $index => $group) ··· 90 90 </div> 91 91 @endforeach 92 92 <h3 class="supporter__title supporter__title--convinced"> 93 - {{ trans('community.support.convinced.title') }} 93 + {{ osu_trans('community.support.convinced.title') }} 94 94 </h3> 95 95 <div class="supporter-eyecatch"> 96 96 <div class="supporter-eyecatch__box"> ··· 98 98 <div class="supporter-heart supporter-heart--larger supporter-heart--active"></div> 99 99 </a> 100 100 <div class="supporter-eyecatch__text supporter-eyecatch__text--main"> 101 - {{ trans('community.support.convinced.support') }} 101 + {{ osu_trans('community.support.convinced.support') }} 102 102 </div> 103 103 <div class="supporter-eyecatch__text supporter-eyecatch__text--sub-1"> 104 - {{ trans('community.support.convinced.gift') }} 104 + {{ osu_trans('community.support.convinced.gift') }} 105 105 </div> 106 106 <div class="supporter-eyecatch__text supporter-eyecatch__text--sub-2"> 107 - {{ trans('community.support.convinced.instructions') }} 107 + {{ osu_trans('community.support.convinced.instructions') }} 108 108 </div> 109 109 </div> 110 110 </div>
+7 -7
resources/views/home/user.blade.php
··· 16 16 <div class="osu-page"> 17 17 <div class="user-home"> 18 18 <div class="user-home__news"> 19 - <h2 class="user-home__news-title">{{ trans('home.user.news.title') }}</h2> 19 + <h2 class="user-home__news-title">{{ osu_trans('home.user.news.title') }}</h2> 20 20 21 21 @foreach ($news as $post) 22 22 @if ($loop->iteration > 3) ··· 43 43 href="{{ route('news.index') }}" 44 44 class="user-home__news-posts-group user-home__news-posts-group--more" 45 45 > 46 - {{ trans('common.buttons.see_more') }} 46 + {{ osu_trans('common.buttons.see_more') }} 47 47 </a> 48 48 @endif 49 49 </div> ··· 55 55 <div class="user-home__button"> 56 56 @include('home._user_giant_button', [ 57 57 'href' => route('download'), 58 - 'label' => trans('home.user.buttons.download'), 58 + 'label' => osu_trans('home.user.buttons.download'), 59 59 'icon' => 'download', 60 60 ]) 61 61 </div> ··· 63 63 <div class="user-home__button"> 64 64 @include('home._user_giant_button', [ 65 65 'href' => route('support-the-game'), 66 - 'label' => trans('home.user.buttons.support'), 66 + 'label' => osu_trans('home.user.buttons.support'), 67 67 'icon' => 'heart', 68 68 'colour' => 'green' 69 69 ]) ··· 72 72 <div class="user-home__button"> 73 73 @include('home._user_giant_button', [ 74 74 'href' => route('store.products.index'), 75 - 'label' => trans('home.user.buttons.store'), 75 + 'label' => osu_trans('home.user.buttons.store'), 76 76 'icon' => 'shopping-cart', 77 77 'colour' => 'pink-darker' 78 78 ]) ··· 80 80 </div> 81 81 82 82 <h3 class='user-home__beatmap-list-title'> 83 - {{ trans('home.user.beatmaps.new') }} 83 + {{ osu_trans('home.user.beatmaps.new') }} 84 84 </h3> 85 85 86 86 <div class="user-home__beatmapsets"> ··· 90 90 </div> 91 91 92 92 <h3 class='user-home__beatmap-list-title'> 93 - {{ trans('home.user.beatmaps.popular') }} 93 + {{ osu_trans('home.user.beatmaps.popular') }} 94 94 </h3> 95 95 96 96 <div class="user-home__beatmapsets">
+1 -1
resources/views/layout/_header_mobile.blade.php
··· 62 62 </span> 63 63 64 64 <span class="u-ellipsis-overflow"> 65 - {{ trans('layout.popup_login.button') }} 65 + {{ osu_trans('layout.popup_login.button') }} 66 66 </span> 67 67 </button> 68 68 @endif
+1 -1
resources/views/layout/_header_user.blade.php
··· 14 14 <button 15 15 class="{{ $class }} avatar--guest" 16 16 data-click-menu-target="nav2-login-box" 17 - title="{{ trans('users.anonymous.login_link') }}" 17 + title="{{ osu_trans('users.anonymous.login_link') }}" 18 18 ></button> 19 19 @else 20 20 <a
+3 -3
resources/views/layout/_nav2.blade.php
··· 23 23 data-menu-show-delay="0" 24 24 > 25 25 <span class="u-relative"> 26 - {{ trans("layout.menu.{$section}._") }} 26 + {{ osu_trans("layout.menu.{$section}._") }} 27 27 28 28 @if ($section === $currentSection && !($isSearchPage ?? false)) 29 29 <span class="nav2__menu-link-bar u-section--bg-normal"></span> ··· 48 48 @continue 49 49 @endif 50 50 <a class="simple-menu__item u-section-{{ $section }}--before-bg-normal" href="{{ $link }}"> 51 - {{ trans("layout.menu.{$section}.{$action}") }} 51 + {{ osu_trans("layout.menu.{$section}.{$action}") }} 52 52 </a> 53 53 @endforeach 54 54 </div> ··· 84 84 <a 85 85 href="{{ route('support-the-game') }}" 86 86 class="nav-button nav-button--support" 87 - title="{{ trans('page_title.main.home_controller.support_the_game') }}" 87 + title="{{ osu_trans('page_title.main.home_controller.support_the_game') }}" 88 88 > 89 89 <span class="fas fa-heart"></span> 90 90 </a>
+9 -9
resources/views/layout/_popup_login.blade.php
··· 24 24 ', 25 25 'data-remote' => true, 26 26 ]) !!} 27 - <h2 class="login-box__row login-box__row--title">{{ trans('layout.popup_login.login.title') }}</h2> 27 + <h2 class="login-box__row login-box__row--title">{{ osu_trans('layout.popup_login.login.title') }}</h2> 28 28 29 29 <div class="login-box__row login-box__row--inputs"> 30 30 <input 31 31 class="login-box__form-input js-login-form-input js-nav2--autofocus" 32 32 name="username" 33 - placeholder="{{ trans('layout.popup_login.login.username') }}" 33 + placeholder="{{ osu_trans('layout.popup_login.login.username') }}" 34 34 required 35 35 /> 36 36 <input 37 37 class="login-box__form-input js-login-form-input" 38 38 name="password" 39 39 type="password" 40 - placeholder="{{ trans('layout.popup_login.login.password') }}" 40 + placeholder="{{ osu_trans('layout.popup_login.login.password') }}" 41 41 required 42 42 /> 43 43 </div> ··· 53 53 54 54 <div class="login-box__row"> 55 55 <a href="{{ route('password-reset') }}" class="login-box__link js-nav--hide"> 56 - {{ trans('layout.popup_login.login.forgot') }} 56 + {{ osu_trans('layout.popup_login.login.forgot') }} 57 57 </a> 58 58 </div> 59 59 ··· 61 61 <div class="login-box__action"> 62 62 <button 63 63 class="btn-osu-big btn-osu-big--nav-popup js-captcha--submit-button" 64 - data-disable-with="{{ trans('users.login.button_posting') }}" 64 + data-disable-with="{{ osu_trans('users.login.button_posting') }}" 65 65 > 66 66 <div class="btn-osu-big__content"> 67 67 <span class="btn-osu-big__left"> 68 - {{ trans('users.login._') }} 68 + {{ osu_trans('users.login._') }} 69 69 </span> 70 70 71 71 <span class="fas fa-fw fa-sign-in-alt"></span> ··· 77 77 78 78 <div class="login-box__section login-box__section--register"> 79 79 <h2 class="login-box__row login-box__row--title"> 80 - {{ trans('layout.popup_login.register.title') }} 80 + {{ osu_trans('layout.popup_login.register.title') }} 81 81 </h2> 82 82 83 83 <div class="login-box__row"> 84 - {{ trans('layout.popup_login.register.info') }} 84 + {{ osu_trans('layout.popup_login.register.info') }} 85 85 </div> 86 86 87 87 <div class="login-box__row login-box__row--actions"> ··· 89 89 <a href="{{ route('download') }}" class="btn-osu-big btn-osu-big--nav-popup"> 90 90 <div class="btn-osu-big__content"> 91 91 <span class="btn-osu-big__left"> 92 - {{ trans('layout.popup_login.register.download') }} 92 + {{ osu_trans('layout.popup_login.register.download') }} 93 93 </span> 94 94 95 95 <span class="fas fa-fw fa-download"></span>
+6 -6
resources/views/layout/_popup_user.blade.php
··· 20 20 class="simple-menu__item" 21 21 href="{{ route('users.show', Auth::user()) }}" 22 22 > 23 - {{ trans('layout.popup_user.links.profile') }} 23 + {{ osu_trans('layout.popup_user.links.profile') }} 24 24 </a> 25 25 26 26 <a class="simple-menu__item" href="{{ route('friends.index') }}"> 27 - {{ trans('layout.popup_user.links.friends') }} 27 + {{ osu_trans('layout.popup_user.links.friends') }} 28 28 </a> 29 29 30 30 <a class="simple-menu__item" href="{{ route('follows.index', ['subtype' => App\Models\Follow::DEFAULT_SUBTYPE]) }}"> 31 - {{ trans('layout.popup_user.links.follows') }} 31 + {{ osu_trans('layout.popup_user.links.follows') }} 32 32 </a> 33 33 34 34 <a class="simple-menu__item" href="{{ route('account.edit') }}"> 35 - {{ trans('layout.popup_user.links.account-edit') }} 35 + {{ osu_trans('layout.popup_user.links.account-edit') }} 36 36 </a> 37 37 38 38 <button 39 39 class="js-logout-link simple-menu__item" 40 40 type="button" 41 41 data-url="{{ route('logout') }}" 42 - data-confirm="{{ trans('users.logout_confirm') }}" 42 + data-confirm="{{ osu_trans('users.logout_confirm') }}" 43 43 data-method="delete" 44 44 data-remote="1" 45 45 > 46 - {{ trans('layout.popup_user.links.logout') }} 46 + {{ osu_trans('layout.popup_user.links.logout') }} 47 47 </button> 48 48 </div>
+4 -4
resources/views/layout/error.blade.php
··· 11 11 12 12 <div class="osu-page osu-page--generic text-center"> 13 13 <p> 14 - {{ trans("layout.errors.{$statusCode}.error") }} 14 + {{ osu_trans("layout.errors.{$statusCode}.error") }} 15 15 </p> 16 16 17 17 @if (isset($exceptionMessage)) ··· 19 19 @endif 20 20 21 21 <p> 22 - {!! trans("layout.errors.{$statusCode}.description", ['link' => 23 - '<a class="blue_normal" href="'.trans("layout.errors.{$statusCode}.link.href").'">'.trans("layout.errors.{$statusCode}.link.text").'</a>', 22 + {!! osu_trans("layout.errors.{$statusCode}.description", ['link' => 23 + '<a class="blue_normal" href="'.osu_trans("layout.errors.{$statusCode}.link.href").'">'.osu_trans("layout.errors.{$statusCode}.link.text").'</a>', 24 24 ]) !!} 25 25 </p> 26 26 27 27 @if (isset($ref)) 28 - <h4>{{ trans('layout.errors.reference') }}<br><small>{{ $ref }}</small></h4> 28 + <h4>{{ osu_trans('layout.errors.reference') }}<br><small>{{ $ref }}</small></h4> 29 29 @endif 30 30 </div> 31 31
+1 -1
resources/views/layout/footer.blade.php
··· 7 7 <div class="footer__row"> 8 8 @foreach (footer_legal_links() as $action => $link) 9 9 <a class="footer__link" href="{{ $link }}"> 10 - {{ trans("layout.footer.legal.{$action}") }} 10 + {{ osu_trans("layout.footer.legal.{$action}") }} 11 11 </a> 12 12 @endforeach 13 13
+5 -5
resources/views/layout/gallery_window.blade.php
··· 30 30 31 31 <div class="pswp__counter"></div> 32 32 33 - <button type="button" class="pswp__button pswp__button--close" title="{{ trans('layout.gallery.close') }}"></button> 33 + <button type="button" class="pswp__button pswp__button--close" title="{{ osu_trans('layout.gallery.close') }}"></button> 34 34 35 - <button type="button" class="pswp__button pswp__button--fs" title="{{ trans('layout.gallery.fullscreen') }}"></button> 35 + <button type="button" class="pswp__button pswp__button--fs" title="{{ osu_trans('layout.gallery.fullscreen') }}"></button> 36 36 37 - <button type="button" class="pswp__button pswp__button--zoom" title="{{ trans('layout.gallery.zoom') }}"></button> 37 + <button type="button" class="pswp__button pswp__button--zoom" title="{{ osu_trans('layout.gallery.zoom') }}"></button> 38 38 39 39 <div class="js-pswp-buttons"></div> 40 40 ··· 53 53 <div class="pswp__share-tooltip"></div> 54 54 </div> 55 55 56 - <button type="button" class="pswp__button pswp__button--arrow--left" title="{{ trans('layout.gallery.previous') }}"> 56 + <button type="button" class="pswp__button pswp__button--arrow--left" title="{{ osu_trans('layout.gallery.previous') }}"> 57 57 </button> 58 58 59 - <button type="button" class="pswp__button pswp__button--arrow--right" title="{{ trans('layout.gallery.next') }}"> 59 + <button type="button" class="pswp__button pswp__button--arrow--right" title="{{ osu_trans('layout.gallery.next') }}"> 60 60 </button> 61 61 62 62 <div class="pswp__caption">
+2 -2
resources/views/layout/header_mobile/nav.blade.php
··· 20 20 <i class="fas fa-chevron-down"></i> 21 21 </span> 22 22 23 - {{ trans("layout.menu.{$section}._") }} 23 + {{ osu_trans("layout.menu.{$section}._") }} 24 24 </a> 25 25 26 26 <ul class="navbar-mobile-item__submenu js-click-menu" data-click-menu-id="nav-mobile-{{ $section }}"> ··· 33 33 class="navbar-mobile-item__submenu-item js-click-menu--close" 34 34 href="{{ $link }}" 35 35 > 36 - {{ trans("layout.menu.$section.$action") }} 36 + {{ osu_trans("layout.menu.$section.$action") }} 37 37 </a> 38 38 </li> 39 39 @endforeach
+8 -8
resources/views/layout/header_mobile/user.blade.php
··· 13 13 class="navbar-mobile-item__main" 14 14 href="{{ route('users.show', Auth::user()) }}" 15 15 > 16 - {{ trans('layout.popup_user.links.profile') }} 16 + {{ osu_trans('layout.popup_user.links.profile') }} 17 17 </a> 18 18 19 19 <a class="navbar-mobile-item__main" href="{{ route('friends.index') }}"> 20 - {{ trans('layout.popup_user.links.friends') }} 20 + {{ osu_trans('layout.popup_user.links.friends') }} 21 21 </a> 22 22 23 23 <a class="navbar-mobile-item__main" href="{{ route('follows.index', ['subtype' => App\Models\Follow::DEFAULT_SUBTYPE]) }}"> 24 - {{ trans('layout.popup_user.links.follows') }} 24 + {{ osu_trans('layout.popup_user.links.follows') }} 25 25 </a> 26 26 27 27 <a class="navbar-mobile-item__main" href="{{ route('account.edit') }}"> 28 - {{ trans('layout.popup_user.links.account-edit') }} 28 + {{ osu_trans('layout.popup_user.links.account-edit') }} 29 29 </a> 30 30 31 31 <button 32 32 class="js-logout-link navbar-mobile-item__main" 33 33 type="button" 34 34 data-url="{{ route('logout') }}" 35 - data-confirm="{{ trans('users.logout_confirm') }}" 35 + data-confirm="{{ osu_trans('users.logout_confirm') }}" 36 36 data-method="delete" 37 37 data-remote="1" 38 38 > 39 - {{ trans('layout.popup_user.links.logout') }} 39 + {{ osu_trans('layout.popup_user.links.logout') }} 40 40 </button> 41 41 @else 42 42 <a 43 43 class="js-user-link navbar-mobile-item__main navbar-mobile-item__main--user" 44 44 href="#" 45 - title="{{ trans('users.anonymous.login_link') }}" 45 + title="{{ osu_trans('users.anonymous.login_link') }}" 46 46 > 47 47 <span class="avatar avatar--guest avatar--navbar-mobile"></span> 48 48 49 - {{ trans('users.anonymous.username') }} 49 + {{ osu_trans('users.anonymous.username') }} 50 50 </a> 51 51 @endif 52 52 </div>
+1 -1
resources/views/layout/metadata.blade.php
··· 11 11 <meta name="theme-color" content="hsl({{ $currentHue }}, 10%, 40%)"> {{-- @osu-colour-b1 --}} 12 12 13 13 <meta charset="utf-8"> 14 - <meta name="description" content="{{ $pageDescription ?? trans('layout.defaults.page_description') }}"> 14 + <meta name="description" content="{{ $pageDescription ?? osu_trans('layout.defaults.page_description') }}"> 15 15 <meta name="keywords" content="osu, peppy, ouendan, elite, beat, agents, ds, windows, game, taiko, tatsujin, simulator, sim, xna, ddr, beatmania, osu!, osume"> 16 16 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 17 17
+1 -1
resources/views/layout/popup.blade.php
··· 6 6 <div style="padding-left: 50px; padding-right: 50px"> 7 7 <div class="alert alert-dismissable alert-info"> 8 8 <button class="close" data-dismiss="alert" aria-hidden="true">&times;</button> 9 - {{{ trans(Session::get("popup")) }}} 9 + {{{ osu_trans(Session::get("popup")) }}} 10 10 </div> 11 11 </div> 12 12 @endif
+1 -1
resources/views/livestreams/_featured.blade.php
··· 39 39 <button 40 40 type="button" 41 41 class="btn-circle btn-circle--activated" 42 - data-confirm="{{ trans('livestreams.promote.unpin') }}" 42 + data-confirm="{{ osu_trans('livestreams.promote.unpin') }}" 43 43 data-remote="1" 44 44 data-method="POST" 45 45 data-url="{{ route('livestreams.promote') }}"
+1 -1
resources/views/livestreams/_livestream.blade.php
··· 23 23 <button 24 24 type="button" 25 25 class="btn-circle" 26 - data-confirm="{{ trans('livestreams.promote.pin') }}" 26 + data-confirm="{{ osu_trans('livestreams.promote.pin') }}" 27 27 data-remote="1" 28 28 data-method="POST" 29 29 data-url="{{ route('livestreams.promote', ['id' => $stream->data['id']]) }}"
+2 -2
resources/views/livestreams/index.blade.php
··· 8 8 @include('layout._page_header_v4', ['params' => ['theme' => 'livestreams']]) 9 9 10 10 <div class="osu-page osu-page--description"> 11 - {!! trans('livestreams.top-headers.description', [ 11 + {!! osu_trans('livestreams.top-headers.description', [ 12 12 'link' => link_to( 13 13 wiki_url('Guides/Live_Streaming_osu!'), 14 - trans('livestreams.top-headers.link') 14 + osu_trans('livestreams.top-headers.link') 15 15 ), 16 16 ]) !!} 17 17 </div>
+2 -2
resources/views/master.blade.php
··· 65 65 @if (Auth::user() && Auth::user()->isRestricted()) 66 66 @include('objects._notification_banner', [ 67 67 'type' => 'alert', 68 - 'title' => trans('users.restricted_banner.title'), 69 - 'message' => trans('users.restricted_banner.message'), 68 + 'title' => osu_trans('users.restricted_banner.title'), 69 + 'message' => osu_trans('users.restricted_banner.message'), 70 70 ]) 71 71 @endif 72 72
+3 -3
resources/views/multiplayer/rooms/_rankings_table.blade.php
··· 8 8 <th class="ranking-page-table__heading"></th> 9 9 <th class="ranking-page-table__heading ranking-page-table__heading--main"></th> 10 10 <th class="ranking-page-table__heading"> 11 - {{ trans('rankings.stat.accuracy') }} 11 + {{ osu_trans('rankings.stat.accuracy') }} 12 12 </th> 13 13 <th class="ranking-page-table__heading"> 14 - {{ trans('rankings.stat.play_count') }} 14 + {{ osu_trans('rankings.stat.play_count') }} 15 15 </th> 16 16 <th class="ranking-page-table__heading ranking-page-table__heading--focused"> 17 - {{ trans('rankings.stat.total_score') }} 17 + {{ osu_trans('rankings.stat.total_score') }} 18 18 </th> 19 19 </tr> 20 20 </thead>
+5 -5
resources/views/multiplayer/rooms/show.blade.php
··· 12 12 'hasMode' => false, 13 13 'hasPager' => true, 14 14 'spotlight' => null, 15 - 'titlePrepend' => trans('rankings.type.multiplayer').': '.$room->name, 15 + 'titlePrepend' => osu_trans('rankings.type.multiplayer').': '.$room->name, 16 16 'type' => 'multiplayer', 17 17 ]) 18 18 ··· 38 38 <div class="grid-items"> 39 39 <div class="counter-box counter-box--info"> 40 40 <div class="counter-box__title"> 41 - {{ trans('rankings.spotlight.start_date') }} 41 + {{ osu_trans('rankings.spotlight.start_date') }} 42 42 </div> 43 43 <div class="counter-box__count"> 44 44 {{ $room->starts_at->formatLocalized('%Y-%m-%d') }} ··· 47 47 @if ($room->ends_at !== null) 48 48 <div class="counter-box counter-box--info"> 49 49 <div class="counter-box__title"> 50 - {{ trans('rankings.spotlight.end_date') }} 50 + {{ osu_trans('rankings.spotlight.end_date') }} 51 51 </div> 52 52 <div class="counter-box__count"> 53 53 {{ $room->ends_at->formatLocalized('%Y-%m-%d') }} ··· 56 56 @endif 57 57 <div class="counter-box counter-box--info"> 58 58 <div class="counter-box__title"> 59 - {{ trans('rankings.spotlight.map_count') }} 59 + {{ osu_trans('rankings.spotlight.map_count') }} 60 60 </div> 61 61 <div class="counter-box__count"> 62 62 {{ i18n_number_format(count($beatmaps)) }} ··· 64 64 </div> 65 65 <div class="counter-box counter-box--info"> 66 66 <div class="counter-box__title"> 67 - {{ trans('rankings.spotlight.participants') }} 67 + {{ osu_trans('rankings.spotlight.participants') }} 68 68 </div> 69 69 <div class="counter-box__count"> 70 70 {{ i18n_number_format($room->participant_count) }}
+4 -4
resources/views/objects/_pagination_simple.blade.php
··· 12 12 <span class="pagination-v2__link pagination-v2__link--quick pagination-v2__link--disabled"> 13 13 <i class="fas fa-angle-left"></i> 14 14 <span class="hidden-xs"> 15 - {{ trans('common.pagination.previous') }} 15 + {{ osu_trans('common.pagination.previous') }} 16 16 </span> 17 17 </span> 18 18 @else 19 19 <a class="pagination-v2__link pagination-v2__link--link pagination-v2__link--quick" href="{{ $object->url($currentPage - 1) }}"> 20 20 <i class="fas fa-angle-left"></i> 21 21 <span class="hidden-xs"> 22 - {{ trans('common.pagination.previous') }} 22 + {{ osu_trans('common.pagination.previous') }} 23 23 </span> 24 24 </a> 25 25 @endif ··· 60 60 @if ($object->hasMorePages()) 61 61 <a class="pagination-v2__link pagination-v2__link--link pagination-v2__link--quick" href="{{ $object->url($currentPage + 1) }}"> 62 62 <span class="hidden-xs"> 63 - {{ trans('common.pagination.next') }} 63 + {{ osu_trans('common.pagination.next') }} 64 64 </span> 65 65 <i class="fas fa-angle-right"></i> 66 66 </a> 67 67 @else 68 68 <span class="pagination-v2__link pagination-v2__link--quick pagination-v2__link--disabled"> 69 69 <span class="hidden-xs"> 70 - {{ trans('common.pagination.next') }} 70 + {{ osu_trans('common.pagination.next') }} 71 71 </span> 72 72 <i class="fas fa-angle-right"></i> 73 73 </span>
+4 -4
resources/views/objects/_pagination_v2.blade.php
··· 17 17 <span class="pagination-v2__link pagination-v2__link--quick pagination-v2__link--disabled"> 18 18 <i class="fas fa-angle-left"></i> 19 19 <span class="hidden-xs"> 20 - {{ trans('common.pagination.previous') }} 20 + {{ osu_trans('common.pagination.previous') }} 21 21 </span> 22 22 </span> 23 23 @else 24 24 <a class="pagination-v2__link pagination-v2__link--quick" href="{{ $object->url($currentPage - 1) }}"> 25 25 <i class="fas fa-angle-left"></i> 26 26 <span class="hidden-xs"> 27 - {{ trans('common.pagination.previous') }} 27 + {{ osu_trans('common.pagination.previous') }} 28 28 </span> 29 29 </a> 30 30 @endif ··· 74 74 @if ($currentPage >= $object->lastPage()) 75 75 <span class="pagination-v2__link pagination-v2__link--quick pagination-v2__link--disabled"> 76 76 <span class="hidden-xs"> 77 - {{ trans('common.pagination.next') }} 77 + {{ osu_trans('common.pagination.next') }} 78 78 </span> 79 79 <i class="fas fa-angle-right"></i> 80 80 </span> 81 81 @else 82 82 <a class="pagination-v2__link pagination-v2__link--quick" href="{{ $object->url($currentPage + 1) }}"> 83 83 <span class="hidden-xs"> 84 - {{ trans('common.pagination.next') }} 84 + {{ osu_trans('common.pagination.next') }} 85 85 </span> 86 86 <i class="fas fa-angle-right"></i> 87 87 </a>
+6 -6
resources/views/objects/_popup_support_osu.blade.php
··· 5 5 <div class='support-osu-popup'> 6 6 <div class='support-osu-popup__content'> 7 7 <div> 8 - <h1 class='support-osu-popup__header'>{{trans('home.support-osu.title')}}</h1> 9 - <h2 class='support-osu-popup__subtitle'>{{trans('home.support-osu.subtitle')}}</h2> 8 + <h1 class='support-osu-popup__header'>{{osu_trans('home.support-osu.title')}}</h1> 9 + <h2 class='support-osu-popup__subtitle'>{{osu_trans('home.support-osu.subtitle')}}</h2> 10 10 </div> 11 - <div>{{trans('home.support-osu.body.part-1')}}</div> 11 + <div>{{osu_trans('home.support-osu.body.part-1')}}</div> 12 12 <video 13 13 autoplay 14 14 loop ··· 17 17 class='support-osu-popup__video' 18 18 src='{{config('osu.support.video_url')}}' 19 19 ></video> 20 - <div>{!!trans('home.support-osu.body.part-2')!!}</div> 20 + <div>{!!osu_trans('home.support-osu.body.part-2')!!}</div> 21 21 <hr class='support-osu-popup__divider'/> 22 22 <a href='{{route('support-the-game')}}' class='btn-osu-big btn-osu-big--mega'> 23 23 <div> 24 - {{trans('home.support-osu.find-out-more')}} 24 + {{osu_trans('home.support-osu.find-out-more')}} 25 25 <span class='fas fa-chevron-circle-right'></span> 26 26 </div> 27 27 </a> 28 - <div>{{trans('home.support-osu.download-starting')}}</div> 28 + <div>{{osu_trans('home.support-osu.download-starting')}}</div> 29 29 </div> 30 30 <div class='support-osu-popup__pippi'> 31 31 <a href="{{route('support-the-game')}}" class='support-osu-popup__heart'></a>
+1 -1
resources/views/objects/_show_more_link.blade.php
··· 32 32 <span class="fas fa-angle-{{ $arrow }}"></span> 33 33 </span> 34 34 <span class="{{ $bn }}__label-text"> 35 - {{ trans('common.buttons.show_more') }} 35 + {{ osu_trans('common.buttons.show_more') }} 36 36 </span> 37 37 <span class="{{ $bn }}__label-icon"> 38 38 <span class="fas fa-angle-{{ $arrow }}"></span>
+1 -1
resources/views/objects/_user_group_badge.blade.php
··· 10 10 $title = $group->group_name; 11 11 12 12 if ($hasPlaymodes) { 13 - $playmodeNames = implode(', ', array_map(fn ($mode) => trans("beatmaps.mode.{$mode}"), $playmodes)); 13 + $playmodeNames = implode(', ', array_map(fn ($mode) => osu_trans("beatmaps.mode.{$mode}"), $playmodes)); 14 14 $title .= " ({$playmodeNames})"; 15 15 } 16 16 @endphp
+16 -16
resources/views/objects/bat-tools.blade.php
··· 9 9 <div class="col-xs-12"> 10 10 {!! Form::open(["class" => "form-horizontal"]) !!} 11 11 <div class="form-group"> 12 - <label for="beatmap-title" class="control-label col-sm-2">{{{ trans("beatmaps.modding.metadata.title") }}}</label> 12 + <label for="beatmap-title" class="control-label col-sm-2">{{{ osu_trans("beatmaps.modding.metadata.title") }}}</label> 13 13 <div class="col-sm-10"> 14 - <input type="text" class="form-control" value="{{{ $beatmap["title"] }}}" placeholder="{{{ trans("beatmaps.modding.metadata.title") }}}"> 14 + <input type="text" class="form-control" value="{{{ $beatmap["title"] }}}" placeholder="{{{ osu_trans("beatmaps.modding.metadata.title") }}}"> 15 15 </div> 16 16 </div> 17 17 <div class="form-group"> 18 - <label for="beatmap-title" class="control-label col-sm-2">{{{ trans("beatmaps.modding.metadata.artist") }}}</label> 18 + <label for="beatmap-title" class="control-label col-sm-2">{{{ osu_trans("beatmaps.modding.metadata.artist") }}}</label> 19 19 <div class="col-sm-10"> 20 - <input type="text" class="form-control" value="{{{ $beatmap["artist"] }}}" placeholder="{{{ trans("beatmaps.modding.metadata.artist") }}}"> 20 + <input type="text" class="form-control" value="{{{ $beatmap["artist"] }}}" placeholder="{{{ osu_trans("beatmaps.modding.metadata.artist") }}}"> 21 21 </div> 22 22 </div> 23 23 <div class="form-group"> 24 - <label for="beatmap-title" class="control-label col-sm-2">{{{ trans("beatmaps.modding.metadata.tags") }}}</label> 24 + <label for="beatmap-title" class="control-label col-sm-2">{{{ osu_trans("beatmaps.modding.metadata.tags") }}}</label> 25 25 <div class="col-sm-10"> 26 - <input type="text" class="form-control" value="{{{ $beatmap["tags"] }}}" placeholder="{{{ trans("beatmaps.modding.metadata.tags") }}}"> 26 + <input type="text" class="form-control" value="{{{ $beatmap["tags"] }}}" placeholder="{{{ osu_trans("beatmaps.modding.metadata.tags") }}}"> 27 27 </div> 28 28 </div> 29 29 <div class="form-group"> 30 - <label for="beatmap-title" class="control-label col-sm-2">{{{ trans("beatmaps.modding.metadata.source") }}}</label> 30 + <label for="beatmap-title" class="control-label col-sm-2">{{{ osu_trans("beatmaps.modding.metadata.source") }}}</label> 31 31 <div class="col-sm-10"> 32 - <input type="text" class="form-control" value="{{{ $beatmap["source"] }}}" placeholder="{{{ trans("beatmaps.modding.metadata.source") }}}"> 32 + <input type="text" class="form-control" value="{{{ $beatmap["source"] }}}" placeholder="{{{ osu_trans("beatmaps.modding.metadata.source") }}}"> 33 33 </div> 34 34 </div> 35 35 <div class="form-group"> 36 - <label for="beatmap-title" class="control-label col-sm-2">{{{ trans("beatmaps.modding.metadata.unicode.title") }}}</label> 36 + <label for="beatmap-title" class="control-label col-sm-2">{{{ osu_trans("beatmaps.modding.metadata.unicode.title") }}}</label> 37 37 <div class="col-sm-10"> 38 - <input type="text" class="form-control" value="{{{ $beatmap["title_unicode"] }}}" placeholder="{{{ trans("beatmaps.modding.metadata.unicode.title") }}}"> 38 + <input type="text" class="form-control" value="{{{ $beatmap["title_unicode"] }}}" placeholder="{{{ osu_trans("beatmaps.modding.metadata.unicode.title") }}}"> 39 39 </div> 40 40 </div> 41 41 <div class="form-group"> 42 - <label for="beatmap-title" class="control-label col-sm-2">{{{ trans("beatmaps.modding.metadata.unicode.artist") }}}</label> 42 + <label for="beatmap-title" class="control-label col-sm-2">{{{ osu_trans("beatmaps.modding.metadata.unicode.artist") }}}</label> 43 43 <div class="col-sm-10"> 44 - <input type="text" class="form-control" value="{{{ $beatmap["artist_unicode"] }}}" placeholder="{{{ trans("beatmaps.modding.metadata.unicode.artist") }}}"> 44 + <input type="text" class="form-control" value="{{{ $beatmap["artist_unicode"] }}}" placeholder="{{{ osu_trans("beatmaps.modding.metadata.unicode.artist") }}}"> 45 45 </div> 46 46 </div> 47 47 ··· 49 49 <h3 class="text-danger col-sm-12">Danger Zone&trade;</h3> 50 50 <div class="col-sm-6"> 51 51 <button class="btn btn-warning btn-large form-control"> 52 - {{{ trans("beatmaps.bat-tools.buttons.delete-map") }}} 52 + {{{ osu_trans("beatmaps.bat-tools.buttons.delete-map") }}} 53 53 </button> 54 54 </div> 55 55 <div class="col-sm-6"> 56 56 <button class="btn btn-danger btn-large form-control"> 57 - {{{ trans("beatmaps.bat-tools.buttons.unrank-map") }}} 57 + {{{ osu_trans("beatmaps.bat-tools.buttons.unrank-map") }}} 58 58 </button> 59 59 </div> 60 60 </div> 61 61 <div class="form-group"> 62 62 <div class="col-sm-6"> 63 63 <button class="btn btn-info btn-large form-control"> 64 - {{{ trans("beatmaps.bat-tools.buttons.delete-scores") }}} 64 + {{{ osu_trans("beatmaps.bat-tools.buttons.delete-scores") }}} 65 65 </button> 66 66 </div> 67 67 <div class="col-sm-6"> 68 68 <button class="btn btn-primary btn-large form-control"> 69 - {{{ trans("beatmaps.bat-tools.buttons.graveyard-map") }}} 69 + {{{ osu_trans("beatmaps.bat-tools.buttons.graveyard-map") }}} 70 70 </button> 71 71 </div> 72 72 </div>
+7 -7
resources/views/objects/search/_forum_options.blade.php
··· 27 27 @if ($fields['user'] !== null) 28 28 <label class="search-forum-options__input-group"> 29 29 <div class="search-forum-options__label"> 30 - {{ trans('home.search.forum_post.label.username') }} 30 + {{ osu_trans('home.search.forum_post.label.username') }} 31 31 </div> 32 32 33 33 <input ··· 46 46 @if ($fields['topicId'] !== null && present($params[$fields['topicId']] ?? null)) 47 47 <label class="search-forum-options__input-group"> 48 48 <div class="search-forum-options__label"> 49 - {{ trans('home.search.forum_post.label.topic_id') }} 49 + {{ osu_trans('home.search.forum_post.label.topic_id') }} 50 50 </div> 51 51 52 52 <input ··· 58 58 @elseif ($fields['forumId'] !== null) 59 59 <label class="search-forum-options__input-group"> 60 60 <div class="search-forum-options__label"> 61 - {{ trans('home.search.forum_post.label.forum') }} 61 + {{ osu_trans('home.search.forum_post.label.forum') }} 62 62 </div> 63 63 64 64 <div class="form-select"> ··· 67 67 class="form-select__input" 68 68 > 69 69 <option value=""> 70 - {{ trans('home.search.forum_post.all') }} 70 + {{ osu_trans('home.search.forum_post.all') }} 71 71 </option> 72 72 73 73 @foreach (App\Models\Forum\Forum::displayList()->get() as $forum) ··· 91 91 'name' => $fields['includeSubforums'], 92 92 ]) 93 93 94 - {{ trans('home.search.forum_post.label.forum_children') }} 94 + {{ osu_trans('home.search.forum_post.label.forum_children') }} 95 95 </label> 96 96 @endif 97 97 ··· 99 99 <button class="btn-osu-big btn-osu-big--search-advanced"> 100 100 <div class="btn-osu-big__content"> 101 101 <div class="btn-osu-big__left"> 102 - {{ trans('home.search.button') }} 102 + {{ osu_trans('home.search.button') }} 103 103 </div> 104 104 105 105 <div class="btn-osu-big__icon"> ··· 111 111 <button type="button" class="btn-osu-big btn-osu-big--search-advanced js-search--forum-options-reset"> 112 112 <div class="btn-osu-big__content"> 113 113 <div class="btn-osu-big__left"> 114 - {{ trans('common.buttons.reset') }} 114 + {{ osu_trans('common.buttons.reset') }} 115 115 </div> 116 116 117 117 <div class="btn-osu-big__icon">
+1 -1
resources/views/objects/search/_forum_post.blade.php
··· 33 33 @if ($userLink !== null) href="{{ $userLink }}" @endif 34 34 data-user-id="{{ $user->user_id }}" 35 35 > 36 - {!! trans( 36 + {!! osu_trans( 37 37 'forum.post.posted_by', 38 38 ['username' => tag( 39 39 'span',
+2 -2
resources/views/objects/search/_forum_sort.blade.php
··· 10 10 <div class="sort sort--default-padding"> 11 11 <div class="sort__items"> 12 12 <span class="sort__item sort__item--title"> 13 - {{ trans('sort._') }} 13 + {{ osu_trans('sort._') }} 14 14 </span> 15 15 @foreach (App\Libraries\Search\ForumSearchParams::VALID_SORT_FIELDS as $field) 16 16 @php ··· 30 30 class="{{ class_with_modifiers('sort__item', ['active' => $active, 'button' => true]) }}" 31 31 href="{{ route('search', array_merge($query, compact('sort'))) }}" 32 32 > 33 - {{ trans("sort.forum_posts.{$field}") }} 33 + {{ osu_trans("sort.forum_posts.{$field}") }} 34 34 35 35 <span class="sort__item-arrow"> 36 36 <i class="{{ $arrowClass }}"></i>
+2 -2
resources/views/objects/search/_user_sort.blade.php
··· 10 10 <div class="sort sort--default-padding"> 11 11 <div class="sort__items"> 12 12 <span class="sort__item sort__item--title"> 13 - {{ trans('sort._') }} 13 + {{ osu_trans('sort._') }} 14 14 </span> 15 15 @foreach (App\Libraries\Search\UserSearchParams::VALID_SORT_FIELDS as $field) 16 16 @php ··· 30 30 class="{{ class_with_modifiers('sort__item', ['active' => $active, 'button' => true]) }}" 31 31 href="{{ route('search', array_merge($query, compact('sort'))) }}" 32 32 > 33 - {{ trans("sort.users.{$field}") }} 33 + {{ osu_trans("sort.users.{$field}") }} 34 34 35 35 <span class="sort__item-arrow"> 36 36 <i class="{{ $arrowClass }}"></i>
+6 -6
resources/views/packs/_header.blade.php
··· 5 5 @php 6 6 $links = [ 7 7 [ 8 - 'title' => trans('beatmappacks.index.nav_title'), 8 + 'title' => osu_trans('beatmappacks.index.nav_title'), 9 9 'url' => route('packs.index'), 10 10 ], 11 11 ]; ··· 28 28 <div class="beatmap-packs-header"> 29 29 @php 30 30 $scaryTexts = [ 31 - tag('span', ['class' => 'beatmap-packs-header__scary'], trans('beatmappacks.index.blurb.instruction.scary')), 32 - tag('span', ['class' => 'beatmap-packs-header__scary'], trans('beatmappacks.index.blurb.note.scary')), 31 + tag('span', ['class' => 'beatmap-packs-header__scary'], osu_trans('beatmappacks.index.blurb.instruction.scary')), 32 + tag('span', ['class' => 'beatmap-packs-header__scary'], osu_trans('beatmappacks.index.blurb.note.scary')), 33 33 ]; 34 34 @endphp 35 - <p class="beatmap-packs-header__important">{{ trans('beatmappacks.index.blurb.important') }}</p> 36 - <p>{!! trans('beatmappacks.index.blurb.instruction._', ['scary' => $scaryTexts[0]]) !!}</p> 37 - <p>{!! trans('beatmappacks.index.blurb.note._', ['scary' => $scaryTexts[1]]) !!}</p> 35 + <p class="beatmap-packs-header__important">{{ osu_trans('beatmappacks.index.blurb.important') }}</p> 36 + <p>{!! osu_trans('beatmappacks.index.blurb.instruction._', ['scary' => $scaryTexts[0]]) !!}</p> 37 + <p>{!! osu_trans('beatmappacks.index.blurb.note._', ['scary' => $scaryTexts[1]]) !!}</p> 38 38 </div> 39 39 </div>
+2 -2
resources/views/packs/index.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @extends('master', [ 6 - 'pageDescription' => trans('beatmappacks.index.description'), 6 + 'pageDescription' => osu_trans('beatmappacks.index.description'), 7 7 ]) 8 8 9 9 @section('content') ··· 13 13 <ul class="page-mode"> 14 14 @foreach(['standard', 'chart', 'theme', 'artist'] as $mode) 15 15 <li class="page-mode__item"> 16 - @include('packs._type', ['current' => $type, 'type' => $mode, 'title' => trans("beatmappacks.mode.{$mode}")]) 16 + @include('packs._type', ['current' => $type, 'type' => $mode, 'title' => osu_trans("beatmappacks.mode.{$mode}")]) 17 17 @endforeach 18 18 </ul> 19 19
+4 -4
resources/views/packs/raw.blade.php
··· 7 7 <div class="beatmap-pack-description"> 8 8 @if(Auth::check()) 9 9 <a href="{{ $pack->url }}" 10 - class="beatmap-pack-download__link">{{ trans('beatmappacks.show.download') }}</a> 10 + class="beatmap-pack-download__link">{{ osu_trans('beatmappacks.show.download') }}</a> 11 11 @else 12 12 {!! require_login('beatmappacks.require_login._', 'beatmappacks.require_login.link_text') !!} 13 13 @endif 14 14 </div> 15 15 @if ($pack->no_diff_reduction) 16 16 <div class="beatmap-pack-description"> 17 - {!! trans('beatmappacks.show.no_diff_reduction._', [ 18 - 'link' => tag('a', ['href' => wiki_url('Game_modifier')], trans('beatmappacks.show.no_diff_reduction.link')), 17 + {!! osu_trans('beatmappacks.show.no_diff_reduction._', [ 18 + 'link' => tag('a', ['href' => wiki_url('Game_modifier')], osu_trans('beatmappacks.show.no_diff_reduction.link')), 19 19 ]) !!} 20 20 </div> 21 21 @endif ··· 26 26 @endphp 27 27 <li class="beatmap-pack-items__set"> 28 28 <span class="fal fa-extra-mode-{{$mode}} beatmap-pack-items__icon {{ $cleared ? 'beatmap-pack-items__icon--cleared' : '' }}" 29 - title="{{ $cleared ? trans('beatmappacks.show.item.cleared') : trans('beatmappacks.show.item.not_cleared') }}" 29 + title="{{ $cleared ? osu_trans('beatmappacks.show.item.cleared') : osu_trans('beatmappacks.show.item.not_cleared') }}" 30 30 ></span> 31 31 <a href="{{ route('beatmapsets.show', ['beatmapset' => $set->getKey()]) }}" class="beatmap-pack-items__link"> 32 32 <span class="beatmap-pack-items__artist">{{ $set->getDisplayArtist(auth()->user()) }}</span>
+4 -4
resources/views/password_reset/_initial.blade.php
··· 11 11 'data-skip-ajax-error-popup' => '1', 12 12 ]) !!} 13 13 <label class="password-reset__input-group"> 14 - {{ trans('password_reset.starting.username') }} 14 + {{ osu_trans('password_reset.starting.username') }} 15 15 16 16 <input name="username" class="password-reset__input" autofocus> 17 17 ··· 20 20 21 21 <div class="password-reset__input-group"> 22 22 <button class="btn-osu-big btn-osu-big--password-reset"> 23 - {{ trans('password_reset.button.start') }} 23 + {{ osu_trans('password_reset.button.start') }} 24 24 </button> 25 25 </div> 26 26 27 27 @if (config('services.enchant.id') !== null) 28 28 <div> 29 - {!! trans('password_reset.starting.support._', ['button' => tag('a', [ 29 + {!! osu_trans('password_reset.starting.support._', ['button' => tag('a', [ 30 30 'class' => 'js-enchant--show', 31 31 'role' => 'button', 32 32 'href' => '#', 33 - ], trans('password_reset.starting.support.button'))]) !!} 33 + ], osu_trans('password_reset.starting.support.button'))]) !!} 34 34 </div> 35 35 36 36 @include('objects._enchant')
+7 -7
resources/views/password_reset/_reset.blade.php
··· 10 10 'data-reload-on-success' => '1', 11 11 'data-skip-ajax-error-popup' => '1', 12 12 ]) !!} 13 - {!! trans('password_reset.started.title', ['username' => session('password_reset.username')]) !!} 13 + {!! osu_trans('password_reset.started.title', ['username' => session('password_reset.username')]) !!} 14 14 15 15 <div class="password-reset__input-group"> 16 16 <a ··· 19 19 data-method="DELETE" 20 20 data-remote="1" 21 21 > 22 - {{ trans('password_reset.button.cancel') }} 22 + {{ osu_trans('password_reset.button.cancel') }} 23 23 </a> 24 24 </div> 25 25 ··· 30 30 data-method="POST" 31 31 data-remote="1" 32 32 > 33 - {{ trans('password_reset.button.resend') }} 33 + {{ osu_trans('password_reset.button.resend') }} 34 34 </a> 35 35 </div> 36 36 37 37 <label class="password-reset__input-group"> 38 - {{ trans('password_reset.started.verification_key') }} 38 + {{ osu_trans('password_reset.started.verification_key') }} 39 39 40 40 <input name="key" class="password-reset__input" autofocus> 41 41 ··· 43 43 </label> 44 44 45 45 <label class="password-reset__input-group"> 46 - {{ trans('password_reset.started.password') }} 46 + {{ osu_trans('password_reset.started.password') }} 47 47 48 48 <input type="password" class="js-form-confirmation password-reset__input" name="user[password]"> 49 49 ··· 51 51 </label> 52 52 53 53 <label class="password-reset__input-group"> 54 - {{ trans('password_reset.started.password_confirmation') }} 54 + {{ osu_trans('password_reset.started.password_confirmation') }} 55 55 56 56 <input type="password" class="js-form-confirmation password-reset__input" name="user[password_confirmation]"> 57 57 ··· 60 60 61 61 <div class="password-reset__input-group"> 62 62 <button class="btn-osu-big btn-osu-big--password-reset"> 63 - {{ trans('password_reset.button.set') }} 63 + {{ osu_trans('password_reset.button.set') }} 64 64 </button> 65 65 </div> 66 66 {!! Form::close() !!}
+1 -1
resources/views/rankings/_mode_selector.blade.php
··· 14 14 " 15 15 href="{{ $route($tab, $type) }}" 16 16 > 17 - {{ trans("beatmaps.mode.{$tab}") }} 17 + {{ osu_trans("beatmaps.mode.{$tab}") }} 18 18 </a> 19 19 </li> 20 20 @endforeach
+7 -7
resources/views/rankings/_spotlight_rankings_table.blade.php
··· 8 8 <th class="ranking-page-table__heading"></th> 9 9 <th class="ranking-page-table__heading ranking-page-table__heading--main"></th> 10 10 <th class="ranking-page-table__heading"> 11 - {{ trans('rankings.stat.accuracy') }} 11 + {{ osu_trans('rankings.stat.accuracy') }} 12 12 </th> 13 13 <th class="ranking-page-table__heading"> 14 - {{ trans('rankings.stat.play_count') }} 14 + {{ osu_trans('rankings.stat.play_count') }} 15 15 </th> 16 16 <th class="ranking-page-table__heading"> 17 - {{ trans('rankings.stat.total_score') }} 17 + {{ osu_trans('rankings.stat.total_score') }} 18 18 </th> 19 19 <th class="ranking-page-table__heading ranking-page-table__heading--focused"> 20 - {{ trans('rankings.stat.ranked_score') }} 20 + {{ osu_trans('rankings.stat.ranked_score') }} 21 21 </th> 22 22 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 23 - {{ trans('rankings.stat.ss') }} 23 + {{ osu_trans('rankings.stat.ss') }} 24 24 </th> 25 25 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 26 - {{ trans('rankings.stat.s') }} 26 + {{ osu_trans('rankings.stat.s') }} 27 27 </th> 28 28 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 29 - {{ trans('rankings.stat.a') }} 29 + {{ osu_trans('rankings.stat.a') }} 30 30 </th> 31 31 </tr> 32 32 </thead>
+4 -4
resources/views/rankings/charts.blade.php
··· 17 17 <div class="grid-items"> 18 18 <div class="counter-box counter-box--info"> 19 19 <div class="counter-box__title"> 20 - {{ trans('rankings.spotlight.start_date') }} 20 + {{ osu_trans('rankings.spotlight.start_date') }} 21 21 </div> 22 22 <div class="counter-box__count"> 23 23 {{ $spotlight->start_date->formatLocalized('%Y-%m-%d') }} ··· 25 25 </div> 26 26 <div class="counter-box counter-box--info"> 27 27 <div class="counter-box__title"> 28 - {{ trans('rankings.spotlight.end_date') }} 28 + {{ osu_trans('rankings.spotlight.end_date') }} 29 29 </div> 30 30 <div class="counter-box__count"> 31 31 {{ $spotlight->end_date->formatLocalized('%Y-%m-%d') }} ··· 33 33 </div> 34 34 <div class="counter-box counter-box--info"> 35 35 <div class="counter-box__title"> 36 - {{ trans('rankings.spotlight.map_count') }} 36 + {{ osu_trans('rankings.spotlight.map_count') }} 37 37 </div> 38 38 <div class="counter-box__count"> 39 39 {{ count($beatmapsets) }} ··· 41 41 </div> 42 42 <div class="counter-box counter-box--info"> 43 43 <div class="counter-box__title"> 44 - {{ trans('rankings.spotlight.participants') }} 44 + {{ osu_trans('rankings.spotlight.participants') }} 45 45 </div> 46 46 <div class="counter-box__count"> 47 47 {{ i18n_number_format($scoreCount) }}
+6 -6
resources/views/rankings/country.blade.php
··· 11 11 <th class="ranking-page-table__heading"></th> 12 12 <th class="ranking-page-table__heading ranking-page-table__heading--main"></th> 13 13 <th class="ranking-page-table__heading"> 14 - {{ trans('rankings.stat.active_users') }} 14 + {{ osu_trans('rankings.stat.active_users') }} 15 15 </th> 16 16 <th class="ranking-page-table__heading"> 17 - {{ trans('rankings.stat.play_count') }} 17 + {{ osu_trans('rankings.stat.play_count') }} 18 18 </th> 19 19 <th class="ranking-page-table__heading"> 20 - {{ trans('rankings.stat.ranked_score') }} 20 + {{ osu_trans('rankings.stat.ranked_score') }} 21 21 </th> 22 22 <th class="ranking-page-table__heading"> 23 - {{ trans('rankings.stat.average_score') }} 23 + {{ osu_trans('rankings.stat.average_score') }} 24 24 </th> 25 25 <th class="ranking-page-table__heading ranking-page-table__heading--focused"> 26 - {{ trans('rankings.stat.performance') }} 26 + {{ osu_trans('rankings.stat.performance') }} 27 27 </th> 28 28 <th class="ranking-page-table__heading"> 29 - {{ trans('rankings.stat.average_performance') }} 29 + {{ osu_trans('rankings.stat.average_performance') }} 30 30 </th> 31 31 </tr> 32 32 </thead>
+9 -9
resources/views/rankings/index.blade.php
··· 28 28 foreach (['performance', 'charts', 'score', 'country', 'multiplayer'] as $tab) { 29 29 $links[] = [ 30 30 'active' => $tab === $type, 31 - 'title' => trans("rankings.type.{$tab}"), 31 + 'title' => osu_trans("rankings.type.{$tab}"), 32 32 'url' => $selectorParams['route']($mode, $tab), 33 33 ]; 34 34 } ··· 45 45 $hasFilter = $hasFilter ?? true; 46 46 @endphp 47 47 48 - @extends('master', ['titlePrepend' => $titlePrepend ?? trans("rankings.type.{$type}")]) 48 + @extends('master', ['titlePrepend' => $titlePrepend ?? osu_trans("rankings.type.{$type}")]) 49 49 50 50 @section('content') 51 51 @component('layout._page_header_v4', ['params' => [ ··· 74 74 <div class="ranking-filter__item ranking-filter__item--full"> 75 75 @if ($type === 'performance') 76 76 <div class="ranking-filter__item--title"> 77 - {{ trans('rankings.countries.title') }} 77 + {{ osu_trans('rankings.countries.title') }} 78 78 </div> 79 79 <div class="ranking-select-options"> 80 80 <div class="ranking-select-options__select"> 81 - <div class="ranking-select-options__option">{{ optional($country)->name ?? trans('rankings.countries.all') }}</div> 81 + <div class="ranking-select-options__option">{{ optional($country)->name ?? osu_trans('rankings.countries.all') }}</div> 82 82 </div> 83 83 </div> 84 84 @endif ··· 86 86 @if (auth()->check()) 87 87 <div class="ranking-filter__item"> 88 88 <div class="ranking-filter__item--title"> 89 - {{ trans('rankings.filter.title') }} 89 + {{ osu_trans('rankings.filter.title') }} 90 90 </div> 91 91 <div class="sort"> 92 92 <div class="sort__items"> 93 - <button class="sort__item sort__item--button">{{ trans('sort.all') }}</button> 94 - <button class="sort__item sort__item--button">{{ trans('sort.friends')}}</button> 93 + <button class="sort__item sort__item--button">{{ osu_trans('sort.all') }}</button> 94 + <button class="sort__item sort__item--button">{{ osu_trans('sort.friends')}}</button> 95 95 </div> 96 96 </div> 97 97 </div> ··· 99 99 @if (isset($variants)) 100 100 <div class="ranking-filter__item"> 101 101 <div class="ranking-filter__item--title"> 102 - {{ trans('rankings.filter.variant.title') }} 102 + {{ osu_trans('rankings.filter.variant.title') }} 103 103 </div> 104 104 <div class="sort"> 105 105 <div class="sort__items"> 106 106 @foreach ($variants as $v) 107 107 <button class="sort__item sort__item--button"> 108 - {{ trans("beatmaps.variant.{$mode}.{$v}") }} 108 + {{ osu_trans("beatmaps.variant.{$mode}.{$v}") }} 109 109 </button> 110 110 @endforeach 111 111 </div>
+6 -6
resources/views/rankings/performance.blade.php
··· 11 11 <th class="ranking-page-table__heading"></th> 12 12 <th class="ranking-page-table__heading ranking-page-table__heading--main"></th> 13 13 <th class="ranking-page-table__heading"> 14 - {{ trans('rankings.stat.accuracy') }} 14 + {{ osu_trans('rankings.stat.accuracy') }} 15 15 </th> 16 16 <th class="ranking-page-table__heading"> 17 - {{ trans('rankings.stat.play_count') }} 17 + {{ osu_trans('rankings.stat.play_count') }} 18 18 </th> 19 19 <th class="ranking-page-table__heading ranking-page-table__heading--focused"> 20 - {{ trans('rankings.stat.performance') }} 20 + {{ osu_trans('rankings.stat.performance') }} 21 21 </th> 22 22 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 23 - {{ trans('rankings.stat.ss') }} 23 + {{ osu_trans('rankings.stat.ss') }} 24 24 </th> 25 25 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 26 - {{ trans('rankings.stat.s') }} 26 + {{ osu_trans('rankings.stat.s') }} 27 27 </th> 28 28 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 29 - {{ trans('rankings.stat.a') }} 29 + {{ osu_trans('rankings.stat.a') }} 30 30 </th> 31 31 </tr> 32 32 </thead>
+7 -7
resources/views/rankings/score.blade.php
··· 11 11 <th class="ranking-page-table__heading"></th> 12 12 <th class="ranking-page-table__heading ranking-page-table__heading--main"></th> 13 13 <th class="ranking-page-table__heading"> 14 - {{ trans('rankings.stat.accuracy') }} 14 + {{ osu_trans('rankings.stat.accuracy') }} 15 15 </th> 16 16 <th class="ranking-page-table__heading"> 17 - {{ trans('rankings.stat.play_count') }} 17 + {{ osu_trans('rankings.stat.play_count') }} 18 18 </th> 19 19 <th class="ranking-page-table__heading"> 20 - {{ trans('rankings.stat.total_score') }} 20 + {{ osu_trans('rankings.stat.total_score') }} 21 21 </th> 22 22 <th class="ranking-page-table__heading ranking-page-table__heading--focused"> 23 - {{ trans('rankings.stat.ranked_score') }} 23 + {{ osu_trans('rankings.stat.ranked_score') }} 24 24 </th> 25 25 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 26 - {{ trans('rankings.stat.ss') }} 26 + {{ osu_trans('rankings.stat.ss') }} 27 27 </th> 28 28 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 29 - {{ trans('rankings.stat.s') }} 29 + {{ osu_trans('rankings.stat.s') }} 30 30 </th> 31 31 <th class="ranking-page-table__heading ranking-page-table__heading--grade"> 32 - {{ trans('rankings.stat.a') }} 32 + {{ osu_trans('rankings.stat.a') }} 33 33 </th> 34 34 </tr> 35 35 </thead>
+2 -2
resources/views/scores/show.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @php 6 - $username = $score->user === null || $score->user->isDeleted() ? trans('users.deleted') : $score->user->username; 7 - $title = trans('scores.show.title', [ 6 + $username = $score->user === null || $score->user->isDeleted() ? osu_trans('users.deleted') : $score->user->username; 7 + $title = osu_trans('scores.show.title', [ 8 8 'username' => $username, 9 9 'title' => $score->beatmap->beatmapset->getDisplayTitle(auth()->user()), 10 10 'version' => $score->beatmap->version,
+10 -10
resources/views/sessions/create.blade.php
··· 17 17 18 18 <div class="dialog-form__row dialog-form__row--title"> 19 19 <div class="dialog-form__logo"></div> 20 - <h1 class="dialog-form__title">{{ trans('sessions.create.title') }}</h1> 20 + <h1 class="dialog-form__title">{{ osu_trans('sessions.create.title') }}</h1> 21 21 </div> 22 22 23 23 <div class="dialog-form__row dialog-form__row--label"> 24 - {{ trans('sessions.create.label') }} 24 + {{ osu_trans('sessions.create.label') }} 25 25 </div> 26 26 27 27 <div class="dialog-form__row dialog-form__row--input"> 28 28 <input 29 29 class="dialog-form__input js-login-form-input" 30 30 name="username" 31 - placeholder="{{ trans('layout.popup_login.login.username') }}" 31 + placeholder="{{ osu_trans('layout.popup_login.login.username') }}" 32 32 required 33 33 autofocus 34 34 /> ··· 39 39 class="dialog-form__input js-login-form-input" 40 40 name="password" 41 41 type="password" 42 - placeholder="{{ trans('layout.popup_login.login.password') }}" 42 + placeholder="{{ osu_trans('layout.popup_login.login.password') }}" 43 43 required 44 44 /> 45 45 </div> ··· 56 56 57 57 <div class="dialog-form__row dialog-form__row--extra-link"> 58 58 <a href="{{ route('password-reset') }}" class="dialog-form__extra-link"> 59 - {{ trans('layout.popup_login.login.forgot') }} 59 + {{ osu_trans('layout.popup_login.login.forgot') }} 60 60 </a> 61 61 </div> 62 62 63 63 <div class="dialog-form__row dialog-form__row--extra-link"> 64 - {{ trans('layout.popup_login.register.title') }} 64 + {{ osu_trans('layout.popup_login.register.title') }} 65 65 <a href="{{ route('download') }}" class="dialog-form__extra-link"> 66 - {{ trans('sessions.create.download') }} 66 + {{ osu_trans('sessions.create.download') }} 67 67 </a> 68 68 </div> 69 69 70 70 <div class="dialog-form__row dialog-form__row--buttons"> 71 71 <button 72 72 class="dialog-form__button js-captcha--submit-button" 73 - data-disable-with="{{ trans('users.login.button_posting') }}" 73 + data-disable-with="{{ osu_trans('users.login.button_posting') }}" 74 74 > 75 - {{ trans('users.login._') }} 75 + {{ osu_trans('users.login._') }} 76 76 </button> 77 77 78 78 <a 79 79 href="{{ $cancelUrl ?? route('home') }}" 80 80 class="dialog-form__button dialog-form__button--cancel" 81 81 > 82 - {{ trans('common.buttons.cancel') }} 82 + {{ osu_trans('common.buttons.cancel') }} 83 83 </a> 84 84 </div> 85 85 </div>
+1 -1
resources/views/store/_shipping_delay_warning.blade.php
··· 7 7 <p><em class="store-text store-text--emphasis">IMPORTANT: SHIPPING DELAYS</em></p> 8 8 9 9 <p> 10 - {!! markdown(config('store.delayed_shipping_order_message') ?: trans('store.checkout.delayed_shipping')) !!} 10 + {!! markdown(config('store.delayed_shipping_order_message') ?: osu_trans('store.checkout.delayed_shipping')) !!} 11 11 </p> 12 12 13 13 <p>
+1 -1
resources/views/store/cart/_item.blade.php
··· 20 20 {{-- anything where stock is null either allows multiple or is max_quantity 1--}} 21 21 @if($item->product->allow_multiple || $item->product->stock <= 0) 22 22 <span class="store-order-item__quantity"> 23 - {{ trans_choice('common.count.item', $item->quantity) }} 23 + {{ osu_trans_choice('common.count.item', $item->quantity) }} 24 24 </span> 25 25 @else 26 26 <div class="form-select">
+11 -11
resources/views/store/cart/show.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('store.layout', ['titlePrepend' => trans('layout.header.store.cart')]) 5 + @extends('store.layout', ['titlePrepend' => osu_trans('layout.header.store.cart')]) 6 6 7 7 @php 8 8 // always ignore empty keys. ··· 17 17 @if(!$order || !count($order->items)) 18 18 <div class="store-page"> 19 19 <h1 class="store-text store-text--title"> 20 - {{ trans('store.cart.title') }} 20 + {{ osu_trans('store.cart.title') }} 21 21 </h1> 22 22 23 - <p>{{ trans('store.cart.empty.text') }}</p> 24 - <p>{!! trans('store.cart.empty.return_link._', [ 25 - 'link' => Html::link(route('store.products.index'), trans('store.cart.empty.return_link.link_text')), 23 + <p>{{ osu_trans('store.cart.empty.text') }}</p> 24 + <p>{!! osu_trans('store.cart.empty.return_link._', [ 25 + 'link' => Html::link(route('store.products.index'), osu_trans('store.cart.empty.return_link.link_text')), 26 26 ]) !!} 27 27 </p> 28 28 </div> 29 29 @else 30 30 <div class="store-page"> 31 31 <h1 class="store-text store-text--title"> 32 - {{ trans('store.cart.title') }} 32 + {{ osu_trans('store.cart.title') }} 33 33 </h1> 34 34 35 35 <ul class="cart-items"> ··· 42 42 43 43 <div class="store-cart-footer"> 44 44 <p> 45 - <a href="{{ route('store.products.index') }}">{{ trans('store.cart.more_goodies') }}</a> 45 + <a href="{{ route('store.products.index') }}">{{ osu_trans('store.cart.more_goodies') }}</a> 46 46 </p> 47 47 48 48 <div class="store-cart-footer__total-box store-cart-footer__total-box--padded"> 49 - <p class="store-cart-footer__text">{{ trans('store.cart.total') }}</p> 49 + <p class="store-cart-footer__text">{{ osu_trans('store.cart.total') }}</p> 50 50 51 51 <p class="store-cart-footer__text store-cart-footer__text--amount"> 52 52 {{ currency($order->getSubtotal()) }} ··· 54 54 55 55 @if($order->requiresShipping()) 56 56 <p class="store-cart-footer__text store-cart-footer__text--shipping"> 57 - + {{ trans('store.cart.shipping_fees') }} 57 + + {{ osu_trans('store.cart.shipping_fees') }} 58 58 </p> 59 59 @endif 60 60 </div> ··· 64 64 <div class="store-page store-page--footer"> 65 65 @if ($hasErrors) 66 66 <ul class="store-page__alert"> 67 - @foreach (trans('store.cart.errors_no_checkout') as $_k => $v) 67 + @foreach (osu_trans('store.cart.errors_no_checkout') as $_k => $v) 68 68 <li>{{ $v }}</li> 69 69 @endforeach 70 70 </ul> ··· 75 75 data-shopify="{{ $order->isShouldShopify() }}" 76 76 disabled 77 77 > 78 - {{ trans('store.cart.checkout' ) }} 78 + {{ osu_trans('store.cart.checkout' ) }} 79 79 </button> 80 80 @endif 81 81 </div>
+6 -6
resources/views/store/checkout/show.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('store/layout', ['titlePrepend' => trans('store.checkout.title_compact')]) 5 + @extends('store/layout', ['titlePrepend' => osu_trans('store.checkout.title_compact')]) 6 6 7 7 @php 8 8 // always ignore empty keys. ··· 18 18 @if (session()->has('checkout.error.message') || $hasErrors) 19 19 <ul class="store-page__alert store-page__alert--with-margin-bottom"> 20 20 <li> 21 - {{ session('checkout.error.message') ?? trans('store.checkout.cart_problems') }} 21 + {{ session('checkout.error.message') ?? osu_trans('store.checkout.cart_problems') }} 22 22 </li> 23 23 </ul> 24 24 @endif ··· 26 26 @if ($order->isProcessing()) 27 27 <ul class="store-page__alert store-page__alert--with-margin-bottom"> 28 28 <li> 29 - {{ trans('store.checkout.pending_checkout.line_1') }}<br> 30 - {{ trans('store.checkout.pending_checkout.line_2') }} 29 + {{ osu_trans('store.checkout.pending_checkout.line_1') }}<br> 30 + {{ osu_trans('store.checkout.pending_checkout.line_2') }} 31 31 </li> 32 32 </ul> 33 33 @endif ··· 81 81 @if ($hasErrors) 82 82 {{-- Remove checkout options if there are cart errors --}} 83 83 <div class="store-checkout-text--error"> 84 - <p>{{ trans('store.checkout.cart_problems') }}</p> 84 + <p>{{ osu_trans('store.checkout.cart_problems') }}</p> 85 85 <p> 86 - <a href="{{ route('store.cart.show') }}">{{ trans('store.checkout.cart_problems_edit') }}</a> 86 + <a href="{{ route('store.cart.show') }}">{{ osu_trans('store.checkout.cart_problems_edit') }}</a> 87 87 </p> 88 88 </div> 89 89 @else
+8 -8
resources/views/store/header.blade.php
··· 27 27 $links = [ 28 28 [ 29 29 'active' => $currentNav === 'products' || $currentNav === 'product', 30 - 'title' => trans('layout.header.store.products'), 30 + 'title' => osu_trans('layout.header.store.products'), 31 31 'url' => route('store.products.index'), 32 32 ], 33 33 [ 34 34 'active' => $currentNav === 'cart', 35 - 'title' => trans('layout.header.store.cart'), 35 + 'title' => osu_trans('layout.header.store.cart'), 36 36 'url' => route('store.cart.show'), 37 37 ], 38 38 [ 39 39 'active' => $currentNav === 'orders' || $currentNav === 'order', 40 - 'title' => trans('layout.header.store.orders'), 40 + 'title' => osu_trans('layout.header.store.orders'), 41 41 'url' => route('store.orders.index'), 42 42 ], 43 43 ]; ··· 50 50 @slot('titleAppend') 51 51 <div class="store-xsolla"> 52 52 <div class="store-xsolla__text"> 53 - {!! trans('store.xsolla.distributor') !!} 53 + {!! osu_trans('store.xsolla.distributor') !!} 54 54 </div> 55 55 <div class="store-xsolla__icon"></div> 56 56 </div> ··· 61 61 <a href="{{ route('store.cart.show') }}" class="btn-osu-big btn-osu-big--store-cart"> 62 62 <span class="btn-osu-big__content"> 63 63 <span class="btn-osu-big__left"> 64 - {{ trans_choice('store.cart.info', $cart->getItemCount(), ['subtotal' => $cart->getSubtotal()]) }} 64 + {{ osu_trans_choice('store.cart.info', $cart->getItemCount(), ['subtotal' => $cart->getSubtotal()]) }} 65 65 </span> 66 66 67 67 <span class="btn-osu-big__icon"> ··· 77 77 @if (config('osu.store.notice') !== null) 78 78 <div class="store-notice store-notice--important"> 79 79 <h2 class="store-notice__title"> 80 - {{ trans('common.title.notice') }} 80 + {{ osu_trans('common.title.notice') }} 81 81 </h2> 82 82 83 83 {!! markdown(config('osu.store.notice')) !!} ··· 90 90 @php 91 91 $pendingCheckoutLink = Html::link( 92 92 route('store.orders.index', ['type' => 'processing']), 93 - trans('store.checkout.has_pending.link_text') 93 + osu_trans('store.checkout.has_pending.link_text') 94 94 ) 95 95 @endphp 96 96 <div class="store-notice"> 97 97 <span> 98 - {!! trans('store.checkout.has_pending._', ['link' => $pendingCheckoutLink]) !!} 98 + {!! osu_trans('store.checkout.has_pending._', ['link' => $pendingCheckoutLink]) !!} 99 99 </span> 100 100 </div> 101 101 @endif
+1 -1
resources/views/store/invoice.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('store/layout', ['titlePrepend' => trans('store.invoice.title_compact')]) 5 + @extends('store/layout', ['titlePrepend' => osu_trans('store.invoice.title_compact')]) 6 6 7 7 @section('content') 8 8 @include('store.header')
+1 -1
resources/views/store/objects/order.blade.php
··· 36 36 </div> 37 37 @endif 38 38 <div class="order-line-items__data order-line-items__data--quantity"> 39 - {{ trans_choice('common.count.item', $i->quantity) }} 39 + {{ osu_trans_choice('common.count.item', $i->quantity) }} 40 40 </div> 41 41 <div class="order-line-items__data order-line-items__data--value"> 42 42 {{ currency($i->subtotal()) }}
+5 -5
resources/views/store/orders/_status.blade.php
··· 11 11 If you have any issues with your purchase, please contact the <a href='mailto:osustore@ppy.sh'>osu!store support</a>. 12 12 </p> 13 13 @elseif ($order->isProcessing()) 14 - <p><em class="store-text store-text--emphasis">{{ trans('store.invoice.status.processing.title') }}</em></p> 14 + <p><em class="store-text store-text--emphasis">{{ osu_trans('store.invoice.status.processing.title') }}</em></p> 15 15 <p> 16 - {{ trans('store.invoice.status.processing.line_1') }} 16 + {{ osu_trans('store.invoice.status.processing.line_1') }} 17 17 </p> 18 18 <p> 19 - {!! trans('store.invoice.status.processing.line_2._', [ 20 - 'link' => Html::link(route('store.checkout.show', $order), trans('store.invoice.status.processing.line_2.link_text')), 19 + {!! osu_trans('store.invoice.status.processing.line_2._', [ 20 + 'link' => Html::link(route('store.checkout.show', $order), osu_trans('store.invoice.status.processing.line_2.link_text')), 21 21 ]) !!} 22 22 </p> 23 23 @elseif ($order->status === 'cancelled') ··· 50 50 51 51 @if ($order->isPendingEcheck()) 52 52 <p> 53 - {{ trans('store.invoice.echeck_delay') }} 53 + {{ osu_trans('store.invoice.echeck_delay') }} 54 54 </p> 55 55 @endif 56 56 @endif
+8 -8
resources/views/store/orders/index.blade.php
··· 2 2 Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 - @extends('store/layout', ['titlePrepend' => trans('layout.menu.store.orders-index')]) 5 + @extends('store/layout', ['titlePrepend' => osu_trans('layout.menu.store.orders-index')]) 6 6 7 7 @section('content') 8 8 @include('store.header') ··· 10 10 <div class="osu-page osu-page--generic"> 11 11 <div class="store-orders"> 12 12 @if (count($orders) === 0) 13 - <span>{{ trans('store.order.no_orders') }}</span> 13 + <span>{{ osu_trans('store.order.no_orders') }}</span> 14 14 @endif 15 15 16 16 @foreach ($orders as $order) ··· 27 27 28 28 <div class="store-order__header-right"> 29 29 <div class="store-order__status"> 30 - {{ trans("store.order.status.{$order->status}") }} 30 + {{ osu_trans("store.order.status.{$order->status}") }} 31 31 </div> 32 32 33 33 <div class="store-order__header-subtext"> 34 34 @if ($order->paid_at !== null) 35 - {!! trans('store.order.paid_on', ['date' => timeago($order->paid_at)]) !!} 35 + {!! osu_trans('store.order.paid_on', ['date' => timeago($order->paid_at)]) !!} 36 36 @endif 37 37 </div> 38 38 </div> ··· 53 53 data-provider-reference="{{ $order->getProviderReference() }}" 54 54 data-status="{{ $order->status }}" 55 55 > 56 - {{ $order->status === 'processing' ? trans('store.order.resume') : trans('store.order.invoice') }} 56 + {{ $order->status === 'processing' ? osu_trans('store.order.resume') : osu_trans('store.order.invoice') }} 57 57 </button> 58 58 @elseif ($order->hasInvoice()) 59 59 <button ··· 62 62 data-provider="{{ $order->getPaymentProvider() }}" 63 63 data-status="{{ $order->status }}" 64 64 > 65 - {{ trans('store.order.invoice') }} 65 + {{ osu_trans('store.order.invoice') }} 66 66 </button> 67 67 @endif 68 68 69 69 @if ($order->canUserCancel()) 70 70 <button 71 71 class="btn-osu-big btn-osu-big--rounded-thin btn-osu-big--danger" 72 - data-confirm="{{ trans('store.order.cancel_confirm') }}" 72 + data-confirm="{{ osu_trans('store.order.cancel_confirm') }}" 73 73 data-method="DELETE" 74 74 data-url="{{ route('store.orders.destroy', $order) }}" 75 75 data-reload-on-success="1" 76 76 data-remote="1" 77 77 > 78 - {{ trans('store.order.cancel') }} 78 + {{ osu_trans('store.order.cancel') }} 79 79 </button> 80 80 @endif 81 81 </div>
+6 -6
resources/views/store/products/show.blade.php
··· 123 123 @elseif($product->inStock(1, true)) 124 124 <div class="grid"> 125 125 <div class="grid-cell grid-cell--fill"> 126 - {{ trans('store.product.stock.out_with_alternative') }} 126 + {{ osu_trans('store.product.stock.out_with_alternative') }} 127 127 </div> 128 128 </div> 129 129 @else 130 130 <div class="grid"> 131 131 <div class="grid-cell grid-cell--fill"> 132 - {{ trans('store.product.stock.out') }} 132 + {{ osu_trans('store.product.stock.out') }} 133 133 </div> 134 134 </div> 135 135 @endif ··· 141 141 <div class="store-page store-page--footer" id="add-to-cart"> 142 142 @if($product->inStock()) 143 143 <button type="submit" class="btn-osu-big btn-osu-big--store-action js-store-add-to-cart js-login-required--click"> 144 - {{ trans('store.product.add_to_cart') }} 144 + {{ osu_trans('store.product.add_to_cart') }} 145 145 </button> 146 146 147 147 @elseif(!$requestedNotification) ··· 151 151 data-remote="true" 152 152 data-method="POST" 153 153 > 154 - {{ trans('store.product.notify') }} 154 + {{ osu_trans('store.product.notify') }} 155 155 </a> 156 156 @endif 157 157 ··· 159 159 <div class="store-notification-requested-alert"> 160 160 <span class="far fa-check-circle store-notification-requested-alert__icon"></span> 161 161 <p class="store-notification-requested-alert__text"> 162 - {!! trans('store.product.notification_success', [ 162 + {!! osu_trans('store.product.notification_success', [ 163 163 'link' => link_to_route( 164 164 'store.notification-request', 165 - trans('store.product.notification_remove_text'), 165 + osu_trans('store.product.notification_remove_text'), 166 166 ['product' => $product->product_id], 167 167 ['data-remote' => 'true', 'data-method' => 'DELETE'] 168 168 )
+2 -2
resources/views/store/products/supporter-tag.blade.php
··· 24 24 [ 25 25 'id' => 'username', 26 26 'class' => 'js-username-input store-supporter-tag__input', 27 - 'placeholder' => trans('store.supporter_tag.gift'), 27 + 'placeholder' => osu_trans('store.supporter_tag.gift'), 28 28 'autocomplete' => 'off' 29 29 ] 30 30 ) ··· 44 44 </div> 45 45 </div> 46 46 <div class="grid grid--xs grid--right store-slider__presets"> 47 - <span class="store-slider__presets-blurb">{{ trans('supporter_tag.months') }}</span> 47 + <span class="store-slider__presets-blurb">{{ osu_trans('supporter_tag.months') }}</span> 48 48 @foreach([1, 2, 4, 6, 12, 18, 24] as $months) 49 49 <div class="js-slider-preset store-slider__preset" data-months="{{$months}}">{{$months}}</div> 50 50 @endforeach
+1 -1
resources/views/store/products/username-change.blade.php
··· 27 27 ]) !!} 28 28 </div> 29 29 <em class="store-text store-text--emphasis"> 30 - <div id="username-check-status">{{ trans('store.username_change.check') }}</div> 30 + <div id="username-check-status">{{ osu_trans('store.username_change.check') }}</div> 31 31 </em> 32 32 <div>Your current username is "{{ Auth::user()->username }}".</div> 33 33 </div>
+7 -7
resources/views/tournaments/index.blade.php
··· 6 6 7 7 @section('content') 8 8 @include('layout._page_header_v4', ['params' => [ 9 - 'links' => [['title' => trans('layout.header.tournaments.index'), 'url' => route('tournaments.index')]], 9 + 'links' => [['title' => osu_trans('layout.header.tournaments.index'), 'url' => route('tournaments.index')]], 10 10 'linksBreadcrumb' => true, 11 11 'theme' => 'tournaments', 12 12 ]]) ··· 16 16 @foreach($listing as $state => $tournaments) 17 17 @if($tournaments->isEmpty()) 18 18 @if($state === 'current') 19 - <h1 class="tournament-list__heading">{{trans("tournament.index.state.$state")}}</h1> 20 - <p class="tournament-list__none-running">{{trans('tournament.index.none_running')}}</p> 19 + <h1 class="tournament-list__heading">{{osu_trans("tournament.index.state.$state")}}</h1> 20 + <p class="tournament-list__none-running">{{osu_trans('tournament.index.none_running')}}</p> 21 21 @endif 22 22 @else 23 - <h1 class="tournament-list__heading">{{trans("tournament.index.state.$state")}}</h1> 23 + <h1 class="tournament-list__heading">{{osu_trans("tournament.index.state.$state")}}</h1> 24 24 <div class="tournament-list__group{{$state == 'previous' ? ' tournament-list__group--old' : ''}}"> 25 25 @foreach($tournaments as $t) 26 26 <a href="{{ route('tournaments.show', $t) }}" class='tournament-list-item{{$state == 'previous' ? ' tournament-list-item--old' : ''}}'> ··· 32 32 <div class='tournament-list-item__metadata'> 33 33 <div class='tournament-list-item__metadata-left'> 34 34 <div class='tournament-list-item__tournament-date'>{{ 35 - trans('tournament.tournament_period', [ 35 + osu_trans('tournament.tournament_period', [ 36 36 'start' => i18n_date($t->start_date), 37 37 'end' => i18n_date($t->end_date), 38 38 ]) 39 39 }}</div> 40 40 <div class='tournament-list-item__registration-date'>{{ 41 - trans('tournament.index.registration_period', [ 41 + osu_trans('tournament.index.registration_period', [ 42 42 'start' => i18n_date($t->signup_open), 43 43 'end' => i18n_date($t->signup_close) 44 44 ]) ··· 47 47 <div class='tournament-list-item__metadata-right'> 48 48 <div class='tournament-list-item__registrations'> 49 49 {{ i18n_number_format($t->registrations->count()) }} 50 - <i class="fas fa-fw fa-users" title="{{ trans('tournament.index.item.registered') }}"></i> 50 + <i class="fas fa-fw fa-users" title="{{ osu_trans('tournament.index.item.registered') }}"></i> 51 51 </div> 52 52 </div> 53 53 </div>
+15 -15
resources/views/tournaments/show.blade.php
··· 5 5 @php 6 6 $links = [ 7 7 [ 8 - 'title' => trans('layout.header.tournaments.index'), 8 + 'title' => osu_trans('layout.header.tournaments.index'), 9 9 'url' => route('tournaments.index'), 10 10 ], 11 11 [ ··· 30 30 <div class="grid-items"> 31 31 <div class="counter-box counter-box--info"> 32 32 <div class="counter-box__title"> 33 - {{ trans('tournament.show.period.start') }} 33 + {{ osu_trans('tournament.show.period.start') }} 34 34 </div> 35 35 <div class="counter-box__count"> 36 36 {{ i18n_date($tournament->start_date) }} ··· 38 38 </div> 39 39 <div class="counter-box counter-box--info"> 40 40 <div class="counter-box__title"> 41 - {{ trans('tournament.show.period.end') }} 41 + {{ osu_trans('tournament.show.period.end') }} 42 42 </div> 43 43 <div class="counter-box__count"> 44 44 {{ i18n_date($tournament->end_date) }} ··· 65 65 66 66 <div class="tournament__description"> 67 67 @if ($tournament->signup_open->isFuture()) 68 - {{ trans('tournament.show.state.before_registration') }} 68 + {{ osu_trans('tournament.show.state.before_registration') }} 69 69 @elseif ($tournament->isRegistrationOpen()) 70 70 {!! markdown($tournament->description) !!} 71 71 72 72 <div class="tournament__description-md-extra"> 73 - {{ trans('tournament.show.registration_ends', ['date' => i18n_date($tournament->signup_close)]) }}. 73 + {{ osu_trans('tournament.show.registration_ends', ['date' => i18n_date($tournament->signup_close)]) }}. 74 74 </div> 75 75 @elseif ($tournament->start_date->isFuture()) 76 - {{ trans('tournament.show.state.registration_closed') }} 76 + {{ osu_trans('tournament.show.state.registration_closed') }} 77 77 @elseif ($tournament->isTournamentRunning()) 78 - {{ trans('tournament.show.state.running') }} 78 + {{ osu_trans('tournament.show.state.running') }} 79 79 @else 80 - {{ trans('tournament.show.state.ended') }} 80 + {{ osu_trans('tournament.show.state.ended') }} 81 81 @endif 82 82 </div> 83 83 </div> ··· 90 90 <div class="tournament__body"> 91 91 @if (!Auth::user()) 92 92 <div>{!! 93 - trans('tournament.show.login_to_register', [ 94 - 'login' => '<a href="#" class="js-user-link" title="'.trans("users.anonymous.login_link").'">'.trans("users.anonymous.login_text").'</a>' 93 + osu_trans('tournament.show.login_to_register', [ 94 + 'login' => '<a href="#" class="js-user-link" title="'.osu_trans("users.anonymous.login_link").'">'.osu_trans("users.anonymous.login_text").'</a>' 95 95 ]) 96 96 !!}</div> 97 97 @else 98 98 @if($tournament->isValidRank(Auth::user())) 99 99 @if($tournament->isSignedUp(Auth::user())) 100 - <div>{!!trans('tournament.show.entered')!!}</div> 100 + <div>{!!osu_trans('tournament.show.entered')!!}</div> 101 101 @else 102 - <div>{{trans('tournament.show.not_yet_entered')}}</div> 102 + <div>{{osu_trans('tournament.show.not_yet_entered')}}</div> 103 103 @endif 104 104 @if($tournament->isSignedUp(Auth::user())) 105 105 <a ··· 108 108 data-method="post" 109 109 data-remote="1" 110 110 > 111 - {{trans('tournament.show.button.cancel')}} 111 + {{osu_trans('tournament.show.button.cancel')}} 112 112 </a> 113 113 @else 114 114 <a ··· 117 117 data-method="post" 118 118 data-remote="1" 119 119 > 120 - {{trans('tournament.show.button.register')}} 120 + {{osu_trans('tournament.show.button.register')}} 121 121 </a> 122 122 @endif 123 123 @else 124 - <div>{{trans('tournament.show.rank_too_low')}}</div> 124 + <div>{{osu_trans('tournament.show.rank_too_low')}}</div> 125 125 @endif 126 126 @endif 127 127 </div>
+8 -8
resources/views/users/_verify_box.blade.php
··· 4 4 --}} 5 5 <div class="user-verification"> 6 6 <h1 class="user-verification__row user-verification__row--title"> 7 - {{ trans('user_verification.box.title') }} 7 + {{ osu_trans('user_verification.box.title') }} 8 8 </h1> 9 9 10 10 <p class="user-verification__row user-verification__row--info"> 11 - {!! trans('user_verification.box.sent', ['mail' => '<strong>'.obscure_email($email).'</strong>']) !!} 11 + {!! osu_trans('user_verification.box.sent', ['mail' => '<strong>'.obscure_email($email).'</strong>']) !!} 12 12 </p> 13 13 14 14 <div class="user-verification__row user-verification__row--key"> ··· 30 30 </div> 31 31 32 32 <p class="user-verification__row user-verification__row--info"> 33 - {{ trans('user_verification.box.info.check_spam') }} 33 + {{ osu_trans('user_verification.box.info.check_spam') }} 34 34 </p> 35 35 36 36 <p class="user-verification__row user-verification__row--info"> 37 - {!! trans('user_verification.box.info.recover', [ 37 + {!! osu_trans('user_verification.box.info.recover', [ 38 38 'link' => link_to( 39 39 osu_url('user.recover'), 40 - trans('user_verification.box.info.recover_link'), 40 + osu_trans('user_verification.box.info.recover_link'), 41 41 ['class' => 'user-verification__link'] 42 42 ), 43 43 ]) !!} 44 - {!! trans('user_verification.box.info.reissue', [ 44 + {!! osu_trans('user_verification.box.info.reissue', [ 45 45 'reissue_link' => link_to_route( 46 46 'account.reissue-code', 47 - trans('user_verification.box.info.reissue_link'), 47 + osu_trans('user_verification.box.info.reissue_link'), 48 48 [], 49 49 ['class' => 'js-user-verification--reissue user-verification__link'] 50 50 ), ··· 55 55 data-method='delete' 56 56 data-remote='1' 57 57 data-url='".route('logout')."' 58 - >".trans('user_verification.box.info.logout_link')." 58 + >".osu_trans('user_verification.box.info.logout_link')." 59 59 </button>", 60 60 ]) !!} 61 61 </p>
+2 -2
resources/views/users/beatmapset_activities.blade.php
··· 11 11 @if (Auth::user() && Auth::user()->isAdmin() && $user->isRestricted()) 12 12 @include('objects._notification_banner', [ 13 13 'type' => 'warning', 14 - 'title' => trans('admin.users.restricted_banner.title'), 15 - 'message' => trans('admin.users.restricted_banner.message'), 14 + 'title' => osu_trans('admin.users.restricted_banner.title'), 15 + 'message' => osu_trans('admin.users.restricted_banner.message'), 16 16 ]) 17 17 @endif 18 18
+9 -9
resources/views/users/disabled.blade.php
··· 8 8 @include('layout._page_header_v4') 9 9 10 10 <div class="osu-page osu-page--generic"> 11 - <h1>{{ trans('users.disabled.title') }}</h1> 11 + <h1>{{ osu_trans('users.disabled.title') }}</h1> 12 12 13 13 <p> 14 - {{ trans('users.disabled.reasons.opening') }} 14 + {{ osu_trans('users.disabled.reasons.opening') }} 15 15 </p> 16 16 17 17 <ul> 18 18 <li> 19 - {!! trans('users.disabled.reasons.tos._', [ 19 + {!! osu_trans('users.disabled.reasons.tos._', [ 20 20 'community_rules' => tag('a', [ 21 21 'href' => osu_url('user.rules'), 22 - ], trans('users.disabled.reasons.tos.community_rules')), 22 + ], osu_trans('users.disabled.reasons.tos.community_rules')), 23 23 'tos' => tag('a', [ 24 24 'href' => route('legal', ['locale' => app()->getLocale(), 'path' => 'terms']), 25 - ], trans('users.disabled.reasons.tos.tos')), 25 + ], osu_trans('users.disabled.reasons.tos.tos')), 26 26 ]) !!} 27 27 </li> 28 28 <li> 29 - {{ trans('users.disabled.reasons.compromised') }} 29 + {{ osu_trans('users.disabled.reasons.compromised') }} 30 30 </li> 31 31 </ul> 32 32 33 33 <p> 34 - {!! trans('users.disabled.warning') !!} 34 + {!! osu_trans('users.disabled.warning') !!} 35 35 </p> 36 36 37 37 <p> 38 - {!! trans('users.disabled.if_mistake._', [ 38 + {!! osu_trans('users.disabled.if_mistake._', [ 39 39 'email' => tag('a', [ 40 40 'href' => 'mailto:'.config('osu.emails.account') 41 - ], trans('users.disabled.if_mistake.email')), 41 + ], osu_trans('users.disabled.if_mistake.email')), 42 42 ]) !!} 43 43 </p> 44 44
+1 -1
resources/views/users/login.blade.php
··· 7 7 @section('content') 8 8 @include('layout._page_header_v4') 9 9 <div class="osu-page osu-page--generic"> 10 - {{ trans('users.login.info') }} 10 + {{ osu_trans('users.login.info') }} 11 11 </div> 12 12 @endsection 13 13
+3 -3
resources/views/users/posts.blade.php
··· 3 3 See the LICENCE file in the repository root for full licence text. 4 4 --}} 5 5 @extends('master', [ 6 - 'titlePrepend' => trans('users.posts.title', ['username' => $user->username]), 6 + 'titlePrepend' => osu_trans('users.posts.title', ['username' => $user->username]), 7 7 ]) 8 8 9 9 @section('content') ··· 14 14 <div class="osu-page"> 15 15 <div class="search-header"> 16 16 <div class="search-header__title"> 17 - {{ trans('users.posts.title', ['username' => $user->username]) }} 17 + {{ osu_trans('users.posts.title', ['username' => $user->username]) }} 18 18 </div> 19 19 20 20 <div class="search-header__box"> ··· 34 34 <div class="search-result search-result--forum_post"> 35 35 @if ($search->total() === 0) 36 36 <div class="search-result__row search-result__row--notice"> 37 - {{ trans('home.search.empty_result') }} 37 + {{ osu_trans('home.search.empty_result') }} 38 38 </div> 39 39 @else 40 40 <div class="search-result__row search-result__row--entries-container">
+2 -2
resources/views/users/show.blade.php
··· 11 11 @if (Auth::user() && Auth::user()->isAdmin() && $user->isRestricted()) 12 12 @include('objects._notification_banner', [ 13 13 'type' => 'warning', 14 - 'title' => trans('admin.users.restricted_banner.title'), 15 - 'message' => trans('admin.users.restricted_banner.message'), 14 + 'title' => osu_trans('admin.users.restricted_banner.title'), 15 + 'message' => osu_trans('admin.users.restricted_banner.message'), 16 16 ]) 17 17 @endif 18 18
+5 -5
resources/views/users/show_not_found.blade.php
··· 7 7 @section('content') 8 8 @include('layout._page_header_v4') 9 9 <div class="osu-page osu-page--generic"> 10 - <h1>{{ trans('users.show.not_found.title') }}</h1> 10 + <h1>{{ osu_trans('users.show.not_found.title') }}</h1> 11 11 12 - <p>{{ trans('users.show.not_found.reason_header') }}</p> 12 + <p>{{ osu_trans('users.show.not_found.reason_header') }}</p> 13 13 14 14 <ul> 15 - <li>{{ trans('users.show.not_found.reason_1') }} 16 - <li>{{ trans('users.show.not_found.reason_2') }} 17 - <li>{{ trans('users.show.not_found.reason_3') }} 15 + <li>{{ osu_trans('users.show.not_found.reason_1') }} 16 + <li>{{ osu_trans('users.show.not_found.reason_2') }} 17 + <li>{{ osu_trans('users.show.not_found.reason_3') }} 18 18 </ul> 19 19 </div> 20 20 @endsection
+1 -1
resources/views/users/verify.blade.php
··· 8 8 @include('layout._page_header_v4') 9 9 10 10 <div class="osu-page osu-page--generic js-user-verification--on-load"> 11 - {{ trans('users.verify.title') }} 11 + {{ osu_trans('users.verify.title') }} 12 12 </div> 13 13 @endsection 14 14
+9 -9
resources/views/vendor/passport/authorize.blade.php
··· 35 35 36 36 <div class="dialog-form__row dialog-form__row--title"> 37 37 <div class="dialog-form__logo"></div> 38 - <h1 class="dialog-form__title">{{ trans('oauth.authorise.title') }}</h1> 38 + <h1 class="dialog-form__title">{{ osu_trans('oauth.authorise.title') }}</h1> 39 39 </div> 40 40 41 41 <div class="dialog-form__row dialog-form__row--label"> ··· 43 43 {{ $client->name }} 44 44 </h2> 45 45 <p class="dialog-form__client-request"> 46 - {{ trans('oauth.authorise.request') }} 46 + {{ osu_trans('oauth.authorise.request') }} 47 47 </p> 48 48 </div> 49 49 50 50 @if (count($scopes) > 0) 51 51 <div class="dialog-form__row dialog-form__row--scopes"> 52 52 <p class="dialog-form__scopes-title"> 53 - {{ trans('oauth.authorise.scopes_title') }} 53 + {{ osu_trans('oauth.authorise.scopes_title') }} 54 54 </p> 55 55 56 56 <ul class="oauth-scopes oauth-scopes--oauth-form"> ··· 58 58 <li> 59 59 <span class="oauth-scopes__icon"> 60 60 <span class="fas fa-check"></span> 61 - </span>{{ trans("api.scopes.{$scope->id}") }} 61 + </span>{{ osu_trans("api.scopes.{$scope->id}") }} 62 62 </li> 63 63 @endforeach 64 64 </ul> ··· 66 66 @endif 67 67 68 68 <div class="dialog-form__row dialog-form__row--wrong-user"> 69 - {!! trans('common.wrong_user._', [ 69 + {!! osu_trans('common.wrong_user._', [ 70 70 'user' => e($user->username), 71 71 'logout_link' => link_to_route( 72 72 'logout', 73 - trans('common.wrong_user.logout_link'), 73 + osu_trans('common.wrong_user.logout_link'), 74 74 [], 75 75 [ 76 76 'class' => 'dialog-form__extra-link', 77 - 'data-confirm' => trans('users.logout_confirm'), 77 + 'data-confirm' => osu_trans('users.logout_confirm'), 78 78 'data-method' => 'DELETE', 79 79 'data-reload-on-success' => '1', 80 80 'data-remote' => '1', ··· 88 88 'method' => 'POST', 89 89 ]) !!} 90 90 <button class="dialog-form__button"> 91 - {{ trans('common.buttons.authorise') }} 91 + {{ osu_trans('common.buttons.authorise') }} 92 92 </button> 93 93 {!! Form::close() !!} 94 94 ··· 99 99 <button 100 100 class="dialog-form__button dialog-form__button--cancel" 101 101 > 102 - {{ trans('common.buttons.cancel') }} 102 + {{ osu_trans('common.buttons.cancel') }} 103 103 </button> 104 104 {!! Form::close() !!} 105 105 </div>
+2 -2
resources/views/wiki/_actions.blade.php
··· 17 17 <a 18 18 class="btn-osu-big btn-osu-big--rounded-thin" 19 19 href="{{ $page->editUrl() }}" 20 - title="{{ trans('wiki.show.edit.link') }}" 20 + title="{{ osu_trans('wiki.show.edit.link') }}" 21 21 > 22 22 <i class="fab fa-github"></i> 23 23 </a> ··· 31 31 data-remote="true" 32 32 data-url="{{ wiki_url($page->path, $locale) }}" 33 33 data-method="PUT" 34 - title="{{ trans('wiki.show.edit.refresh') }}" 34 + title="{{ osu_trans('wiki.show.edit.refresh') }}" 35 35 > 36 36 <i class="fas fa-sync"></i> 37 37 </button>
+7 -7
resources/views/wiki/_notice.blade.php
··· 4 4 --}} 5 5 @if ($page->isVisible() && $page->locale !== $page->requestedLocale) 6 6 <div class="wiki-notice"> 7 - {{ trans('wiki.show.fallback_translation', ['language' => locale_meta($page->requestedLocale)->name()]) }} 7 + {{ osu_trans('wiki.show.fallback_translation', ['language' => locale_meta($page->requestedLocale)->name()]) }} 8 8 </div> 9 9 @endif 10 10 11 11 @if ($page->isLegalTranslation()) 12 12 <div class="wiki-notice wiki-notice--important"> 13 - {!! trans('wiki.show.translation.legal', [ 14 - 'default' => '<a href="'.e(wiki_url($page->path, config('app.fallback_locale'))).'">'.e(trans('wiki.show.translation.default')).'</a>', 13 + {!! osu_trans('wiki.show.translation.legal', [ 14 + 'default' => '<a href="'.e(wiki_url($page->path, config('app.fallback_locale'))).'">'.e(osu_trans('wiki.show.translation.default')).'</a>', 15 15 ]) !!} 16 16 </div> 17 17 @endif ··· 19 19 @if ($page->isOutdated()) 20 20 <div class="wiki-notice"> 21 21 @if ($page->isTranslation()) 22 - {!! trans('wiki.show.translation.outdated', [ 23 - 'default' => '<a href="'.e(wiki_url($page->path, config('app.fallback_locale'))).'">'.e(trans('wiki.show.translation.default')).'</a>', 22 + {!! osu_trans('wiki.show.translation.outdated', [ 23 + 'default' => '<a href="'.e(wiki_url($page->path, config('app.fallback_locale'))).'">'.e(osu_trans('wiki.show.translation.default')).'</a>', 24 24 ]) !!} 25 25 @else 26 - {{ trans('wiki.show.incomplete_or_outdated') }} 26 + {{ osu_trans('wiki.show.incomplete_or_outdated') }} 27 27 @endif 28 28 </div> 29 29 @elseif ($page->needsCleanup()) 30 30 <div class="wiki-notice"> 31 - {{ trans('wiki.show.needs_cleanup_or_rewrite') }} 31 + {{ osu_trans('wiki.show.needs_cleanup_or_rewrite') }} 32 32 </div> 33 33 @endif
+1 -1
resources/views/wiki/main.blade.php
··· 8 8 @section('content') 9 9 @component('layout._page_header_v4', ['params' => [ 10 10 'links' => [[ 11 - 'title' => trans('layout.header.help.index'), 11 + 'title' => osu_trans('layout.header.help.index'), 12 12 'url' => wiki_url('Main_Page', $page->requestedLocale), 13 13 ]], 14 14 'linksBreadcrumb' => true,
+4 -4
resources/views/wiki/show.blade.php
··· 10 10 11 11 if (!($legal ?? false)) { 12 12 $links[] = [ 13 - 'title' => trans('layout.header.help.index'), 13 + 'title' => osu_trans('layout.header.help.index'), 14 14 'url' => wiki_url('Main_Page', $page->requestedLocale), 15 15 ]; 16 16 } ··· 53 53 data-mobile-toggle-target="wiki-toc" 54 54 > 55 55 <h2 class="sidebar__title"> 56 - {{ trans('wiki.show.toc') }} 56 + {{ osu_trans('wiki.show.toc') }} 57 57 </h2> 58 58 59 59 <div class="visible-xs sidebar__mobile-toggle-icon"> ··· 77 77 @else 78 78 <div class="wiki-content"> 79 79 <p> 80 - {{ trans('wiki.show.missing', ['keyword' => $page->path ]) }} 80 + {{ osu_trans('wiki.show.missing', ['keyword' => $page->path ]) }} 81 81 </p> 82 82 83 83 <p> 84 - {!! trans('wiki.show.search', ['link' => 84 + {!! osu_trans('wiki.show.search', ['link' => 85 85 link_to(route('search', ['mode' => 'wiki_page', 'query' => $page->path]), $page->path) 86 86 ]) !!} 87 87 </p>
+5 -5
resources/views/wiki/sitemap.blade.php
··· 7 7 @endphp 8 8 9 9 @extends('master', [ 10 - 'titlePrepend' => trans('layout.header.help.sitemap'), 10 + 'titlePrepend' => osu_trans('layout.header.help.sitemap'), 11 11 ]) 12 12 13 13 @section('content') 14 14 @component('layout._page_header_v4', ['params' => [ 15 15 'links' => [ 16 16 [ 17 - 'title' => trans('layout.header.help.index'), 17 + 'title' => osu_trans('layout.header.help.index'), 18 18 'url' => wiki_url('Main_Page'), 19 19 ], 20 20 [ 21 - 'title' => trans('layout.header.help.sitemap'), 21 + 'title' => osu_trans('layout.header.help.sitemap'), 22 22 'url' => $sitemapUrl, 23 23 ], 24 24 ], ··· 36 36 data-remote="true" 37 37 data-url="{{ $sitemapUrl }}" 38 38 data-method="PUT" 39 - title="{{ trans('wiki.show.edit.refresh') }}" 39 + title="{{ osu_trans('wiki.show.edit.refresh') }}" 40 40 > 41 41 <i class="fas fa-sync"></i> 42 42 </button> ··· 56 56 @endcomponent 57 57 58 58 <div class="osu-page osu-page--generic"> 59 - <h1>{{ trans('layout.header.help.sitemap') }}</h1> 59 + <h1>{{ osu_trans('layout.header.help.sitemap') }}</h1> 60 60 <div class="osu-md"> 61 61 @include('wiki._sitemap_section', $sitemap) 62 62 </div>
+2 -2
tests/Controllers/BeatmapsControllerTest.php
··· 33 33 $this->json('GET', route('beatmaps.scores', $this->beatmap), [ 34 34 'type' => 'country', 35 35 ])->assertStatus(422) 36 - ->assertJson(['error' => trans('errors.supporter_only')]); 36 + ->assertJson(['error' => osu_trans('errors.supporter_only')]); 37 37 } 38 38 39 39 /** ··· 46 46 ->json('GET', route('beatmaps.scores', $this->beatmap), [ 47 47 'type' => 'country', 48 48 ])->assertStatus(422) 49 - ->assertJson(['error' => trans('errors.supporter_only')]); 49 + ->assertJson(['error' => osu_trans('errors.supporter_only')]); 50 50 51 51 $this->user->osu_subscriber = true; 52 52 $this->user->save();
+3 -3
tests/Libraries/ChangeUsernameTest.php
··· 27 27 $user = $this->createUser(['user_warnings' => 1]); 28 28 29 29 $errors = $user->validateChangeUsername('newusername')->all(); 30 - $expected = [trans('model_validation.user.change_username.restricted')]; 30 + $expected = [osu_trans('model_validation.user.change_username.restricted')]; 31 31 32 32 $this->assertArrayHasKey('username', $errors); 33 33 $this->assertArraySubset($expected, $errors['username'], true); ··· 67 67 $user = $this->createUser(); 68 68 69 69 $errors = $user->validateChangeUsername('iamuser')->all(); 70 - $expected = [trans('model_validation.user.change_username.username_is_same')]; 70 + $expected = [osu_trans('model_validation.user.change_username.username_is_same')]; 71 71 72 72 $this->assertArrayHasKey('username', $errors); 73 73 $this->assertArraySubset($expected, $errors['username'], true); ··· 78 78 $user = $this->createUser(); 79 79 80 80 $errors = $user->validateChangeUsername('iAmUser')->all(); 81 - $expected = [trans('model_validation.user.change_username.username_is_same')]; 81 + $expected = [osu_trans('model_validation.user.change_username.username_is_same')]; 82 82 83 83 $this->assertArrayHasKey('username', $errors); 84 84 $this->assertArraySubset($expected, $errors['username'], true);
+1 -1
tests/Libraries/OrderCheckoutTest.php
··· 91 91 $result = $checkout->validate(); 92 92 93 93 $this->assertSame( 94 - [trans('model_validation/store/product.must_separate')], 94 + [osu_trans('model_validation/store/product.must_separate')], 95 95 array_get($result, "orderItems.{$orderItem2->getKey()}") 96 96 ); 97 97 }
+6 -6
tests/Libraries/UserRegistrationTest.php
··· 40 40 $this->assertArraySubset( 41 41 $reg->user()->validationErrors()->all(), 42 42 [ 43 - 'username' => [trans('model_validation.required', [ 44 - 'attribute' => trans('model_validation.user.attributes.username'), 43 + 'username' => [osu_trans('model_validation.required', [ 44 + 'attribute' => osu_trans('model_validation.user.attributes.username'), 45 45 ])], 46 46 ] 47 47 ); ··· 61 61 $this->assertArraySubset( 62 62 $reg->user()->validationErrors()->all(), 63 63 [ 64 - 'user_email' => [trans('model_validation.required', [ 65 - 'attribute' => trans('model_validation.user.attributes.user_email'), 64 + 'user_email' => [osu_trans('model_validation.required', [ 65 + 'attribute' => osu_trans('model_validation.user.attributes.user_email'), 66 66 ])], 67 67 ] 68 68 ); ··· 82 82 $this->assertArraySubset( 83 83 $reg->user()->validationErrors()->all(), 84 84 [ 85 - 'password' => [trans('model_validation.required', [ 86 - 'attribute' => trans('model_validation.user.attributes.password'), 85 + 'password' => [osu_trans('model_validation.required', [ 86 + 'attribute' => osu_trans('model_validation.user.attributes.password'), 87 87 ])], 88 88 ] 89 89 );
+24 -24
tests/LocaleTest.php
··· 10 10 public function testAll() 11 11 { 12 12 $fallbackLocale = 'en'; 13 - trans()->addLines([ 13 + osu_trans()->addLines([ 14 14 'key_1.simple' => 'test', 15 15 'key_1.simple_empty' => 'test 2', 16 16 'key_1.simple_missing' => 'test 3', ··· 26 26 ], $fallbackLocale); 27 27 28 28 app()->setLocale($fallbackLocale); 29 - $this->assertSame('key_1.missing', trans('key_1.missing')); 30 - $this->assertSame('test', trans('key_1.simple')); 31 - $this->assertSame('test: stuff', trans('key_1.keyed', ['value' => 'stuff'])); 32 - $this->assertSame('1 unit', trans_choice('key_1.choice', 1)); 33 - $this->assertSame('2 units', trans_choice('key_1.choice', 2)); 34 - $this->assertSame('', trans('key_1.empty')); 29 + $this->assertSame('key_1.missing', osu_trans('key_1.missing')); 30 + $this->assertSame('test', osu_trans('key_1.simple')); 31 + $this->assertSame('test: stuff', osu_trans('key_1.keyed', ['value' => 'stuff'])); 32 + $this->assertSame('1 unit', osu_trans_choice('key_1.choice', 1)); 33 + $this->assertSame('2 units', osu_trans_choice('key_1.choice', 2)); 34 + $this->assertSame('', osu_trans('key_1.empty')); 35 35 36 36 $incompleteLocale = 'ja'; 37 - trans()->addLines([ 37 + osu_trans()->addLines([ 38 38 'key_1.simple' => 'テスト', 39 39 'key_1.simple_empty' => '', 40 40 'key_1.keyed' => 'テスト: :value', ··· 46 46 47 47 app('translator')->setFallback($fallbackLocale); 48 48 app()->setLocale($incompleteLocale); 49 - $this->assertSame('key_1.missing', trans('key_1.missing')); 50 - $this->assertSame('テスト', trans('key_1.simple')); 51 - $this->assertSame('test 2', trans('key_1.simple_empty')); 52 - $this->assertSame('test 3', trans('key_1.simple_missing')); 49 + $this->assertSame('key_1.missing', osu_trans('key_1.missing')); 50 + $this->assertSame('テスト', osu_trans('key_1.simple')); 51 + $this->assertSame('test 2', osu_trans('key_1.simple_empty')); 52 + $this->assertSame('test 3', osu_trans('key_1.simple_missing')); 53 53 54 - $this->assertSame('テスト: stuff', trans('key_1.keyed', ['value' => 'stuff'])); 55 - $this->assertSame('test 2: stuff', trans('key_1.keyed_empty', ['value' => 'stuff'])); 56 - $this->assertSame('test 3: stuff', trans('key_1.keyed_missing', ['value' => 'stuff'])); 54 + $this->assertSame('テスト: stuff', osu_trans('key_1.keyed', ['value' => 'stuff'])); 55 + $this->assertSame('test 2: stuff', osu_trans('key_1.keyed_empty', ['value' => 'stuff'])); 56 + $this->assertSame('test 3: stuff', osu_trans('key_1.keyed_missing', ['value' => 'stuff'])); 57 57 58 - $this->assertSame('1個', trans_choice('key_1.choice', 1)); 59 - $this->assertSame('2個', trans_choice('key_1.choice', 2)); 60 - $this->assertSame('1 item', trans_choice('key_1.choice_empty', 1)); 61 - $this->assertSame('2 items', trans_choice('key_1.choice_empty', 2)); 62 - $this->assertSame('1 entity', trans_choice('key_1.choice_missing', 1)); 63 - $this->assertSame('2 entities', trans_choice('key_1.choice_missing', 2)); 64 - $this->assertSame('', trans('key_1.empty')); 65 - $this->assertSame('', trans('key_1.empty_empty')); 66 - $this->assertSame('', trans('key_1.empty_missing')); 58 + $this->assertSame('1個', osu_trans_choice('key_1.choice', 1)); 59 + $this->assertSame('2個', osu_trans_choice('key_1.choice', 2)); 60 + $this->assertSame('1 item', osu_trans_choice('key_1.choice_empty', 1)); 61 + $this->assertSame('2 items', osu_trans_choice('key_1.choice_empty', 2)); 62 + $this->assertSame('1 entity', osu_trans_choice('key_1.choice_missing', 1)); 63 + $this->assertSame('2 entities', osu_trans_choice('key_1.choice_missing', 2)); 64 + $this->assertSame('', osu_trans('key_1.empty')); 65 + $this->assertSame('', osu_trans('key_1.empty_empty')); 66 + $this->assertSame('', osu_trans('key_1.empty_missing')); 67 67 } 68 68 69 69 /**
+5 -5
tests/Models/BeatmapsetTest.php
··· 125 125 $nominator = $this->createUserWithGroupPlaymodes('bng', $beatmapset->playmodesStr()); 126 126 127 127 $this->expectException(AuthorizationException::class); 128 - $this->expectExceptionMessage(trans('authorization.beatmap_discussion.nominate.set_metadata')); 128 + $this->expectExceptionMessage(osu_trans('authorization.beatmap_discussion.nominate.set_metadata')); 129 129 priv_check_user($nominator, 'BeatmapsetNominate', $beatmapset)->ensureCan(); 130 130 } 131 131 ··· 266 266 $result = $beatmapset->nominate($user); 267 267 268 268 $this->assertFalse($result['result']); 269 - $this->assertSame($result['message'], trans('beatmapsets.nominate.hybrid_requires_modes')); 269 + $this->assertSame($result['message'], osu_trans('beatmapsets.nominate.hybrid_requires_modes')); 270 270 271 271 $this->assertSame($notifications, Notification::count()); 272 272 $this->assertSame($userNotifications, UserNotification::count()); ··· 287 287 $result = $beatmapset->nominate($user, ['taiko']); 288 288 289 289 $this->assertFalse($result['result']); 290 - $this->assertSame($result['message'], trans('beatmapsets.nominate.incorrect_mode', ['mode' => 'taiko'])); 290 + $this->assertSame($result['message'], osu_trans('beatmapsets.nominate.incorrect_mode', ['mode' => 'taiko'])); 291 291 292 292 $this->assertSame($notifications, Notification::count()); 293 293 $this->assertSame($userNotifications, UserNotification::count()); ··· 326 326 $result = $beatmapset->fresh()->nominate($user, ['osu']); 327 327 328 328 $this->assertFalse($result['result']); 329 - $this->assertSame($result['message'], trans('beatmaps.nominations.too_many')); 329 + $this->assertSame($result['message'], osu_trans('beatmaps.nominations.too_many')); 330 330 $this->assertTrue($beatmapset->fresh()->isPending()); 331 331 } 332 332 ··· 374 374 $result = $beatmapset->fresh()->nominate($user, ['osu', 'taiko']); 375 375 376 376 $this->assertFalse($result['result']); 377 - $this->assertSame($result['message'], trans('beatmapsets.nominate.full_bn_required')); 377 + $this->assertSame($result['message'], osu_trans('beatmapsets.nominate.full_bn_required')); 378 378 $this->assertTrue($beatmapset->fresh()->isPending()); 379 379 } 380 380