From e075b9061e55ec0890ebe75e0314330e5bb0ee6c Mon Sep 17 00:00:00 2001
From: Jakob Schrettenbrunner <dev@schrej.net>
Date: Wed, 18 Jan 2017 02:01:26 +0100
Subject: [PATCH] replace `{{ trans() }}` with `@lang()`

---
 .../themes/pterodactyl/auth/login.blade.php   | 14 +++---
 .../auth/passwords/email.blade.php            | 10 ++---
 .../auth/passwords/reset.blade.php            | 18 ++++----
 .../themes/pterodactyl/base/account.blade.php | 28 ++++++------
 .../pterodactyl/base/api/index.blade.php      | 20 ++++-----
 .../themes/pterodactyl/base/index.blade.php   | 28 ++++++------
 .../pterodactyl/base/security.blade.php       | 44 +++++++++----------
 .../pterodactyl/layouts/master.blade.php      | 36 +++++++--------
 .../themes/pterodactyl/server/index.blade.php |  4 +-
 .../server/settings/sftp.blade.php            |  8 ++--
 10 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/resources/themes/pterodactyl/auth/login.blade.php b/resources/themes/pterodactyl/auth/login.blade.php
index cddf1c2d9..6582356ad 100644
--- a/resources/themes/pterodactyl/auth/login.blade.php
+++ b/resources/themes/pterodactyl/auth/login.blade.php
@@ -28,7 +28,7 @@
     @if (count($errors) > 0)
         <div class="callout callout-danger">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            {{ trans('auth.auth_error') }}<br><br>
+            @lang('auth.auth_error')<br><br>
             <ul>
                 @foreach ($errors->all() as $error)
                     <li>{{ $error }}</li>
@@ -44,28 +44,28 @@
             </div>
         @endforeach
     @endforeach
-    <p class="login-box-msg">{{ trans('auth.authentication_required') }}</p>
+    <p class="login-box-msg">@lang('auth.authentication_required')</p>
     <form action="{{ route('auth.login') }}" method="POST">
         <div class="form-group has-feedback">
-            <input type="email" name="email" class="form-control" value="{{ old('email') }}" placeholder="{{ trans('strings.email') }}">
+            <input type="email" name="email" class="form-control" value="{{ old('email') }}" placeholder="@lang('strings.email')">
             <span class="fa fa-envelope form-control-feedback"></span>
         </div>
         <div class="form-group has-feedback">
-            <input type="password" name="password" class="form-control" placeholder="{{ trans('strings.password') }}">
+            <input type="password" name="password" class="form-control" placeholder="@lang('strings.password')">
             <span class="fa fa-lock form-control-feedback"></span>
         </div>
         <div class="row">
             <div class="col-xs-8">
                 <div class="form-group has-feedback">
-                    <input type="checkbox" name="remember_me" id="remember_me" /> <label for="remember_me" class="weight-300">{{ trans('auth.remember_me') }}</label>
+                    <input type="checkbox" name="remember_me" id="remember_me" /> <label for="remember_me" class="weight-300">@lang('auth.remember_me')</label>
                 </div>
             </div>
             <div class="col-xs-4">
                 {!! csrf_field() !!}
-                <button type="submit" class="btn btn-primary btn-block btn-flat">{{ trans('auth.sign_in') }}</button>
+                <button type="submit" class="btn btn-primary btn-block btn-flat">@lang('auth.sign_in')</button>
             </div>
         </div>
     </form>
-    <a href="{{ route('auth.password') }}">{{ trans('auth.forgot_password') }}</a><br>
+    <a href="{{ route('auth.password') }}">@lang('auth.forgot_password')</a><br>
 </div>
 @endsection
diff --git a/resources/themes/pterodactyl/auth/passwords/email.blade.php b/resources/themes/pterodactyl/auth/passwords/email.blade.php
index ea5456bae..a8e8202bb 100644
--- a/resources/themes/pterodactyl/auth/passwords/email.blade.php
+++ b/resources/themes/pterodactyl/auth/passwords/email.blade.php
@@ -27,13 +27,13 @@
 <div class="login-box-body">
     @if (session('status'))
         <div class="callout callout-success">
-            {{ trans('auth.email_sent') }}
+            @lang('auth.email_sent')
         </div>
     @endif
-    <p class="login-box-msg">{{ trans('auth.request_reset_text') }}</p>
+    <p class="login-box-msg">@lang('auth.request_reset_text')</p>
     <form action="{{ route('auth.password') }}" method="POST">
         <div class="form-group has-feedback">
-            <input type="email" name="email" class="form-control" value="{{ old('email') }}" autofocus placeholder="{{ trans('strings.email') }}">
+            <input type="email" name="email" class="form-control" value="{{ old('email') }}" autofocus placeholder="@lang('strings.email')">
             <span class="fa fa-envelope form-control-feedback"></span>
             @if ($errors->has('email'))
                 <span class="help-block text-red small">
@@ -43,11 +43,11 @@
         </div>
         <div class="row">
             <div class="col-xs-4">
-                <a href="{{ route('auth.login') }}"><button type="button" class="btn btn-clear btn-block btn-flat">{{ trans('strings.login') }}</button></a>
+                <a href="{{ route('auth.login') }}"><button type="button" class="btn btn-clear btn-block btn-flat">@lang('strings.login')</button></a>
             </div>
             <div class="col-xs-8">
                 {!! csrf_field() !!}
-                <button type="submit" class="btn btn-primary btn-block btn-flat">{{ trans('auth.request_reset') }}</button>
+                <button type="submit" class="btn btn-primary btn-block btn-flat">@lang('auth.request_reset')</button>
             </div>
         </div>
     </form>
diff --git a/resources/themes/pterodactyl/auth/passwords/reset.blade.php b/resources/themes/pterodactyl/auth/passwords/reset.blade.php
index 4e730c867..cc1998e15 100644
--- a/resources/themes/pterodactyl/auth/passwords/reset.blade.php
+++ b/resources/themes/pterodactyl/auth/passwords/reset.blade.php
@@ -25,12 +25,12 @@
 
 @section('content')
 <div class="login-box-body">
-    <p class="login-box-msg">{{ trans('auth.reset_password_text') }}</p>
+    <p class="login-box-msg">@lang('auth.reset_password_text')</p>
     <form action="{{ route('auth.reset.post') }}" method="POST">
         <div class="form-group">
-            <label for="email" class="control-label">{{ trans('strings.email') }}</label>
+            <label for="email" class="control-label">@lang('strings.email')</label>
             <div>
-                <input type="text" class="form-control" name="email" id="email" value="{{ $email or old('email') }}" required autofocus placeholder="{{ trans('strings.email') }}" />
+                <input type="text" class="form-control" name="email" id="email" value="{{ $email or old('email') }}" required autofocus placeholder="@lang('strings.email')" />
                 @if ($errors->has('email'))
                     <span class="help-block text-red small">
                         {{ $errors->first('email') }}
@@ -39,21 +39,21 @@
             </div>
         </div>
         <div class="form-group">
-            <label for="password" class="control-label">{{ trans('strings.password') }}</label>
+            <label for="password" class="control-label">@lang('strings.password')</label>
             <div>
-                <input type="password" class="form-control" name="password" id="password" required placeholder="{{ trans('strings.password') }}" />
+                <input type="password" class="form-control" name="password" id="password" required placeholder="@lang('strings.password')" />
                 @if ($errors->has('password'))
                     <span class="help-block text-red small">
                         {{ $errors->first('password') }}
                     </span>
                 @endif
-                <p class="text-muted"><small>{{ trans('auth.password_requirements') }}</small></p>
+                <p class="text-muted"><small>@lang('auth.password_requirements')</small></p>
             </div>
         </div>
         <div class="form-group">
-            <label for="password" class="control-label">{{ trans('strings.confirm_password') }}</label>
+            <label for="password" class="control-label">@lang('strings.confirm_password')</label>
             <div>
-                <input type="password" class="form-control" name="password_confirmation" id="password_confirmation" required placeholder="{{ trans('strings.confirm_password') }}" />
+                <input type="password" class="form-control" name="password_confirmation" id="password_confirmation" required placeholder="@lang('strings.confirm_password')" />
                 @if ($errors->has('password_confirmation'))
                     <span class="help-block text-red small">
                         {{ $errors->first('password_confirmation') }}
@@ -65,7 +65,7 @@
             <div class="col-xs-12">
                 {!! csrf_field() !!}
                 <input type="hidden" name="token" value="{{ $token }}">
-                <button type="submit" class="btn btn-primary btn-block btn-flat">{{ trans('auth.reset_password') }}</button>
+                <button type="submit" class="btn btn-primary btn-block btn-flat">@lang('auth.reset_password')</button>
             </div>
         </div>
     </form>
diff --git a/resources/themes/pterodactyl/base/account.blade.php b/resources/themes/pterodactyl/base/account.blade.php
index 9ab86ee87..0bb797fda 100644
--- a/resources/themes/pterodactyl/base/account.blade.php
+++ b/resources/themes/pterodactyl/base/account.blade.php
@@ -20,14 +20,14 @@
 @extends('layouts.master')
 
 @section('title')
-    {{ trans('base.account.header') }}
+    @lang('base.account.header')
 @endsection
 
 @section('content-header')
-    <h1>{{ trans('base.account.header') }}<small>{{ trans('base.account.header_sub')}}</small></h1>
+    <h1>@lang('base.account.header')<small>@lang('base.account.header_sub')</small></h1>
     <ol class="breadcrumb">
-        <li><a href="{{ route('index') }}">{{ trans('strings.home') }}</a></li>
-        <li class="active">{{ trans('strings.account') }}</li>
+        <li><a href="{{ route('index') }}">@lang('strings.home')</a></li>
+        <li class="active">@lang('strings.account')</li>
     </ol>
 @endsection
 
@@ -36,25 +36,25 @@
     <div class="col-sm-6">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('base.account.update_pass') }}</h3>
+                <h3 class="box-title">@lang('base.account.update_pass')</h3>
             </div>
             <form action="{{ route('account.password') }}" method="post">
                 <div class="box-body">
                     <div class="form-group">
-                        <label for="current_password" class="control-label">{{ trans('base.account.current_password') }}</label>
+                        <label for="current_password" class="control-label">@lang('base.account.current_password')</label>
                         <div>
                             <input type="password" class="form-control" name="current_password" />
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="new_password" class="control-label">{{ trans('base.account.new_password') }}</label>
+                        <label for="new_password" class="control-label">@lang('base.account.new_password')</label>
                         <div>
                             <input type="password" class="form-control" name="new_password" />
-                            <p class="text-muted"><small>{{ trans('auth.password_requirements') }}</small></p>
+                            <p class="text-muted"><small>@lang('auth.password_requirements')</small></p>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="new_password_again" class="control-label">{{ trans('base.account.new_password_again') }}</label>
+                        <label for="new_password_again" class="control-label">@lang('base.account.new_password_again')</label>
                         <div>
                             <input type="password" class="form-control" name="new_password_confirmation" />
                         </div>
@@ -62,7 +62,7 @@
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_pass') }}" />
+                    <input type="submit" class="btn btn-primary btn-sm" value="@lang('base.account.update_pass')" />
                 </div>
             </form>
         </div>
@@ -70,18 +70,18 @@
     <div class="col-sm-6">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('base.account.update_email') }}</h3>
+                <h3 class="box-title">@lang('base.account.update_email')</h3>
             </div>
             <form action="{{ route('account.email') }}" method="post">
                 <div class="box-body">
                     <div class="form-group">
-                        <label for="new_email" class="control-label">{{ trans('base.account.new_email') }}</label>
+                        <label for="new_email" class="control-label">@lang('base.account.new_email')</label>
                         <div>
                             <input type="text" class="form-control" name="new_email" />
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="password" class="control-label">{{ trans('base.account.current_password') }}</label>
+                        <label for="password" class="control-label">@lang('base.account.current_password')</label>
                         <div>
                             <input type="password" class="form-control" name="password" />
                         </div>
@@ -89,7 +89,7 @@
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_email') }}" />
+                    <input type="submit" class="btn btn-primary btn-sm" value="@lang('base.account.update_email')" />
                 </div>
             </form>
         </div>
diff --git a/resources/themes/pterodactyl/base/api/index.blade.php b/resources/themes/pterodactyl/base/api/index.blade.php
index 8d59ba153..7a1776c34 100644
--- a/resources/themes/pterodactyl/base/api/index.blade.php
+++ b/resources/themes/pterodactyl/base/api/index.blade.php
@@ -20,14 +20,14 @@
 @extends('layouts.master')
 
 @section('title')
-    {{ trans('base.api.index.header') }}
+    @lang('base.api.index.header')
 @endsection
 
 @section('content-header')
-    <h1>{{ trans('base.api.index.header') }}<small>{{ trans('base.api.index.header_sub')}}</small></h1>
+    <h1>@lang('base.api.index.header')<small>@lang('base.api.index.header_sub')</small></h1>
     <ol class="breadcrumb">
-        <li><a href="{{ route('index') }}">{{ trans('strings.home') }}</a></li>
-        <li class="active">{{ trans('strings.api_access') }}</li>
+        <li><a href="{{ route('index') }}">@lang('strings.home')</a></li>
+        <li class="active">@lang('strings.api_access')</li>
     </ol>
 @endsection
 
@@ -36,16 +36,16 @@
     <div class="col-xs-12">
         <div class="box">
             <div class="box-header">
-                <h3 class="box-title">{{ trans('base.api.index.list')}}</h3>
+                <h3 class="box-title">@lang('base.api.index.list')</h3>
             </div>
             <div class="box-body table-responsive no-padding">
                 <table class="table table-hover">
                     <tbody>
                         <tr>
-                            <th>{{ trans('strings.public_key') }}</th>
-                            <th>{{ trans('strings.memo') }}</th>
-                            <th class="text-center hidden-sm hidden-xs">{{ trans('strings.created') }}</th>
-                            <th class="text-center hidden-sm hidden-xs">{{ trans('strings.expires') }}</th>
+                            <th>@lang('strings.public_key')</th>
+                            <th>@lang('strings.memo')</th>
+                            <th class="text-center hidden-sm hidden-xs">@lang('strings.created')</th>
+                            <th class="text-center hidden-sm hidden-xs">@lang('strings.expires')</th>
                             <th></th>
                         </tr>
                         @foreach ($keys as $key)
@@ -72,7 +72,7 @@
             </div>
             <div class="box-footer">
                 <a href="{{ route('account.api.new') }}">
-                    <button class="btn btn-sm btn-success">{{ trans('base.api.index.create_new') }}</button>
+                    <button class="btn btn-sm btn-success">@lang('base.api.index.create_new')</button>
                 </a>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/base/index.blade.php b/resources/themes/pterodactyl/base/index.blade.php
index 88509988d..25e2e4f4b 100644
--- a/resources/themes/pterodactyl/base/index.blade.php
+++ b/resources/themes/pterodactyl/base/index.blade.php
@@ -20,14 +20,14 @@
 @extends('layouts.master')
 
 @section('title')
-    {{ trans('base.index.header') }}
+    @lang('base.index.header')
 @endsection
 
 @section('content-header')
-    <h1>{{ trans('base.index.header') }}<small>{{ trans('base.index.header_sub')}}</small></h1>
+    <h1>@lang('base.index.header')<small>@lang('base.index.header_sub')</small></h1>
     <ol class="breadcrumb">
-        <li><a href="{{ route('index') }}">{{ trans('strings.home') }}</a></li>
-        <li class="active">{{ trans('strings.servers') }}</li>
+        <li><a href="{{ route('index') }}">@lang('strings.home')</a></li>
+        <li class="active">@lang('strings.servers')</li>
     </ol>
 @endsection
 
@@ -36,10 +36,10 @@
     <div class="col-xs-12">
         <div class="box">
             <div class="box-header">
-                <h3 class="box-title">{{ trans('base.index.list') }}</h3>
+                <h3 class="box-title">@lang('base.index.list')</h3>
                 <div class="box-tools">
                     <div class="input-group input-group-sm" style="width: 150px;">
-                        <input type="text" name="table_search" class="form-control pull-right" placeholder="{{ trans('strings.search') }}">
+                        <input type="text" name="table_search" class="form-control pull-right" placeholder="@lang('strings.search')">
                         <div class="input-group-btn">
                             <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                         </div>
@@ -50,13 +50,13 @@
                 <table class="table table-hover">
                     <tbody>
                         <tr>
-                            <th>{{ trans('strings.id') }}</th>
-                            <th>{{ trans('strings.name') }}</th>
-                            <th>{{ trans('strings.node') }}</th>
-                            <th>{{ trans('strings.connection') }}</th>
-                            <th class="text-center hidden-sm hidden-xs">{{ trans('strings.memory') }}</th>
-                            <th class="text-center hidden-sm hidden-xs">{{ trans('strings.cpu') }}</th>
-                            <th class="text-center">{{ trans('strings.status') }}</th>
+                            <th>@lang('strings.id')</th>
+                            <th>@lang('strings.name')</th>
+                            <th>@lang('strings.node')</th>
+                            <th>@lang('strings.connection')</th>
+                            <th class="text-center hidden-sm hidden-xs">@lang('strings.memory')</th>
+                            <th class="text-center hidden-sm hidden-xs">@lang('strings.cpu')</th>
+                            <th class="text-center">@lang('strings.status')</th>
                         </tr>
                         @foreach($servers as $server)
                         <tr class="dynamic-update" data-server="{{ $server->uuidShort }}">
@@ -68,7 +68,7 @@
                             <td class="text-center hidden-sm hidden-xs"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">--</span> %</td>
                             <td class="text-center" data-action="status">
                                 @if($server->suspended === 1)
-                                    <span class="label label-warning">{{ trans('strings.suspended') }}</span>
+                                    <span class="label label-warning">@lang('strings.suspended')</span>
                                 @else
                                     <span class="label label-default"><i class="fa fa-refresh fa-fw fa-spin"></i></span>
                                 @endif
diff --git a/resources/themes/pterodactyl/base/security.blade.php b/resources/themes/pterodactyl/base/security.blade.php
index d32ffe31f..cab949ea8 100644
--- a/resources/themes/pterodactyl/base/security.blade.php
+++ b/resources/themes/pterodactyl/base/security.blade.php
@@ -20,15 +20,15 @@
 @extends('layouts.master')
 
 @section('title')
-    {{ trans('base.security.header') }}
+    @lang('base.security.header')
 @endsection
 
 @section('content-header')
-    <h1>{{ trans('base.security.header') }}<small>{{ trans('base.security.header_sub')}}</small></h1>
+    <h1>@lang('base.security.header')<small>@lang('base.security.header_sub')</small></h1>
     <ol class="breadcrumb">
-        <li><a href="{{ route('index') }}">{{ trans('strings.home') }}</a></li>
-        <li><a href="{{ route('account') }}">{{ trans('strings.account') }}</a></li>
-        <li class="active">{{ trans('strings.security') }}</li>
+        <li><a href="{{ route('index') }}">@lang('strings.home')</a></li>
+        <li><a href="{{ route('account') }}">@lang('strings.account')</a></li>
+        <li class="active">@lang('strings.security')</li>
     </ol>
 @endsection
 
@@ -37,15 +37,15 @@
     <div class="col-md-6">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('base.security.sessions') }}</h3>
+                <h3 class="box-title">@lang('base.security.sessions')</h3>
             </div>
             <div class="box-body table-responsive no-padding">
                 <table class="table table-hover">
                     <tbody>
                         <tr>
-                            <th>{{ trans('strings.id') }}</th>
-                            <th>{{ trans('strings.ip') }}</th>
-                            <th>{{ trans('strings.last_activity') }}</th>
+                            <th>@lang('strings.id')</th>
+                            <th>@lang('strings.ip')</th>
+                            <th>@lang('strings.last_activity')</th>
                             <th></th>
                         </tr>
                         @foreach($sessions as $session)
@@ -55,7 +55,7 @@
                                 <td>{{ Carbon::createFromTimestamp($session->last_activity)->diffForHumans() }}</td>
                                 <td>
                                     <a href="{{ route('account.security.revoke', $session->id) }}">
-                                        <button class="btn btn-xs btn-danger"><i class="fa fa-trash-o"></i> {{ trans('strings.revoke') }}</button>
+                                        <button class="btn btn-xs btn-danger"><i class="fa fa-trash-o"></i> @lang('strings.revoke')</button>
                                     </a>
                                 </td>
                             </tr>
@@ -68,34 +68,34 @@
     <div class="col-md-6">
         <div class="box {{ (Auth::user()->use_totp) ? 'box-success' : 'box-danger' }}">
             <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('base.security.2fa_header') }}</h3>
+                <h3 class="box-title">@lang('base.security.2fa_header')</h3>
             </div>
             @if(Auth::user()->use_totp)
             <form action="{{ route('account.security.totp') }}" method="post">
                 <div class="box-body">
-                    <p>{{ trans('base.security.2fa_enabled') }}</p>
+                    <p>@lang('base.security.2fa_enabled')</p>
                     <div class="form-group">
-                        <label for="new_password_again" class="control-label">{{ trans('strings.2fa_token') }}</label>
+                        <label for="new_password_again" class="control-label">@lang('strings.2fa_token')</label>
                         <div>
                             <input type="text" class="form-control" name="token" />
-                            <p class="text-muted small">{{ trans('base.security.2fa_token_help') }}</p>
+                            <p class="text-muted small">@lang('base.security.2fa_token_help')</p>
                         </div>
                     </div>
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
                     {{ method_field('DELETE') }}
-                    <button type="submit" class="btn btn-danger btn-sm">{{ trans('base.security.disable_2fa') }}</button>
+                    <button type="submit" class="btn btn-danger btn-sm">@lang('base.security.disable_2fa')</button>
                 </div>
             </form>
             @else
             <form action="#" method="post" id="do_2fa">
                 <div class="box-body">
-                    {{ trans('base.security.2fa_disabled') }}
+                    @lang('base.security.2fa_disabled')
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <button type="submit" class="btn btn-success btn-sm">{{ trans('base.security.enable_2fa') }}</button>
+                    <button type="submit" class="btn btn-success btn-sm">@lang('base.security.enable_2fa')</button>
                 </div>
             </form>
             @endif
@@ -107,7 +107,7 @@
         <div class="modal-content">
             <form action="#" method="post" id="2fa_token_verify">
                 <div class="modal-header">
-                    <h4 class="modal-title">{{ trans('base.security.2fa_qr') }}</h4>
+                    <h4 class="modal-title">@lang('base.security.2fa_qr')</h4>
                 </div>
                 <div class="modal-body" id="modal_insert_content">
                     <div class="row">
@@ -118,9 +118,9 @@
                             <center><span id="hide_img_load"><i class="fa fa-spinner fa-spin"></i> Loading QR Code...</span><img src="" id="qr_image_insert" style="display:none;"/><br /><code id="2fa_secret_insert"></code></center>
                         </div>
                         <div class="col-md-6">
-                            <div class="alert alert-info">{{ trans('base.security.2fa_checkpoint_help') }}</div>
+                            <div class="alert alert-info">@lang('base.security.2fa_checkpoint_help')</div>
                             <div class="form-group">
-                                <label class="control-label" for="2fa_token">{{ trans('strings.2fa_token') }}</label>
+                                <label class="control-label" for="2fa_token">@lang('strings.2fa_token')</label>
                                 {!! csrf_field() !!}
                                 <input class="form-control" type="text" name="2fa_token" id="2fa_token" />
                             </div>
@@ -128,8 +128,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="submit" class="btn btn-primary btn-sm" id="submit_action">{{ trans('strings.submit') }}</button>
-                    <button type="button" class="btn btn-default btn-sm" data-dismiss="modal" id="close_reload">{{ trans('strings.close') }}</button>
+                    <button type="submit" class="btn btn-primary btn-sm" id="submit_action">@lang('strings.submit')</button>
+                    <button type="button" class="btn btn-default btn-sm" data-dismiss="modal" id="close_reload">@lang('strings.close')</button>
                 </div>
             </form>
         </div>
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 0baab1477..220b823fe 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -111,46 +111,46 @@
                         </div>
                     @endif
                     <ul class="sidebar-menu">
-                        <li class="header">{{ trans('navigation.account.header') }}</li>
+                        <li class="header">@lang('navigation.account.header')</li>
                         <li class="{{ Route::currentRouteName() !== 'account' ?: 'active' }}">
                             <a href="{{ route('account')}}">
-                                <i class="fa fa-user"></i> <span>{{ trans('navigation.account.my_account') }}</span>
+                                <i class="fa fa-user"></i> <span>@lang('navigation.account.my_account')</span>
                             </a>
                         </li>
                         <li class="{{ Route::currentRouteName() !== 'account.security' ?: 'active' }}">
                             <a href="{{ route('account.security')}}">
-                                <i class="fa fa-lock"></i> <span>{{ trans('navigation.account.security_controls') }}</span>
+                                <i class="fa fa-lock"></i> <span>@lang('navigation.account.security_controls')</span>
                             </a>
                         </li>
                         <li class="{{ Route::currentRouteName() !== 'account.api' ?: 'active' }}">
                             <a href="{{ route('account.api')}}">
-                                <i class="fa fa-code"></i> <span>{{ trans('navigation.account.api_access') }}</span>
+                                <i class="fa fa-code"></i> <span>@lang('navigation.account.api_access')</span>
                             </a>
                         </li>
                         <li class="{{ Route::currentRouteName() !== 'index' ?: 'active' }}">
                             <a href="{{ route('index')}}">
-                                <i class="fa fa-server"></i> <span>{{ trans('navigation.account.my_servers') }}</span>
+                                <i class="fa fa-server"></i> <span>@lang('navigation.account.my_servers')</span>
                             </a>
                         </li>
                         @if (isset($server->name) && isset($node->name))
-                            <li class="header">{{ trans('navigation.server.header') }}</li>
+                            <li class="header">@lang('navigation.server.header')</li>
                             <li class="{{ Route::currentRouteName() !== 'server.index' ?: 'active' }}">
                                 <a href="{{ route('server.index', $server->uuidShort) }}">
-                                    <i class="fa fa-terminal"></i> <span>{{ trans('navigation.server.console') }}</span>
+                                    <i class="fa fa-terminal"></i> <span>@lang('navigation.server.console')</span>
                                 </a>
                             </li>
                             <li class="treeview {{ Route::currentRouteName() !== 'server.files.index' ?: 'active' }}">
                                 <a href="#">
                                     <i class="fa fa-files-o"></i>
-                                    <span>{{ trans('navigation.server.file_management') }}</span>
+                                    <span>@lang('navigation.server.file_management')</span>
                                     <span class="pull-right-container">
                                         <i class="fa fa-angle-left pull-right"></i>
                                     </span>
                                 </a>
                                 <ul class="treeview-menu">
-                                    <li><a href="{{ route('server.files.index', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.file_browser') }}</a></li>
-                                    <li><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.create_file') }}</a></li>
-                                    <li><a href=""><i class="fa fa-angle-right"></i> {{ trans('navigation.server.upload_files') }}</a></li>
+                                    <li><a href="{{ route('server.files.index', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.file_browser')</a></li>
+                                    <li><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.create_file')</a></li>
+                                    <li><a href=""><i class="fa fa-angle-right"></i> @lang('navigation.server.upload_files')</a></li>
                                 </ul>
                             </li>
                             <li>
@@ -160,7 +160,7 @@
                             </li>
                             <li>
                                 <a href="{{ route('server.tasks', $server->uuidShort)}}">
-                                    <i class="fa fa-clock-o"></i> <span>{{ trans('navigation.server.task_management') }}</span>
+                                    <i class="fa fa-clock-o"></i> <span>@lang('navigation.server.task_management')</span>
                                     <span class="pull-right-container">
                                         <span class="label label-primary pull-right">4</span>
                                     </span>
@@ -173,16 +173,16 @@
                             ">
                                 <a href="#">
                                     <i class="fa fa-gears"></i>
-                                    <span>{{ trans('navigation.server.configuration') }}</span>
+                                    <span>@lang('navigation.server.configuration')</span>
                                     <span class="pull-right-container">
                                         <i class="fa fa-angle-left pull-right"></i>
                                     </span>
                                 </a>
                                 <ul class="treeview-menu">
-                                    <li><a href=""><i class="fa fa-angle-right"></i> {{ trans('navigation.server.port_allocations') }}</a></li>
-                                    <li class="{{ Route::currentRouteName() !== 'server.settings.sftp' ?: 'active' }}"><a href="{{ route('server.settings.sftp', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.sftp_settings') }}</a></li>
-                                    <li class="{{ Route::currentRouteName() !== 'server.settings.startup' ?: 'active' }}"><a href="{{ route('server.settings.startup', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.startup_parameters') }}</a></li>
-                                    <li class="{{ Route::currentRouteName() !== 'server.settings.databases' ?: 'active' }}"><a href="{{ route('server.settings.databases', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.databases') }}</a></li>
+                                    <li><a href=""><i class="fa fa-angle-right"></i> @lang('navigation.server.port_allocations')</a></li>
+                                    <li class="{{ Route::currentRouteName() !== 'server.settings.sftp' ?: 'active' }}"><a href="{{ route('server.settings.sftp', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.sftp_settings')</a></li>
+                                    <li class="{{ Route::currentRouteName() !== 'server.settings.startup' ?: 'active' }}"><a href="{{ route('server.settings.startup', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.startup_parameters')</a></li>
+                                    <li class="{{ Route::currentRouteName() !== 'server.settings.databases' ?: 'active' }}"><a href="{{ route('server.settings.databases', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.databases')</a></li>
                                 </ul>
                             </li>
                         @endif
@@ -198,7 +198,7 @@
                         <div class="col-xs-12">
                             @if (count($errors) > 0)
                                 <div class="callout callout-danger">
-                                    {{ trans('base.validation_error') }}<br><br>
+                                    @lang('base.validation_error')<br><br>
                                     <ul>
                                         @foreach ($errors->all() as $error)
                                             <li>{{ $error }}</li>
diff --git a/resources/themes/pterodactyl/server/index.blade.php b/resources/themes/pterodactyl/server/index.blade.php
index 14eb92ce4..9b6b6b95c 100644
--- a/resources/themes/pterodactyl/server/index.blade.php
+++ b/resources/themes/pterodactyl/server/index.blade.php
@@ -29,9 +29,9 @@
 @endsection
 
 @section('content-header')
-    <h1>{{ trans('server.index.header') }}<small>{{ trans('server.index.header_sub')}}</small></h1>
+    <h1>@lang('server.index.header')<small>@lang('server.index.header_sub')</small></h1>
     <ol class="breadcrumb">
-        <li><a href="{{ route('index') }}">{{ trans('strings.servers') }}</a></li>
+        <li><a href="{{ route('index') }}">@lang('strings.servers')</a></li>
         <li class="active">{{ $server->name }}</li>
     </ol>
 @endsection
diff --git a/resources/themes/pterodactyl/server/settings/sftp.blade.php b/resources/themes/pterodactyl/server/settings/sftp.blade.php
index 47b96fb27..1c146c33d 100644
--- a/resources/themes/pterodactyl/server/settings/sftp.blade.php
+++ b/resources/themes/pterodactyl/server/settings/sftp.blade.php
@@ -44,16 +44,16 @@
                 <form action="{{ route('server.settings.sftp', $server->uuidShort) }}" method="post">
                     <div class="box-body">
                         <div class="form-group">
-                            <label for="sftp_pass" class="control-label">{{ trans('base.account.new_password') }}</label>
+                            <label for="sftp_pass" class="control-label">@lang('base.account.new_password')</label>
                             <div>
                                 <input type="password" class="form-control" name="sftp_pass" />
-                                <p class="text-muted"><small>{{ trans('auth.password_requirements') }}</small></p>
+                                <p class="text-muted"><small>@lang('auth.password_requirements')</small></p>
                             </div>
                         </div>
                     </div>
                     <div class="box-footer">
                         {!! csrf_field() !!}
-                        <input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_pass') }}" />
+                        <input type="submit" class="btn btn-primary btn-sm" value="@lang('base.account.update_pass')" />
                     </div>
                 </form>
             @else
@@ -93,7 +93,7 @@
                 </div>
                 @can('view-sftp-password', $server)
                     <div class="form-group">
-                        <label for="password" class="control-label">{{ trans('base.account.current_password') }}</label>
+                        <label for="password" class="control-label">@lang('base.account.current_password')</label>
                         <div>
                             <input type="text" class="form-control" readonly @if(! is_null($server->sftp_password))value="{{ Crypt::decrypt($server->sftp_password) }}"@endif />
                         </div>