From 3449bcfd839a3215714d1058892cf809ec3ffa5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Egemen=20Berker=20K=C4=B1z=C4=B1lcan?= Date: Wed, 7 Nov 2018 10:13:27 +0300 Subject: [PATCH] Added translations and fixed an issue about jobs show links --- app/Http/Controllers/JobsController.php | 3 ++- app/Providers/AppServiceProvider.php | 2 +- composer.json | 2 +- resources/lang/en/validation.php | 2 ++ resources/lang/tr/validation.php | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/JobsController.php b/app/Http/Controllers/JobsController.php index 4f10f6b..b62510f 100644 --- a/app/Http/Controllers/JobsController.php +++ b/app/Http/Controllers/JobsController.php @@ -53,10 +53,11 @@ public function searchJson(Request $request) * List the specified resource transactions. * * @param Request $request + * @param int $parent * @param int $id * @return Response */ - public function show(Request $request, $id) + public function show(Request $request, $parent, $id) { $job = Job::findOrFail($id); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b7bc427..276a188 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -14,7 +14,7 @@ class AppServiceProvider extends ServiceProvider { - const VERSION = '1.0-alpha.2'; + const VERSION = '1.0-alpha.3'; /** * Bootstrap any application services. diff --git a/composer.json b/composer.json index 1164841..bc5889b 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "umomega/bookkeeper", "description": "Laravel Powered Finance Tracker and CRM.", "keywords": ["umomega", "bookkeeper", "finance", "crm", "multilingual", "laravel", "laravel5", "php", "php7", "finance-application", "bookkeeping", "finance-tracker"], - "version": "1.0-alpha.2", + "version": "1.0-alpha.3", "license": "MIT", "type": "project", "authors": [ diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index a782062..a439a8c 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -185,6 +185,8 @@ 'tax_number' => 'Tax Number', 'balance' => 'Balance', 'vat_percentage' => 'VAT Percentage', + 'invoice' => 'Invoice', + 'offer' => 'Offer', ], ]; diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php index f53677b..6331811 100644 --- a/resources/lang/tr/validation.php +++ b/resources/lang/tr/validation.php @@ -185,6 +185,8 @@ 'tax_number' => 'Vergi Numarası', 'balance' => 'Bakiye', 'vat_percentage' => 'KDV Yüzdesi', + 'invoice' => 'Fatura', + 'offer' => 'Teklif', ], ];