mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-12-23 15:40:32 -06:00
More code for 5.3
This commit is contained in:
James Cole
parent
d00fbe4eb3
commit
2f93784acd
12
app/Providers/EventServiceProvider.php
Normal file → Executable file
12
app/Providers/EventServiceProvider.php
Normal file → Executable file
@ -16,7 +16,6 @@ use FireflyIII\Models\PiggyBank;
|
||||
use FireflyIII\Models\PiggyBankRepetition;
|
||||
use FireflyIII\Models\Transaction;
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
|
||||
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
|
||||
use Log;
|
||||
|
||||
@ -73,17 +72,18 @@ class EventServiceProvider extends ServiceProvider
|
||||
];
|
||||
|
||||
/**
|
||||
* Register any other events for your application.
|
||||
*
|
||||
* @param \Illuminate\Contracts\Events\Dispatcher $events
|
||||
* Register any events for your application.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function boot(DispatcherContract $events)
|
||||
public function boot()
|
||||
{
|
||||
parent::boot($events);
|
||||
parent::boot();
|
||||
$this->registerDeleteEvents();
|
||||
$this->registerCreateEvents();
|
||||
|
||||
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
72
app/Providers/RouteServiceProvider.php
Normal file → Executable file
72
app/Providers/RouteServiceProvider.php
Normal file → Executable file
@ -1,28 +1,14 @@
|
||||
<?php
|
||||
/**
|
||||
* RouteServiceProvider.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms
|
||||
* of the MIT license. See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
|
||||
namespace FireflyIII\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
||||
use Illuminate\Routing\Router;
|
||||
|
||||
/**
|
||||
* Class RouteServiceProvider
|
||||
*
|
||||
* @package FireflyIII\Providers
|
||||
*/
|
||||
class RouteServiceProvider extends ServiceProvider
|
||||
{
|
||||
/**
|
||||
* This namespace is applied to the controller routes in your routes file.
|
||||
* This namespace is applied to your controller routes.
|
||||
*
|
||||
* In addition, it is set as the URL generator's root namespace.
|
||||
*
|
||||
@ -33,31 +19,61 @@ class RouteServiceProvider extends ServiceProvider
|
||||
/**
|
||||
* Define your route model bindings, pattern filters, etc.
|
||||
*
|
||||
* @param \Illuminate\Routing\Router $router
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function boot(Router $router)
|
||||
public function boot()
|
||||
{
|
||||
//
|
||||
|
||||
parent::boot($router);
|
||||
parent::boot();
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the routes for the application.
|
||||
*
|
||||
* @param \Illuminate\Routing\Router $router
|
||||
* @return void
|
||||
*/
|
||||
public function map()
|
||||
{
|
||||
$this->mapWebRoutes();
|
||||
|
||||
$this->mapApiRoutes();
|
||||
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the "web" routes for the application.
|
||||
*
|
||||
* These routes all receive session state, CSRF protection, etc.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function map(Router $router)
|
||||
protected function mapWebRoutes()
|
||||
{
|
||||
$router->group(
|
||||
['namespace' => $this->namespace], function (Router $router) {
|
||||
/** @noinspection PhpIncludeInspection */
|
||||
require app_path('Http/routes.php');
|
||||
}
|
||||
);
|
||||
Route::group([
|
||||
'middleware' => 'web',
|
||||
'namespace' => $this->namespace,
|
||||
], function ($router) {
|
||||
require base_path('routes/web.php');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the "api" routes for the application.
|
||||
*
|
||||
* These routes are typically stateless.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function mapApiRoutes()
|
||||
{
|
||||
Route::group([
|
||||
'middleware' => 'api',
|
||||
'namespace' => $this->namespace,
|
||||
'prefix' => 'api',
|
||||
], function ($router) {
|
||||
require base_path('routes/api.php');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,31 +9,31 @@
|
||||
*/
|
||||
|
||||
return [
|
||||
'home' => 'Home',
|
||||
'edit_currency' => 'Edit currency ":name"',
|
||||
'delete_currency' => 'Delete currency ":name"',
|
||||
'newPiggyBank' => 'Create a new piggy bank',
|
||||
'edit_piggyBank' => 'Edit piggy bank ":name"',
|
||||
'preferences' => 'Preferences',
|
||||
'profile' => 'Profile',
|
||||
'changePassword' => 'Change your password',
|
||||
'bills' => 'Bills',
|
||||
'newBill' => 'New bill',
|
||||
'edit_bill' => 'Edit bill ":name"',
|
||||
'delete_bill' => 'Delete bill ":name"',
|
||||
'reports' => 'Reports',
|
||||
'searchResult' => 'Search for ":query"',
|
||||
'withdrawal_list' => 'Expenses',
|
||||
'deposit_list' => 'Revenue, income and deposits',
|
||||
'transfer_list' => 'Transfers',
|
||||
'transfers_list' => 'Transfers',
|
||||
'create_withdrawal' => 'Create new withdrawal',
|
||||
'create_deposit' => 'Create new deposit',
|
||||
'create_transfer' => 'Create new transfer',
|
||||
'edit_journal' => 'Edit transaction ":description"',
|
||||
'delete_journal' => 'Delete transaction ":description"',
|
||||
'tags' => 'Tags',
|
||||
'createTag' => 'Create new tag',
|
||||
'edit_tag' => 'Edit tag ":tag"',
|
||||
'delete_tag' => 'Delete tag ":tag"',
|
||||
'home' => 'Home',
|
||||
'edit_currency' => 'Edit currency ":name"',
|
||||
'delete_currency' => 'Delete currency ":name"',
|
||||
'newPiggyBank' => 'Create a new piggy bank',
|
||||
'edit_piggyBank' => 'Edit piggy bank ":name"',
|
||||
'preferences' => 'Preferences',
|
||||
'profile' => 'Profile',
|
||||
'changePassword' => 'Change your password',
|
||||
'bills' => 'Bills',
|
||||
'newBill' => 'New bill',
|
||||
'edit_bill' => 'Edit bill ":name"',
|
||||
'delete_bill' => 'Delete bill ":name"',
|
||||
'reports' => 'Reports',
|
||||
'searchResult' => 'Search for ":query"',
|
||||
'withdrawal_list' => 'Expenses',
|
||||
'deposit_list' => 'Revenue, income and deposits',
|
||||
'transfer_list' => 'Transfers',
|
||||
'transfers_list' => 'Transfers',
|
||||
'create_withdrawal' => 'Create new withdrawal',
|
||||
'create_deposit' => 'Create new deposit',
|
||||
'create_transfer' => 'Create new transfer',
|
||||
'edit_journal' => 'Edit transaction ":description"',
|
||||
'delete_journal' => 'Delete transaction ":description"',
|
||||
'tags' => 'Tags',
|
||||
'createTag' => 'Create new tag',
|
||||
'edit_tag' => 'Edit tag ":tag"',
|
||||
'delete_tag' => 'Delete tag ":tag"',
|
||||
];
|
||||
|
||||
@ -10,76 +10,76 @@
|
||||
return [
|
||||
|
||||
// tour!
|
||||
'main-content-title' => 'Welcome to Firefly III',
|
||||
'main-content-text' => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
|
||||
'sidebar-toggle-title' => 'Sidebar to create stuff',
|
||||
'sidebar-toggle-text' => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
|
||||
'account-menu-title' => 'All your accounts',
|
||||
'account-menu-text' => 'Here you can find all the accounts you\'ve made.',
|
||||
'budget-menu-title' => 'Budgets',
|
||||
'budget-menu-text' => 'Use this page to organise your finances and limit spending.',
|
||||
'report-menu-title' => 'Reports',
|
||||
'report-menu-text' => 'Check this out when you want a solid overview of your finances.',
|
||||
'transaction-menu-title' => 'Transactions',
|
||||
'transaction-menu-text' => 'All transactions you\'ve created can be found here.',
|
||||
'option-menu-title' => 'Options',
|
||||
'option-menu-text' => 'This is pretty self-explanatory.',
|
||||
'main-content-end-title' => 'The end!',
|
||||
'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
|
||||
'index' => 'index',
|
||||
'home' => 'home',
|
||||
'accounts-index' => 'accounts.index',
|
||||
'accounts-create' => 'accounts.create',
|
||||
'accounts-edit' => 'accounts.edit',
|
||||
'accounts-delete' => 'accounts.delete',
|
||||
'accounts-show' => 'accounts.show',
|
||||
'attachments-edit' => 'attachments.edit',
|
||||
'attachments-delete' => 'attachments.delete',
|
||||
'attachments-show' => 'attachments.show',
|
||||
'attachments-preview' => 'attachments.preview',
|
||||
'bills-index' => 'bills.index',
|
||||
'bills-create' => 'bills.create',
|
||||
'bills-edit' => 'bills.edit',
|
||||
'bills-delete' => 'bills.delete',
|
||||
'bills-show' => 'bills.show',
|
||||
'budgets-index' => 'budgets.index',
|
||||
'budgets-create' => 'budgets.create',
|
||||
'budgets-edit' => 'budgets.edit',
|
||||
'budgets-delete' => 'budgets.delete',
|
||||
'budgets-show' => 'budgets.show',
|
||||
'budgets-noBudget' => 'budgets.noBudget',
|
||||
'categories-index' => 'categories.index',
|
||||
'categories-create' => 'categories.create',
|
||||
'categories-edit' => 'categories.edit',
|
||||
'categories-delete' => 'categories.delete',
|
||||
'categories-show' => 'categories.show',
|
||||
'categories-show-date' => 'categories.show.date',
|
||||
'categories-noCategory' => 'categories.noCategory',
|
||||
'currency-index' => 'currency.index',
|
||||
'currency-create' => 'currency.create',
|
||||
'currency-edit' => 'currency.edit',
|
||||
'currency-delete' => 'currency.delete',
|
||||
'new-user-index' => 'new-user.index',
|
||||
'piggy-banks-index' => 'piggy-banks.index',
|
||||
'piggy-banks-create' => 'piggy-banks.create',
|
||||
'piggy-banks-edit' => 'piggy-banks.edit',
|
||||
'piggy-banks-delete' => 'piggy-banks.delete',
|
||||
'piggy-banks-show' => 'piggy-banks.show',
|
||||
'preferences' => 'preferences',
|
||||
'profile' => 'profile',
|
||||
'profile-change-password' => 'profile.change-password',
|
||||
'profile-delete-account' => 'profile.delete-account',
|
||||
'reports-index' => 'reports.index',
|
||||
'reports-report' => 'reports.report',
|
||||
'search' => 'search',
|
||||
'tags-index' => 'tags.index',
|
||||
'tags-create' => 'tags.create',
|
||||
'tags-show' => 'tags.show',
|
||||
'tags-edit' => 'tags.edit',
|
||||
'tags-delete' => 'tags.delete',
|
||||
'transactions-index' => 'transactions.index',
|
||||
'transactions-create' => 'transactions.create',
|
||||
'transactions-edit' => 'transactions.edit',
|
||||
'transactions-delete' => 'transactions.delete',
|
||||
'transactions-show' => 'transactions.show',
|
||||
'main-content-title' => 'Welcome to Firefly III',
|
||||
'main-content-text' => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
|
||||
'sidebar-toggle-title' => 'Sidebar to create stuff',
|
||||
'sidebar-toggle-text' => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
|
||||
'account-menu-title' => 'All your accounts',
|
||||
'account-menu-text' => 'Here you can find all the accounts you\'ve made.',
|
||||
'budget-menu-title' => 'Budgets',
|
||||
'budget-menu-text' => 'Use this page to organise your finances and limit spending.',
|
||||
'report-menu-title' => 'Reports',
|
||||
'report-menu-text' => 'Check this out when you want a solid overview of your finances.',
|
||||
'transaction-menu-title' => 'Transactions',
|
||||
'transaction-menu-text' => 'All transactions you\'ve created can be found here.',
|
||||
'option-menu-title' => 'Options',
|
||||
'option-menu-text' => 'This is pretty self-explanatory.',
|
||||
'main-content-end-title' => 'The end!',
|
||||
'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
|
||||
'index' => 'index',
|
||||
'home' => 'home',
|
||||
'accounts-index' => 'accounts.index',
|
||||
'accounts-create' => 'accounts.create',
|
||||
'accounts-edit' => 'accounts.edit',
|
||||
'accounts-delete' => 'accounts.delete',
|
||||
'accounts-show' => 'accounts.show',
|
||||
'attachments-edit' => 'attachments.edit',
|
||||
'attachments-delete' => 'attachments.delete',
|
||||
'attachments-show' => 'attachments.show',
|
||||
'attachments-preview' => 'attachments.preview',
|
||||
'bills-index' => 'bills.index',
|
||||
'bills-create' => 'bills.create',
|
||||
'bills-edit' => 'bills.edit',
|
||||
'bills-delete' => 'bills.delete',
|
||||
'bills-show' => 'bills.show',
|
||||
'budgets-index' => 'budgets.index',
|
||||
'budgets-create' => 'budgets.create',
|
||||
'budgets-edit' => 'budgets.edit',
|
||||
'budgets-delete' => 'budgets.delete',
|
||||
'budgets-show' => 'budgets.show',
|
||||
'budgets-noBudget' => 'budgets.noBudget',
|
||||
'categories-index' => 'categories.index',
|
||||
'categories-create' => 'categories.create',
|
||||
'categories-edit' => 'categories.edit',
|
||||
'categories-delete' => 'categories.delete',
|
||||
'categories-show' => 'categories.show',
|
||||
'categories-show-date' => 'categories.show.date',
|
||||
'categories-noCategory' => 'categories.noCategory',
|
||||
'currency-index' => 'currency.index',
|
||||
'currency-create' => 'currency.create',
|
||||
'currency-edit' => 'currency.edit',
|
||||
'currency-delete' => 'currency.delete',
|
||||
'new-user-index' => 'new-user.index',
|
||||
'piggy-banks-index' => 'piggy-banks.index',
|
||||
'piggy-banks-create' => 'piggy-banks.create',
|
||||
'piggy-banks-edit' => 'piggy-banks.edit',
|
||||
'piggy-banks-delete' => 'piggy-banks.delete',
|
||||
'piggy-banks-show' => 'piggy-banks.show',
|
||||
'preferences' => 'preferences',
|
||||
'profile' => 'profile',
|
||||
'profile-change-password' => 'profile.change-password',
|
||||
'profile-delete-account' => 'profile.delete-account',
|
||||
'reports-index' => 'reports.index',
|
||||
'reports-report' => 'reports.report',
|
||||
'search' => 'search',
|
||||
'tags-index' => 'tags.index',
|
||||
'tags-create' => 'tags.create',
|
||||
'tags-show' => 'tags.show',
|
||||
'tags-edit' => 'tags.edit',
|
||||
'tags-delete' => 'tags.delete',
|
||||
'transactions-index' => 'transactions.index',
|
||||
'transactions-create' => 'transactions.create',
|
||||
'transactions-edit' => 'transactions.edit',
|
||||
'transactions-delete' => 'transactions.delete',
|
||||
'transactions-show' => 'transactions.show',
|
||||
];
|
||||
|
||||
2
resources/lang/en_US/pagination.php
Normal file → Executable file
2
resources/lang/en_US/pagination.php
Normal file → Executable file
@ -8,6 +8,8 @@
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
'previous' => '« Previous',
|
||||
'next' => 'Next »',
|
||||
|
||||
];
|
||||
|
||||
0
resources/lang/en_US/passwords.php
Normal file → Executable file
0
resources/lang/en_US/passwords.php
Normal file → Executable file
@ -77,4 +77,9 @@ return [
|
||||
'url' => 'The :attribute format is invalid.',
|
||||
'timezone' => 'The :attribute must be a valid zone.',
|
||||
'2fa_code' => 'The :attribute field is invalid.',
|
||||
'dimensions' => 'The :attribute has invalid image dimensions.',
|
||||
'distinct' => 'The :attribute field has a duplicate value.',
|
||||
'file' => 'The :attribute must be a file.',
|
||||
'in_array' => 'The :attribute field does not exist in :other.',
|
||||
'present' => 'The :attribute field must be present.',
|
||||
];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user