Merge pull request #698 from pbodq2/master

Minor update on labels
HDInnovations · Apr 28, 2019 · 0724448 · 0724448
2 parents 907971d + e98dc99
commit 0724448
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 42 deletions.
diff --git a/resources/lang/cn/torrent.php b/resources/lang/cn/torrent.php
@@ -52,7 +52,7 @@
     'featured-desc'            => '精选资源是 <i class="fal fa-star text-gold"></i><strong> 100% 免费下载</strong> 及 <i class="fal fa-gem text-green"></i><strong> 双倍上传量收益!</strong>',
     'featured-until'           => '精选资源有效至',
     'file'                     => '文件',
-    'filters'                  => '过滤搜寻',
+    'filters'                  => '过滤',
     'fl-tokens-left'           => '你拥有 <strong><i class="fal fa-coins"></i>:tokens</strong> 免费令',
     'freeleech'                => '免费',
     'freeleech-token'          => '免费令',
@@ -128,7 +128,7 @@
     'ready'                    => '这文件可以下载',
     'rejected'                 => '拒绝',
     'released'                 => '发布',
-    'remaining'                => 'Remaining',
+    'remaining'                => '剩馀',
     'request-reseed'           => '要求续种',
     'requires-reseed'          => '需要续种',
     'resurrections'            => '救活',

diff --git a/resources/lang/cn/user.php b/resources/lang/cn/user.php
@@ -314,7 +314,7 @@
     'upload-bon'                => 'Upload Added From BON Store',
     'upload-recorded'           => 'Recorded Upload',
     'upload-true'               => 'True Upload',
-    'uploads'                   => '上传',
+    'uploads'                   => '发布',
     'uploads-table'             => '上传列表',
     'user'                      => '用户',
     'user-id'                   => '用户名',

diff --git a/resources/lang/en/torrent.php b/resources/lang/en/torrent.php
@@ -52,7 +52,7 @@
     'featured-desc'            => 'Featured torrents are <i class="fal fa-star text-gold"></i><strong> 100% Free</strong> and <i class="fal fa-gem text-green"></i><strong> Double Upload!</strong>',
     'featured-until'           => 'This Is A Featured Torrent Until',
     'file'                     => 'File',
-    'filters'                  => 'Search Filters',
+    'filters'                  => 'Filters',
     'fl-tokens-left'           => 'You have <strong><i class="fal fa-coins"></i>:tokens</strong> left',
     'freeleech'                => 'Freeleech',
     'freeleech-token'          => 'Freeleech Token',

diff --git a/resources/lang/tw/torrent.php b/resources/lang/tw/torrent.php
@@ -52,7 +52,7 @@
     'featured-desc'            => '精選資源是 <i class="fal fa-star text-gold"></i><strong> 100% 免費下載</strong> 及 <i class="fal fa-gem text-green"></i><strong> 雙倍上傳量收益!</strong>',
     'featured-until'           => '精選資源有效至',
     'file'                     => '文件',
-    'filters'                  => '過濾搜尋',
+    'filters'                  => '過濾',
     'fl-tokens-left'           => '你擁有 <strong><i class="fal fa-coins"></i>:tokens</strong> 免費令',
     'freeleech'                => '免費',
     'freeleech-token'          => '免費令',
@@ -128,7 +128,7 @@
     'ready'                    => '這文件可以下載',
     'rejected'                 => '拒絕',
     'released'                 => '發佈',
-    'remaining'                => 'Remaining',
+    'remaining'                => '剩餘',
     'request-reseed'           => '要求續種',
     'requires-reseed'          => '需要續種',
     'resurrections'            => '救活',

diff --git a/resources/lang/tw/user.php b/resources/lang/tw/user.php
@@ -314,7 +314,7 @@
     'upload-bon'                => 'Upload Added From BON Store',
     'upload-recorded'           => 'Recorded Upload',
     'upload-true'               => 'True Upload',
-    'uploads'                   => '上傳',
+    'uploads'                   => '發佈',
     'uploads-table'             => '上傳列表',
     'user'                      => '用戶',
     'user-id'                   => '用戶名',

diff --git a/resources/views/torrent/buttons.blade.php b/resources/views/torrent/buttons.blade.php
@@ -1,11 +1,11 @@
 <div class="button-holder">
     <div class="button-left">
-        <a href="{{ route('cards') }}" class="btn btn-sm btn-primary">
-            <i class="{{ config('other.font-awesome') }} fa-image"></i> @lang('torrent.cards')
-        </a>
         <a href="{{ route('categories') }}" class="btn btn-sm btn-primary">
             <i class="{{ config('other.font-awesome') }} fa-file"></i> @lang('torrent.categories')
         </a>
+        <a href="{{ route('cards') }}" class="btn btn-sm btn-primary">
+            <i class="{{ config('other.font-awesome') }} fa-image"></i> @lang('torrent.cards')
+        </a>
         <a href="{{ route('groupings') }}" class="btn btn-sm btn-primary">
             <i class="{{ config('other.font-awesome') }} fa-clone"></i> @lang('torrent.groupings')
         </a>
@@ -21,4 +21,4 @@
             <i class="{{ config('other.font-awesome') }} fa-sliders-h"></i> @lang('torrent.filters')
         </a>
     </div>
-</div>
+</div>
diff --git a/resources/views/user/filters/uploads.blade.php b/resources/views/user/filters/uploads.blade.php
@@ -53,20 +53,20 @@ class="{{ config('other.font-awesome') }} fa-download"></i></button>
                     <td>{{ ($upload->created_at ? $upload->created_at->diffForHumans() : 'N/A') }}</td>
                     <td>
                         @if ($upload->isPending())
-                            <span class='label label-warning' data-toggle="tooltip">PENDING</span>
+                            <span class='label label-warning' data-toggle="tooltip">@lang('torrent.pending')</span>
                         @elseif ($upload->isApproved())
                             <span class='label label-success' data-toggle="tooltip"
-                                  data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">APPROVED</span>
+                                  data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">@lang('torrent.approved')</span>
                         @elseif ($upload->isRejected())
                             <span class='label label-danger' data-toggle="tooltip"
-                                  data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">REJECTED</span>
+                                  data-original-title="Moderated By {{ $upload->moderated->username }} {{ $upload->moderated_at->diffForHumans() }}">@lang('torrent.rejected')</span>
                         @endif
                     </td>
                     <td>
                         @if ($upload->seeders + $upload->leechers == 0)
-                            <span class='label label-danger'>DEAD</span>
+                            <span class='label label-danger'>@lang('graveyard.dead')</span>
                         @elseif ($upload->seeders >= 1)
-                            <span class='label label-success'>ALIVE</span>
+                            <span class='label label-success'>@lang('torrent.alive')</span>
                         @elseif ($upload->leechers >= 1 + $upload->seeders = 0)
                             <span class='label label-info'>RESEED</span>
                         @else

diff --git a/resources/views/user/private/active.blade.php b/resources/views/user/private/active.blade.php
@@ -59,7 +59,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                         <div class="mx-0 mt-5 form-group fatten-me">
-                            <label for="name" class="mt-5 col-sm-1 label label-default fatten-me">Status</label>
+                            <label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.status')</label>
                             <div class="col-sm-10">
                         <span class="badge-user">
                     <label class="inline">
@@ -74,7 +74,7 @@ class="l-breadcrumb-item-link">
                             </div>
                         </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Sorting</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
                         <div class="col-sm-2">
                             <select id="sorting" name="sorting" trigger="change" class="form-control userFilter">
                                 <option value="created_at">Created at</option>
@@ -89,7 +89,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Direction</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
                         <div class="col-sm-2">
                             <select id="direction" name="direction" trigger="change" class="form-control userFilter">
                                 <option value="desc">Descending</option>

diff --git a/resources/views/user/private/downloads.blade.php b/resources/views/user/private/downloads.blade.php
@@ -76,7 +76,7 @@ class="l-breadcrumb-item-link">
                     </div>
                     @endif
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Sorting</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
                         <div class="col-sm-2">
                             <select id="sorting" name="sorting" trigger="change" class="form-control userFilter">
                                 <option value="completed_at">Completed at</option>
@@ -91,7 +91,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Direction</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
                         <div class="col-sm-2">
                             <select id="direction" name="direction" trigger="change" class="form-control userFilter">
                                 <option value="desc">Descending</option>

diff --git a/resources/views/user/private/seeds.blade.php b/resources/views/user/private/seeds.blade.php
@@ -124,7 +124,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Sorting</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
                         <div class="col-sm-2">
                             <select id="sorting" name="sorting" trigger="change" class="form-control userFilter">
                                 <option value="hcreated_at">Created at</option>
@@ -138,7 +138,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Direction</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
                         <div class="col-sm-2">
                             <select id="direction" name="direction" trigger="change" class="form-control userFilter">
                                 <option value="desc">Descending</option>

diff --git a/resources/views/user/private/torrents.blade.php b/resources/views/user/private/torrents.blade.php
@@ -58,7 +58,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="name" class="mt-5 col-sm-1 label label-default fatten-me">Filters</label>
+                        <label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.filters')</label>
                         <div class="col-sm-10">
                         <span class="badge-user">
                     <label class="inline">
@@ -93,7 +93,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Sorting</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
                         <div class="col-sm-2">
                             <select id="sorting" name="sorting" trigger="change" class="form-control userFilter">
                                 <option value="created_at">Created at</option>
@@ -113,7 +113,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Direction</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
                         <div class="col-sm-2">
                             <select id="direction" name="direction" trigger="change" class="form-control userFilter">
                                 <option value="desc">Descending</option>

diff --git a/resources/views/user/private/unsatisfieds.blade.php b/resources/views/user/private/unsatisfieds.blade.php
@@ -74,7 +74,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Sorting</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
                         <div class="col-sm-2">
                             <select id="sorting" name="sorting" trigger="change" class="form-control userFilter">
                                 <option value="satisfied_at">Satisfied in</option>
@@ -90,7 +90,7 @@ class="l-breadcrumb-item-link">
                         </div>
                     </div>
                     <div class="mx-0 mt-5 form-group fatten-me">
-                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">Direction</label>
+                        <label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
                         <div class="col-sm-2">
                             <select id="direction" name="direction" trigger="change" class="form-control userFilter">
                                 <option value="desc">Descending</option>