diff --git a/app/Http/Controllers/SchedulerController.php b/app/Http/Controllers/SchedulerController.php index 80e011ca3e2a..e1788ce4e85c 100644 --- a/app/Http/Controllers/SchedulerController.php +++ b/app/Http/Controllers/SchedulerController.php @@ -7,9 +7,9 @@ class SchedulerController extends Controller public function index() { if (auth()->user()->company()->account->latest_version == '0.0.0') { - return response()->json(['message' => 'Scheduler has never run'], 400); + return response()->json(['message' => ctrans('texts.scheduler_has_never_run')], 400); } else { - return response()->json(['message' => 'Scheduler has run'], 200); + return response()->json(['message' => ctrans('texts.scheduler_has_run')], 200); } } } diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 29d745034832..1ecc2ae675ba 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -59,7 +59,7 @@ class SelfUpdateController extends BaseController define('STDIN', fopen('php://stdin', 'r')); if (Ninja::isNinja()) { - return response()->json(['message' => 'Self update not available on this system.'], 403); + return response()->json(['message' => ctrans('texts.self_update_not_available')], 403); } /* .git MUST be owned/writable by the webserver user */ diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php deleted file mode 100644 index faa5b37a2a9c..000000000000 --- a/app/Http/Controllers/SettingsController.php +++ /dev/null @@ -1,101 +0,0 @@ -easyMinify(json_encode($strings)).';'; - exit(); - } - - private function easyMinify($javascript) - { - return preg_replace(["/\s+\n/", "/\n\s+/", '/ +/'], ["\n", "\n ", ' '], $javascript); - } - - /** - * Show the form for creating a new resource. - * - * @return void - */ - public function create() - { - // - } - - /** - * Store a newly created resource in storage. - * - * @param Request $request - * @return void - */ - public function store(Request $request) - { - // - } - - /** - * Display the specified resource. - * - * @param int $id - * @return void - */ - public function show($id) - { - // - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return void - */ - public function edit($id) - { - // - } - - /** - * Update the specified resource in storage. - * - * @param Request $request - * @param int $id - * @return void - */ - public function update(Request $request, $id) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return void - */ - public function destroy($id) - { - // - } -} diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 80509d283e13..37f956b50abb 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -668,6 +668,6 @@ class UserController extends BaseController $company_user->delete(); } - return response()->json(['message' => 'User detached from company'], 200); + return response()->json(['message' => ctrans('texts.user_detached')], 200); } } diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php index 5b1c5594d249..84dd09d16876 100644 --- a/app/Http/Controllers/WebhookController.php +++ b/app/Http/Controllers/WebhookController.php @@ -364,7 +364,7 @@ class WebhookController extends BaseController $webhook->save(); if (! $webhook->id) { - return response()->json('Failed to create Webhook', 400); + return response()->json(ctrans('texts.create_webhook_failure'), 400); } return $this->itemResponse($webhook); diff --git a/app/Http/Requests/Client/EditClientRequest.php b/app/Http/Requests/Client/EditClientRequest.php index ffe1c448ac69..d3db2c4ce036 100644 --- a/app/Http/Requests/Client/EditClientRequest.php +++ b/app/Http/Requests/Client/EditClientRequest.php @@ -25,13 +25,4 @@ class EditClientRequest extends Request return auth()->user()->can('edit', $this->client); } - // public function prepareForValidation() - // { - // $input = $this->all(); - - // //$input['id'] = $this->encodePrimaryKey($input['id']); - - // $this->replace($input); - - // } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 115b19f1f995..085e4cb2d6b1 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3424,4 +3424,9 @@ return [ 'invalid_design_object' => 'Invalid custom design object', 'quote_not_found' => 'Quote/s not found', 'quote_unapprovable' => 'Unable to approve this quote as it has expired.', + 'scheduler_has_run' => 'Scheduler has run', + 'scheduler_has_never_run' => 'Scheduler has never run', + 'self_update_not_available' => 'Self update not available on this system.', + 'user_detached' => 'User detached from company', + 'create_webhook_failure' => 'Failed to create Webhook', ]; diff --git a/routes/api.php b/routes/api.php index 2b4fa6e7c7c6..dd5509523ea7 100644 --- a/routes/api.php +++ b/routes/api.php @@ -178,8 +178,6 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a Route::post('tasks/bulk', 'TaskController@bulk')->name('tasks.bulk'); - - Route::get('settings', 'SettingsController@index')->name('user.settings'); */ Route::get('scheduler', 'SchedulerController@index'); Route::post('support/messages/send', 'Support\Messages\SendingController');