diff --git a/resources/lang/de/subscription.php b/resources/lang/de/subscription.php
index a2707cb..71c9e9c 100644
--- a/resources/lang/de/subscription.php
+++ b/resources/lang/de/subscription.php
@@ -6,6 +6,7 @@ return [
'subscription' => 'Abonnements',
'subscriptions' => 'Abonnements Liste',
'list' => 'Abonnements Liste',
+ 'view_all' => 'View All Subscriptions',
'detail' => 'Abonnement Details',
'search' => 'Suche Abonnements',
'found' => 'Abonnement gefunden.',
diff --git a/resources/lang/en/subscription.php b/resources/lang/en/subscription.php
index cfc2cc3..10d7300 100644
--- a/resources/lang/en/subscription.php
+++ b/resources/lang/en/subscription.php
@@ -6,6 +6,7 @@ return [
'subscription' => 'Subscription',
'subscriptions' => 'Subscription List',
'list' => 'Subscription List',
+ 'view_all' => 'View All Subscriptions',
'detail' => 'Subscription Detail',
'search' => 'Search Subscription',
'found' => 'Subscription found.',
diff --git a/resources/lang/id/subscription.php b/resources/lang/id/subscription.php
index 6104d5b..a0c1850 100644
--- a/resources/lang/id/subscription.php
+++ b/resources/lang/id/subscription.php
@@ -6,6 +6,7 @@ return [
'subscription' => 'Langganan',
'subscriptions' => 'Daftar Langganan',
'list' => 'Daftar Langganan',
+ 'view_all' => 'Lihat Semua Langganan',
'detail' => 'Detail Langganan',
'search' => 'Cari Langganan',
'found' => 'Langganan ditemukan',
diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php
index 8aaf9b3..6a3fb71 100644
--- a/resources/views/layouts/dashboard.blade.php
+++ b/resources/views/layouts/dashboard.blade.php
@@ -3,15 +3,15 @@
@section('content')
- {!! Form::open(['route' => 'projects.index','method'=>'get','class'=>'form-inline']) !!}
- {!! Form::text('q', Request::get('q'), [
+ {!! Form::open(['route' => 'projects.index', 'method' => 'get', 'class' => 'form-inline']) !!}
+ {!! Form::text('q', null, [
'class' => 'form-control index-search-field',
- 'placeholder' => trans('project.search'),
+ 'placeholder' => __('project.search'),
'style' => 'width:100%;max-width:350px'
]) !!}
- {!! Form::submit(trans('project.search'), ['class' => 'btn btn-info btn-sm']) !!}
+ {!! Form::submit(__('project.search'), ['class' => 'btn btn-info btn-sm']) !!}
@can('create', new App\Entities\Projects\Project)
- {{ link_to_route('projects.create', trans('project.create'), [], [
+ {{ link_to_route('projects.create', __('project.create'), [], [
'class' => 'btn btn-success pull-right',
'style' => 'margin: -2px 0px;'
]) }}
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index 721229d..5499abd 100755
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -1,12 +1,12 @@
@extends('layouts.dashboard')
-@section('title', trans('nav_menu.dashboard'))
+@section('title', __('nav_menu.dashboard'))
@section('content-dashboard')
@if (auth()->user()->hasRole('admin'))
-
+
@foreach(ProjectStatus::all() as $statusId => $status)
@@ -22,13 +22,13 @@
-
+
- | {{ trans('dashboard.yearly_earnings') }} ({{ $queriedYear }}) |
- {{ trans('dashboard.finished_projects_count') }} ({{ $queriedYear }}) |
- {{ trans('dashboard.receiveable_earnings') }} |
+ {{ __('dashboard.yearly_earnings') }} ({{ $queriedYear }}) |
+ {{ __('dashboard.finished_projects_count') }} ({{ $queriedYear }}) |
+ {{ __('dashboard.receiveable_earnings') }} |
@@ -46,20 +46,20 @@
-
- {{ trans('dashboard.yearly_earnings') }} ({{ $queriedYear }})
+ {{ __('dashboard.yearly_earnings') }} ({{ $queriedYear }})
{{ $totalEarnings }}
-
- {{ trans('dashboard.finished_projects_count') }} ({{ $queriedYear }})
+ {{ __('dashboard.finished_projects_count') }} ({{ $queriedYear }})
{{ $totalFinishedProjects }} Projects
-
- {{ trans('dashboard.receiveable_earnings') }}
+ {{ __('dashboard.receiveable_earnings') }}
{{ $currentOutstandingCustomerPayment }}
-
+
@@ -80,8 +80,9 @@
@empty
- | {{ trans('dashboard.no_upcoming_subscriptions_expiry') }} |
+ | {{ __('dashboard.no_upcoming_subscriptions_expiry') }} |
@endforelse
+ | {{ link_to_route('subscriptions.index', __('subscription.view_all')) }} |
@@ -90,15 +91,15 @@
- {{ trans('user.current_jobs') }}
+ {{ __('user.current_jobs') }}
@php
$currentJobTotal = 0;
@endphp
- | {{ trans('job.progress') }} |
- {{ trans('user.jobs_count') }} |
+ {{ __('job.progress') }} |
+ {{ __('user.jobs_count') }} |
| 0 - 10% |
@@ -158,7 +159,7 @@
- | {{ trans('app.total') }} |
+ {{ __('app.total') }} |
{{ $currentJobTotal }} |
|