mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Various code cleanup.
This commit is contained in:
parent
761e9effae
commit
5e900736f8
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* Kernel.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Console;
|
||||
|
||||
@ -12,21 +23,10 @@ class Kernel extends ConsoleKernel
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $commands = [
|
||||
//
|
||||
];
|
||||
|
||||
/**
|
||||
* Define the application's command schedule.
|
||||
*
|
||||
* @param \Illuminate\Console\Scheduling\Schedule $schedule
|
||||
* @return void
|
||||
*/
|
||||
protected function schedule(Schedule $schedule)
|
||||
{
|
||||
// $schedule->command('inspire')
|
||||
// ->hourly();
|
||||
}
|
||||
protected $commands
|
||||
= [
|
||||
//
|
||||
];
|
||||
|
||||
/**
|
||||
* Register the commands for the application.
|
||||
@ -35,8 +35,21 @@ class Kernel extends ConsoleKernel
|
||||
*/
|
||||
protected function commands()
|
||||
{
|
||||
$this->load(__DIR__.'/Commands');
|
||||
$this->load(__DIR__ . '/Commands');
|
||||
|
||||
require base_path('routes/console.php');
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the application's command schedule.
|
||||
*
|
||||
* @param \Illuminate\Console\Scheduling\Schedule $schedule
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function schedule(Schedule $schedule)
|
||||
{
|
||||
// $schedule->command('inspire')
|
||||
// ->hourly();
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* Handler.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Exceptions;
|
||||
|
||||
|
@ -19,8 +19,8 @@ use FireflyIII\Models\RuleGroup;
|
||||
use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI;
|
||||
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
|
||||
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
|
||||
use FireflyIII\TransactionRules\Processor;
|
||||
use FireflyIII\Support\Events\BillScanner;
|
||||
use FireflyIII\TransactionRules\Processor;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
|
@ -18,8 +18,8 @@ use FireflyIII\Events\UpdatedTransactionJournal;
|
||||
use FireflyIII\Models\Rule;
|
||||
use FireflyIII\Models\RuleGroup;
|
||||
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
|
||||
use FireflyIII\TransactionRules\Processor;
|
||||
use FireflyIII\Support\Events\BillScanner;
|
||||
use FireflyIII\TransactionRules\Processor;
|
||||
|
||||
/**
|
||||
* @codeCoverageIgnore
|
||||
|
@ -399,7 +399,7 @@ class AccountController extends Controller
|
||||
$start = Navigation::startOfPeriod($start, $range);
|
||||
$end = Navigation::endOfX(new Carbon, $range, null);
|
||||
$entries = new Collection;
|
||||
|
||||
$count = 0;
|
||||
// properties for cache
|
||||
$cache = new CacheProperties;
|
||||
$cache->addProperty($start);
|
||||
@ -412,7 +412,7 @@ class AccountController extends Controller
|
||||
}
|
||||
|
||||
Log::debug('Going to get period expenses and incomes.');
|
||||
while ($end >= $start) {
|
||||
while ($end >= $start && $count < 90) {
|
||||
$end = Navigation::startOfPeriod($end, $range);
|
||||
$currentEnd = Navigation::endOfPeriod($end, $range);
|
||||
|
||||
@ -442,7 +442,7 @@ class AccountController extends Controller
|
||||
'date' => clone $end]
|
||||
);
|
||||
$end = Navigation::subtractPeriod($end, $range, 1);
|
||||
|
||||
$count++;
|
||||
}
|
||||
$cache->store($entries);
|
||||
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* ForgotPasswordController.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Controllers\Auth;
|
||||
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* LoginController.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Controllers\Auth;
|
||||
|
||||
|
@ -1,11 +1,22 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* RegisterController.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Controllers\Auth;
|
||||
|
||||
use FireflyIII\User;
|
||||
use FireflyIII\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use FireflyIII\User;
|
||||
use Illuminate\Foundation\Auth\RegistersUsers;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
class RegisterController extends Controller
|
||||
{
|
||||
@ -39,31 +50,37 @@ class RegisterController extends Controller
|
||||
$this->middleware('guest');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a validator for an incoming registration request.
|
||||
*
|
||||
* @param array $data
|
||||
* @return \Illuminate\Contracts\Validation\Validator
|
||||
*/
|
||||
protected function validator(array $data)
|
||||
{
|
||||
return Validator::make($data, [
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new user instance after a valid registration.
|
||||
*
|
||||
* @param array $data
|
||||
* @param array $data
|
||||
*
|
||||
* @return \FireflyIII\User
|
||||
*/
|
||||
protected function create(array $data)
|
||||
{
|
||||
return User::create([
|
||||
'email' => $data['email'],
|
||||
'password' => bcrypt($data['password']),
|
||||
]);
|
||||
return User::create(
|
||||
[
|
||||
'email' => $data['email'],
|
||||
'password' => bcrypt($data['password']),
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a validator for an incoming registration request.
|
||||
*
|
||||
* @param array $data
|
||||
*
|
||||
* @return \Illuminate\Contracts\Validation\Validator
|
||||
*/
|
||||
protected function validator(array $data)
|
||||
{
|
||||
return Validator::make(
|
||||
$data, [
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* ResetPasswordController.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Controllers\Auth;
|
||||
|
||||
|
@ -205,7 +205,7 @@ class CategoryController extends Controller
|
||||
/** @var JournalCollectorInterface $collector */
|
||||
$collector = app(JournalCollectorInterface::class);
|
||||
$collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount()
|
||||
->setTypes([TransactionType::WITHDRAWAL,TransactionType::DEPOSIT, TransactionType::TRANSFER]);
|
||||
->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
|
||||
$collector->removeFilter(InternalTransferFilter::class);
|
||||
$journals = $collector->getPaginatedJournals();
|
||||
$journals->setPath(route('categories.no-category'));
|
||||
@ -363,7 +363,7 @@ class CategoryController extends Controller
|
||||
/** @var JournalCollectorInterface $collector */
|
||||
$collector = app(JournalCollectorInterface::class);
|
||||
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
|
||||
->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL,TransactionType::DEPOSIT, TransactionType::TRANSFER]);
|
||||
->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
|
||||
$collector->removeFilter(InternalTransferFilter::class);
|
||||
$count = $collector->getJournals()->count();
|
||||
|
||||
@ -428,6 +428,7 @@ class CategoryController extends Controller
|
||||
$first = Navigation::startOfPeriod($first, $range);
|
||||
$end = Navigation::endOfX(new Carbon, $range, null);
|
||||
$entries = new Collection;
|
||||
$count = 0;
|
||||
|
||||
// properties for entries with their amounts.
|
||||
$cache = new CacheProperties();
|
||||
@ -439,7 +440,7 @@ class CategoryController extends Controller
|
||||
if ($cache->has()) {
|
||||
return $cache->get(); // @codeCoverageIgnore
|
||||
}
|
||||
while ($end >= $first) {
|
||||
while ($end >= $first && $count < 90) {
|
||||
$end = Navigation::startOfPeriod($end, $range);
|
||||
$currentEnd = Navigation::endOfPeriod($end, $range);
|
||||
$spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
|
||||
@ -467,6 +468,7 @@ class CategoryController extends Controller
|
||||
]
|
||||
);
|
||||
$end = Navigation::subtractPeriod($end, $range, 1);
|
||||
$count++;
|
||||
}
|
||||
$cache->store($entries);
|
||||
|
||||
|
@ -196,9 +196,9 @@ class RuleController extends Controller
|
||||
|
||||
return view(
|
||||
'rules.rule.edit', compact(
|
||||
'rule', 'subTitle',
|
||||
'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
|
||||
)
|
||||
'rule', 'subTitle',
|
||||
'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -94,8 +94,8 @@ class LinkController extends Controller
|
||||
public function store(
|
||||
JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
|
||||
) {
|
||||
$linkInfo = $request->getLinkInfo();
|
||||
if($linkInfo['transaction_journal_id'] === 0) {
|
||||
$linkInfo = $request->getLinkInfo();
|
||||
if ($linkInfo['transaction_journal_id'] === 0) {
|
||||
Session::flash('error', trans('firefly.invalid_link_selection'));
|
||||
|
||||
return redirect(route('transactions.show', [$journal->id]));
|
||||
|
@ -184,7 +184,7 @@ class SplitController extends Controller
|
||||
*/
|
||||
private function arrayFromInput(SplitJournalFormRequest $request): array
|
||||
{
|
||||
$tags = is_null($request->get('tags')) ? '' : $request->get('tags');
|
||||
$tags = is_null($request->get('tags')) ? '' : $request->get('tags');
|
||||
$array = [
|
||||
'journal_description' => $request->get('journal_description'),
|
||||
'journal_source_account_id' => $request->get('journal_source_account_id'),
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* Kernel.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http;
|
||||
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* EncryptCookies.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Middleware;
|
||||
|
||||
@ -11,7 +22,8 @@ class EncryptCookies extends Middleware
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $except = [
|
||||
//
|
||||
];
|
||||
protected $except
|
||||
= [
|
||||
//
|
||||
];
|
||||
}
|
||||
|
@ -101,12 +101,11 @@ class Range
|
||||
$moneyResult = setlocale(LC_MONETARY, $locale);
|
||||
|
||||
// send error to view if could not set money format
|
||||
if($moneyResult === false) {
|
||||
if ($moneyResult === false) {
|
||||
View::share('invalidMonetaryLocale', true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// save some formats:
|
||||
$monthAndDayFormat = (string)trans('config.month_and_day');
|
||||
$dateTimeFormat = (string)trans('config.date_time');
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* RedirectIfAuthenticated.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Middleware;
|
||||
|
||||
@ -10,9 +21,10 @@ class RedirectIfAuthenticated
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @param string|null $guard
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @param string|null $guard
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next, $guard = null)
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* TrimStrings.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Middleware;
|
||||
|
||||
@ -11,8 +22,9 @@ class TrimStrings extends Middleware
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $except = [
|
||||
'password',
|
||||
'password_confirmation',
|
||||
];
|
||||
protected $except
|
||||
= [
|
||||
'password',
|
||||
'password_confirmation',
|
||||
];
|
||||
}
|
||||
|
@ -1,29 +1,40 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* TrustProxies.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Middleware;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Fideloper\Proxy\TrustProxies as Middleware;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class TrustProxies extends Middleware
|
||||
{
|
||||
/**
|
||||
* The current proxy header mappings.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $headers
|
||||
= [
|
||||
Request::HEADER_FORWARDED => 'FORWARDED',
|
||||
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
|
||||
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
|
||||
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
|
||||
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
|
||||
];
|
||||
/**
|
||||
* The trusted proxies for this application.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $proxies;
|
||||
|
||||
/**
|
||||
* The current proxy header mappings.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $headers = [
|
||||
Request::HEADER_FORWARDED => 'FORWARDED',
|
||||
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
|
||||
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
|
||||
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
|
||||
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
|
||||
];
|
||||
}
|
||||
|
@ -1,4 +1,15 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* VerifyCsrfToken.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Http\Middleware;
|
||||
|
||||
@ -11,7 +22,8 @@ class VerifyCsrfToken extends Middleware
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $except = [
|
||||
//
|
||||
];
|
||||
protected $except
|
||||
= [
|
||||
//
|
||||
];
|
||||
}
|
||||
|
@ -53,6 +53,7 @@ class CategoryFormRequest extends Request
|
||||
if (!is_null($repository->find(intval($this->get('id')))->id)) {
|
||||
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval($this->get('id'));
|
||||
}
|
||||
|
||||
// fixed
|
||||
return [
|
||||
'name' => $nameRule,
|
||||
|
@ -64,6 +64,7 @@ class JournalLinkRequest extends Request
|
||||
$combinations[] = sprintf('%d_outward', $type->id);
|
||||
}
|
||||
$string = join(',', $combinations);
|
||||
|
||||
// fixed
|
||||
return [
|
||||
'link_type' => sprintf('required|in:%s', $string),
|
||||
|
@ -53,7 +53,7 @@ class PiggyBankFormRequest extends Request
|
||||
public function rules()
|
||||
{
|
||||
|
||||
$nameRule = 'required|between:1,255|uniquePiggyBankForUser';
|
||||
$nameRule = 'required|between:1,255|uniquePiggyBankForUser';
|
||||
if (intval($this->get('id'))) {
|
||||
$nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval($this->get('id'));
|
||||
}
|
||||
|
@ -13,9 +13,8 @@ declare(strict_types=1);
|
||||
|
||||
namespace FireflyIII\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use URL;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
/**
|
||||
* Class AppServiceProvider
|
||||
|
@ -1,8 +1,18 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* AuthServiceProvider.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
|
||||
|
||||
class AuthServiceProvider extends ServiceProvider
|
||||
@ -12,9 +22,10 @@ class AuthServiceProvider extends ServiceProvider
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $policies = [
|
||||
'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy',
|
||||
];
|
||||
protected $policies
|
||||
= [
|
||||
'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy',
|
||||
];
|
||||
|
||||
/**
|
||||
* Register any authentication / authorization services.
|
||||
|
@ -1,9 +1,20 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* BroadcastServiceProvider.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Illuminate\Support\Facades\Broadcast;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class BroadcastServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
@ -1,9 +1,20 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* RouteServiceProvider.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
namespace FireflyIII\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
class RouteServiceProvider extends ServiceProvider
|
||||
{
|
||||
@ -42,20 +53,6 @@ class RouteServiceProvider extends ServiceProvider
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the "web" routes for the application.
|
||||
*
|
||||
* These routes all receive session state, CSRF protection, etc.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function mapWebRoutes()
|
||||
{
|
||||
Route::middleware('web')
|
||||
->namespace($this->namespace)
|
||||
->group(base_path('routes/web.php'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the "api" routes for the application.
|
||||
*
|
||||
@ -70,4 +67,18 @@ class RouteServiceProvider extends ServiceProvider
|
||||
->namespace($this->namespace)
|
||||
->group(base_path('routes/api.php'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the "web" routes for the application.
|
||||
*
|
||||
* These routes all receive session state, CSRF protection, etc.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function mapWebRoutes()
|
||||
{
|
||||
Route::middleware('web')
|
||||
->namespace($this->namespace)
|
||||
->group(base_path('routes/web.php'));
|
||||
}
|
||||
}
|
||||
|
@ -453,7 +453,7 @@ class CategoryRepository implements CategoryRepositoryInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Category $category
|
||||
* @param Category $category
|
||||
*
|
||||
* @return Carbon|null
|
||||
*/
|
||||
@ -470,7 +470,7 @@ class CategoryRepository implements CategoryRepositoryInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Category $category
|
||||
* @param Category $category
|
||||
*
|
||||
* @return Carbon|null
|
||||
*/
|
||||
|
@ -17,7 +17,6 @@ use Amount as Amt;
|
||||
use Carbon\Carbon;
|
||||
use Eloquent;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Request;
|
||||
use Illuminate\Support\MessageBag;
|
||||
use Input;
|
||||
use RuntimeException;
|
||||
|
@ -15,8 +15,8 @@ namespace FireflyIII\TransactionRules\Factory;
|
||||
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Models\RuleAction;
|
||||
use FireflyIII\TransactionRules\Actions\ActionInterface;
|
||||
use FireflyIII\Support\Domain;
|
||||
use FireflyIII\TransactionRules\Actions\ActionInterface;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
|
@ -15,9 +15,9 @@ namespace FireflyIII\TransactionRules\Factory;
|
||||
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Models\RuleTrigger;
|
||||
use FireflyIII\Support\Domain;
|
||||
use FireflyIII\TransactionRules\Triggers\AbstractTrigger;
|
||||
use FireflyIII\TransactionRules\Triggers\TriggerInterface;
|
||||
use FireflyIII\Support\Domain;
|
||||
use Log;
|
||||
|
||||
/**
|
||||
|
@ -23,8 +23,8 @@ use FireflyIII\Models\Budget;
|
||||
use FireflyIII\Models\PiggyBank;
|
||||
use FireflyIII\Models\TransactionType;
|
||||
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
||||
use FireflyIII\TransactionRules\Triggers\TriggerInterface;
|
||||
use FireflyIII\Services\Password\Verifier;
|
||||
use FireflyIII\TransactionRules\Triggers\TriggerInterface;
|
||||
use FireflyIII\User;
|
||||
use Google2FA;
|
||||
use Illuminate\Contracts\Encryption\DecryptException;
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
'name' => env('APP_NAME', 'Firefly III'),
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
return [
|
||||
'driver' => env('SESSION_DRIVER', 'file'),
|
||||
|
@ -1,30 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* auth.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Authentication Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are used during authentication for various
|
||||
| messages that we need to display to the user. You are free to modify
|
||||
| these language lines according to your application's requirements.
|
||||
|
|
||||
*/
|
||||
|
||||
'failed' => '帳號或密碼錯誤。',
|
||||
'throttle' => '登入失敗次數過多,請等待 :seconds 秒後再試。',
|
||||
|
||||
];
|
@ -1,44 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* breadcrumbs.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
'home' => '首頁',
|
||||
'edit_currency' => '編輯貨幣 ":name"',
|
||||
'delete_currency' => '刪除貨幣 ":name"',
|
||||
'newPiggyBank' => '創建一個新的存錢筒',
|
||||
'edit_piggyBank' => '編輯存錢筒 ":name"',
|
||||
'preferences' => '設定',
|
||||
'profile' => '個人設定',
|
||||
'changePassword' => '更改密碼',
|
||||
'bills' => '賬單',
|
||||
'newBill' => '新增賬單',
|
||||
'edit_bill' => '編輯賬單 ":name"',
|
||||
'delete_bill' => '刪除賬單 ":name"',
|
||||
'reports' => '報表',
|
||||
'search_result' => 'Search results for ":query"',
|
||||
'withdrawal_list' => '支出',
|
||||
'deposit_list' => '收入、薪金與存款',
|
||||
'transfer_list' => '轉帳',
|
||||
'transfers_list' => '轉帳',
|
||||
'create_withdrawal' => '新增提款',
|
||||
'create_deposit' => '新增存款',
|
||||
'create_transfer' => '新增轉帳',
|
||||
'edit_journal' => '編緝交易 ":description"',
|
||||
'delete_journal' => '刪除交易 ":description"',
|
||||
'tags' => '標籤',
|
||||
'createTag' => '建立新標籤',
|
||||
'edit_tag' => '編輯標籤 ":tag"',
|
||||
'delete_tag' => '刪除標籤 ":tag"',
|
||||
'delete_journal_link' => 'Delete link between transactions',
|
||||
];
|
@ -1,25 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* config.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8',
|
||||
'month' => '%B %Y',
|
||||
'month_and_day' => '%B %e, %Y',
|
||||
'date_time' => '%B %e, %Y, @ %T',
|
||||
'specific_day' => '%e %B %Y',
|
||||
'week_in_year' => 'Week %W, %Y',
|
||||
'quarter_of_year' => '%B %Y',
|
||||
'year' => '%Y',
|
||||
'half_year' => '%B %Y',
|
||||
|
||||
];
|
@ -1,83 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* csv.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
// initial config
|
||||
'initial_title' => 'Import setup (1/3) - Basic CSV import setup',
|
||||
'initial_text' => 'To be able to import your file correctly, please validate the options below.',
|
||||
'initial_box' => 'Basic CSV import setup',
|
||||
'initial_box_title' => 'Basic CSV import setup options',
|
||||
'initial_header_help' => 'Check this box if the first row of your CSV file are the column titles.',
|
||||
'initial_date_help' => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
|
||||
'initial_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
|
||||
'initial_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
|
||||
'initial_submit' => 'Continue with step 2/3',
|
||||
|
||||
// roles config
|
||||
'roles_title' => 'Import setup (2/3) - Define each column\'s role',
|
||||
'roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
|
||||
'roles_table' => 'Table',
|
||||
'roles_column_name' => 'Name of column',
|
||||
'roles_column_example' => 'Column example data',
|
||||
'roles_column_role' => 'Column data meaning',
|
||||
'roles_do_map_value' => 'Map these values',
|
||||
'roles_column' => 'Column',
|
||||
'roles_no_example_data' => 'No example data available',
|
||||
'roles_submit' => 'Continue with step 3/3',
|
||||
'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
|
||||
|
||||
// map data
|
||||
'map_title' => 'Import setup (3/3) - Connect import data to Firefly III data',
|
||||
'map_text' => '在下表中,左邊的是在你的CSV 檔中的資料。而你現在要把這些資料配對到資料庫中的資料(如有的話)。如果沒有資料能夠進行配對,或者你不想進行配對,請選擇不進行配對。',
|
||||
'map_field_value' => 'Field value',
|
||||
'map_field_mapped_to' => 'Mapped to',
|
||||
'map_do_not_map' => '(do not map)',
|
||||
'map_submit' => 'Start the import',
|
||||
|
||||
// map things.
|
||||
'column__ignore' => '(忽略此欄)',
|
||||
'column_account-iban' => '資產帳戶 (IBAN)',
|
||||
'column_account-id' => '資產帳戶 ID (與 Firefly 匹配)',
|
||||
'column_account-name' => '資產帳戶 (名稱)',
|
||||
'column_amount' => '金額',
|
||||
'column_amount-comma-separated' => '金額 (逗號作為小數分隔符號)',
|
||||
'column_bill-id' => '帳單 ID (與 Firefly 匹配)',
|
||||
'column_bill-name' => '帳單名稱',
|
||||
'column_budget-id' => '預算 ID (與 Firefly 匹配)',
|
||||
'column_budget-name' => '預算名稱',
|
||||
'column_category-id' => '類別 ID (與 Firefly 匹配)',
|
||||
'column_category-name' => '類別名稱',
|
||||
'column_currency-code' => '貨幣代碼 (ISO 4217)',
|
||||
'column_currency-id' => '貨幣 ID (與 Firefly 匹配)',
|
||||
'column_currency-name' => '貨幣名稱(與 Firefly 匹配)',
|
||||
'column_currency-symbol' => '貨幣符號 (與 Firefly 匹配)',
|
||||
'column_date-interest' => '利息計算日',
|
||||
'column_date-book' => 'Transaction booking date',
|
||||
'column_date-process' => '交易處理日期',
|
||||
'column_date-transaction' => '日期',
|
||||
'column_description' => '描述',
|
||||
'column_opposing-iban' => '抵銷的帳戶 (IBAN)',
|
||||
'column_opposing-id' => '抵銷的帳戶 ID (與 Firefly 匹配)',
|
||||
'column_external-id' => '外部 ID',
|
||||
'column_opposing-name' => '抵銷的帳戶 (名稱)',
|
||||
'column_rabo-debet-credit' => '荷蘭合作銀行獨有的借記/貸記指標',
|
||||
'column_ing-debet-credit' => 'ING 集團獨有的借記/貸記指標',
|
||||
'column_sepa-ct-id' => 'SEPA Credit Transfer end-to-end ID',
|
||||
'column_sepa-ct-op' => 'SEPA 貸記劃撥抵銷的帳戶',
|
||||
'column_sepa-db' => 'SEPA 直接付款',
|
||||
'column_tags-comma' => '標籤 (逗號分隔)',
|
||||
'column_tags-space' => '標籤 (空格分隔)',
|
||||
'column_account-number' => '資產帳戶 (帳號號碼)',
|
||||
'column_opposing-number' => '抵銷的帳戶 (帳號號碼)',
|
||||
];
|
@ -1,26 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* demo.php
|
||||
* Copyright (c) 2016 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
'no_demo_text' => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
|
||||
'see_help_icon' => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
|
||||
'index' => 'Welcome to <strong>Firefly III</strong>! On this page you get a quick overview of your finances. For more information, check out Accounts → <a href=":asset">Asset Accounts</a> and of course the <a href=":budgets">Budgets</a> and <a href=":reports">Reports</a> pages. Or just take a look around and see where you end up.',
|
||||
'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
|
||||
'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
|
||||
'reports-index-start' => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
|
||||
'reports-index-examples' => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
|
||||
'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
|
||||
'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
|
||||
'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
|
||||
'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
|
||||
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
|
||||
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
|
||||
];
|
File diff suppressed because it is too large
Load Diff
@ -1,199 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* form.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
// new user:
|
||||
'bank_name' => '銀行名稱',
|
||||
'bank_balance' => '餘額',
|
||||
'savings_balance' => '儲蓄帳戶的餘額',
|
||||
'credit_card_limit' => '信用卡額度',
|
||||
'automatch' => '自動匹配',
|
||||
'skip' => '略過',
|
||||
'name' => '名稱',
|
||||
'active' => '啟用',
|
||||
'amount_min' => '最小金額',
|
||||
'amount_max' => '最大值',
|
||||
'match' => '匹配於',
|
||||
'repeat_freq' => '循環週期',
|
||||
'journal_currency_id' => '貨幣',
|
||||
'currency_id' => 'Currency',
|
||||
'attachments' => 'Attachments',
|
||||
'journal_amount' => '金額',
|
||||
'journal_asset_source_account' => '資產帳戶 (源頭)',
|
||||
'journal_source_account_name' => '收入帳戶 (源頭)',
|
||||
'journal_source_account_id' => '資產帳戶 (源頭)',
|
||||
'BIC' => 'BIC',
|
||||
'verify_password' => 'Verify password security',
|
||||
'account_from_id' => '從帳戶',
|
||||
'account_to_id' => '到帳戶',
|
||||
'source_account' => '來源帳戶',
|
||||
'destination_account' => '目標帳戶',
|
||||
'journal_destination_account_id' => '資產帳戶 (目標)',
|
||||
'asset_destination_account' => '資產帳戶 (目標)',
|
||||
'asset_source_account' => '資產帳戶 (來源)',
|
||||
'journal_description' => '描述',
|
||||
'note' => '備註',
|
||||
'split_journal' => '分割此交易',
|
||||
'split_journal_explanation' => '分割這個交易為幾個部分',
|
||||
'currency' => '貨幣',
|
||||
'account_id' => '資產帳戶',
|
||||
'budget_id' => '預算',
|
||||
'openingBalance' => '開戶金額',
|
||||
'tagMode' => '標記模式',
|
||||
'tagPosition' => '標籤位置',
|
||||
'virtualBalance' => '虛擬金額',
|
||||
'longitude_latitude' => '位置',
|
||||
'targetamount' => '目標金額',
|
||||
'accountRole' => '帳戶角色',
|
||||
'openingBalanceDate' => '開戶日期',
|
||||
'ccType' => '信用卡付款計畫',
|
||||
'ccMonthlyPaymentDate' => '信用卡每月付款日期',
|
||||
'piggy_bank_id' => '存錢筒',
|
||||
'returnHere' => '回到這裡',
|
||||
'returnHereExplanation' => '儲存後,回到這裡創建另一個記錄。',
|
||||
'returnHereUpdateExplanation' => '更新後,回到這裡。',
|
||||
'description' => '描述',
|
||||
'expense_account' => '支出帳戶',
|
||||
'revenue_account' => '收入帳戶',
|
||||
'decimal_places' => 'Decimal places',
|
||||
'exchange_rate_instruction' => 'Foreign currencies',
|
||||
'exchanged_amount' => 'Exchanged amount',
|
||||
'source_amount' => 'Amount (source)',
|
||||
'destination_amount' => 'Amount (destination)',
|
||||
'native_amount' => 'Native amount',
|
||||
|
||||
'revenue_account_source' => '收入帳戶 (源頭)',
|
||||
'source_account_asset' => '來源帳戶 (資產帳戶)',
|
||||
'destination_account_expense' => 'Destination account (expense account)',
|
||||
'destination_account_asset' => 'Destination account (asset account)',
|
||||
'source_account_revenue' => '來源帳戶 (收入帳戶)',
|
||||
'type' => 'Type',
|
||||
'convert_Withdrawal' => 'Convert withdrawal',
|
||||
'convert_Deposit' => 'Convert deposit',
|
||||
'convert_Transfer' => 'Convert transfer',
|
||||
|
||||
|
||||
'amount' => '金額',
|
||||
'date' => '日期',
|
||||
'interest_date' => '付息日',
|
||||
'book_date' => 'Book date',
|
||||
'process_date' => '處理日期',
|
||||
'category' => '類別',
|
||||
'tags' => '標籤',
|
||||
'deletePermanently' => '永久刪除',
|
||||
'cancel' => '取消',
|
||||
'targetdate' => '儲蓄目標日期',
|
||||
'tag' => '標籤',
|
||||
'under' => '低於',
|
||||
'symbol' => 'Symbol',
|
||||
'code' => 'Code',
|
||||
'iban' => 'IBAN',
|
||||
'accountNumber' => '帳戶號碼',
|
||||
'has_headers' => '標頭',
|
||||
'date_format' => '日期格式',
|
||||
'specifix' => 'Bank- or file specific fixes',
|
||||
'attachments[]' => '附檔',
|
||||
'store_new_withdrawal' => '存儲新提款',
|
||||
'store_new_deposit' => '存儲新存款',
|
||||
'store_new_transfer' => '存儲新轉帳',
|
||||
'add_new_withdrawal' => '新增提款',
|
||||
'add_new_deposit' => '新增新存款',
|
||||
'add_new_transfer' => 'Add a new transfer',
|
||||
'noPiggybank' => '(no piggy bank)',
|
||||
'title' => '標題',
|
||||
'notes' => '備註',
|
||||
'filename' => '檔案名稱',
|
||||
'mime' => 'Mime type',
|
||||
'size' => 'Size',
|
||||
'trigger' => 'Trigger',
|
||||
'stop_processing' => 'Stop processing',
|
||||
'start_date' => 'Start of range',
|
||||
'end_date' => 'End of range',
|
||||
'export_start_range' => 'Start of export range',
|
||||
'export_end_range' => 'End of export range',
|
||||
'export_format' => '檔案格式',
|
||||
'include_attachments' => '包括上傳的附件',
|
||||
'include_old_uploads' => '包含導入的資料',
|
||||
'accounts' => '從這些帳戶匯出交易記錄',
|
||||
'delete_account' => '刪除帳號 ":name"',
|
||||
'delete_bill' => '刪除帳單 ":name"',
|
||||
'delete_budget' => '刪除預算 ":name"',
|
||||
'delete_category' => '刪除類別 ":name"',
|
||||
'delete_currency' => '刪除貨幣 ":name"',
|
||||
'delete_journal' => '刪除包含描述 ":description" 的交易',
|
||||
'delete_attachment' => 'Delete attachment ":name"',
|
||||
'delete_rule' => 'Delete rule ":title"',
|
||||
'delete_rule_group' => 'Delete rule group ":title"',
|
||||
'delete_link_type' => 'Delete link type ":name"',
|
||||
'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
|
||||
'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
|
||||
'bill_areYouSure' => '你確定要刪除賬單 ":name" 嗎?',
|
||||
'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
|
||||
'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
|
||||
'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
|
||||
'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
|
||||
'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
|
||||
'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
|
||||
'journal_areYouSure' => '你真的要刪除這個描述為 ":description" 的交易嗎?',
|
||||
'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
|
||||
'tag_areYouSure' => '你真的要要刪除標籤 ":tag" 嗎?',
|
||||
'journal_link_areYouSure' => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
|
||||
'linkType_areYouSure' => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
|
||||
'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
|
||||
'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
|
||||
'delete_all_permanently' => 'Delete selected permanently',
|
||||
'update_all_journals' => 'Update these transactions',
|
||||
'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
|
||||
'also_delete_connections' => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
|
||||
'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
|
||||
'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
|
||||
'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
|
||||
'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
|
||||
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
|
||||
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
|
||||
|
||||
'email' => 'Email address',
|
||||
'password' => 'Password',
|
||||
'password_confirmation' => 'Password (again)',
|
||||
'blocked' => 'Is blocked?',
|
||||
'blocked_code' => 'Reason for block',
|
||||
|
||||
|
||||
// admin
|
||||
'domain' => 'Domain',
|
||||
'single_user_mode' => 'Single user mode',
|
||||
'must_confirm_account' => 'New users must activate account',
|
||||
'is_demo_site' => 'Is demo site',
|
||||
|
||||
|
||||
// import
|
||||
'import_file' => '匯入檔案',
|
||||
'configuration_file' => 'Configuration file',
|
||||
'import_file_type' => '匯入檔案類型',
|
||||
'csv_comma' => 'A comma (,)',
|
||||
'csv_semicolon' => 'A semicolon (;)',
|
||||
'csv_tab' => 'A tab (invisible)',
|
||||
'csv_delimiter' => 'CSV field delimiter',
|
||||
'csv_import_account' => 'Default import account',
|
||||
'csv_config' => 'CSV import configuration',
|
||||
|
||||
|
||||
'due_date' => '到期日',
|
||||
'payment_date' => 'Payment date',
|
||||
'invoice_date' => 'Invoice date',
|
||||
'internal_reference' => 'Internal reference',
|
||||
|
||||
'inward' => 'Inward description',
|
||||
'outward' => 'Outward description',
|
||||
];
|
@ -1,35 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* help.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
// tour!
|
||||
'main-content-title' => '歡迎來到 Firefly III',
|
||||
'main-content-text' => '來看看這個簡單的教學來學習使用 Firefly III 吧!',
|
||||
'sidebar-toggle-title' => '按側欄來建立新的東西',
|
||||
'sidebar-toggle-text' => '按一下加號圖案來創建新物件。帳號、交易、任何東西都可以!',
|
||||
'account-menu-title' => '所有帳戶',
|
||||
'account-menu-text' => '你能在這裡找到你所有的帳戶。',
|
||||
'budget-menu-title' => '預算',
|
||||
'budget-menu-text' => '本頁可以幫助你管理財產及降低支出。',
|
||||
'report-menu-title' => '報表',
|
||||
'report-menu-text' => '如果你需要一個財務狀況的簡報,來看看這個吧。',
|
||||
'transaction-menu-title' => '交易',
|
||||
'transaction-menu-text' => '你可以在這裡找到所有交易記錄。',
|
||||
'option-menu-title' => '設定',
|
||||
'option-menu-text' => '相當不言而喻吧。',
|
||||
'main-content-end-title' => '完',
|
||||
'main-content-end-text' => '每一頁在右上方有一個小問號。按一下它可以取得與頁面相關説明。',
|
||||
'index' => '首頁',
|
||||
'home' => '首頁',
|
||||
];
|
@ -1,121 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* intro.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
* This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
// index
|
||||
'index_intro' => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
|
||||
'index_accounts-chart' => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
|
||||
'index_box_out_holder' => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
|
||||
'index_help' => 'If you ever need help with a page or a form, press this button.',
|
||||
'index_outro' => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
|
||||
'index_sidebar-toggle' => 'To create new transactions, accounts or other things, use the menu under this icon.',
|
||||
|
||||
// create account:
|
||||
'accounts_create_iban' => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
|
||||
'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
|
||||
'accounts_create_asset_currency' => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
|
||||
'accounts_create_asset_virtual' => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
|
||||
|
||||
// budgets index
|
||||
'budgets_index_intro' => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
|
||||
'budgets_index_set_budget' => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
|
||||
'budgets_index_see_expenses_bar' => 'Spending money will slowly fill this bar.',
|
||||
'budgets_index_navigate_periods' => 'Navigate through periods to easily set budgets ahead of time.',
|
||||
'budgets_index_new_budget' => 'Create new budgets as you see fit.',
|
||||
'budgets_index_list_of_budgets' => 'Use this table to set the amounts for each budget and see how you are doing.',
|
||||
|
||||
// reports (index)
|
||||
'reports_index_intro' => 'Use these reports to get detailed insights in your finances.',
|
||||
'reports_index_inputReportType' => 'Pick a report type. Check out the help pages to see what each report shows you.',
|
||||
'reports_index_inputAccountsSelect' => 'You can exclude or include asset accounts as you see fit.',
|
||||
'reports_index_inputDateRange' => 'The selected date range is entirely up to you: from one day to 10 years.',
|
||||
'reports_index_extra-options-box' => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
|
||||
|
||||
// reports (reports)
|
||||
'reports_report_default_intro' => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
|
||||
'reports_report_audit_intro' => 'This report will give you detailed insights in your asset accounts.',
|
||||
'reports_report_audit_optionsBox' => 'Use these check boxes to show or hide the columns you are interested in.',
|
||||
|
||||
'reports_report_category_intro' => 'This report will give you insight in one or multiple categories.',
|
||||
'reports_report_category_pieCharts' => 'These charts will give you insight in expenses and income per category or per account.',
|
||||
'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
|
||||
|
||||
'reports_report_tag_intro' => 'This report will give you insight in one or multiple tags.',
|
||||
'reports_report_tag_pieCharts' => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
|
||||
'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
|
||||
|
||||
'reports_report_budget_intro' => 'This report will give you insight in one or multiple budgets.',
|
||||
'reports_report_budget_pieCharts' => 'These charts will give you insight in expenses per budget or per account.',
|
||||
'reports_report_budget_incomeAndExpensesChart' => 'This chart shows your expenses per budget.',
|
||||
|
||||
// create transaction
|
||||
'transactions_create_switch_box' => 'Use these buttons to quickly switch the type of transaction you wish to save.',
|
||||
'transactions_create_ffInput_category' => 'You can freely type in this field. Previously created categories will be suggested.',
|
||||
'transactions_create_withdrawal_ffInput_budget' => 'Link your withdrawal to a budget for better financial control.',
|
||||
'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
|
||||
'transactions_create_deposit_currency_dropdown_amount' => 'Use this dropdown when your deposit is in another currency.',
|
||||
'transactions_create_transfer_ffInput_piggy_bank_id' => 'Select a piggy bank and link this transfer to your savings.',
|
||||
|
||||
// piggy banks index:
|
||||
'piggy-banks_index_saved' => 'This field shows you how much you\'ve saved in each piggy bank.',
|
||||
'piggy-banks_index_button' => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
|
||||
'piggy-banks_index_accountStatus' => 'For each asset account with at least one piggy bank the status is listed in this table.',
|
||||
|
||||
// create piggy
|
||||
'piggy-banks_create_name' => 'What is your goal? A new couch, a camera, money for emergencies?',
|
||||
'piggy-banks_create_date' => 'You can set a target date or a deadline for your piggy bank.',
|
||||
|
||||
// show piggy
|
||||
'piggy-banks_show_piggyChart' => 'This chart will show the history of this piggy bank.',
|
||||
'piggy-banks_show_piggyDetails' => 'Some details about your piggy bank',
|
||||
'piggy-banks_show_piggyEvents' => 'Any additions or removals are also listed here.',
|
||||
|
||||
// bill index
|
||||
'bills_index_paid_in_period' => 'This field indicates when the bill was last paid.',
|
||||
'bills_index_expected_in_period' => 'This field indicates for each bill if and when the next bill is expected to hit.',
|
||||
|
||||
// show bill
|
||||
'bills_show_billInfo' => 'This table shows some general information about this bill.',
|
||||
'bills_show_billButtons' => 'Use this button to re-scan old transactions so they will be matched to this bill.',
|
||||
'bills_show_billChart' => 'This chart shows the transactions linked to this bill.',
|
||||
|
||||
// create bill
|
||||
'bills_create_name' => 'Use a descriptive name such as "Rent" or "Health insurance".',
|
||||
'bills_create_match' => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
|
||||
'bills_create_amount_min_holder' => 'Select a minimum and maximum amount for this bill.',
|
||||
'bills_create_repeat_freq_holder' => 'Most bills repeat monthly, but you can set another frequency here.',
|
||||
'bills_create_skip_holder' => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
|
||||
|
||||
// rules index
|
||||
'rules_index_intro' => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
|
||||
'rules_index_new_rule_group' => 'You can combine rules in groups for easier management.',
|
||||
'rules_index_new_rule' => 'Create as many rules as you like.',
|
||||
'rules_index_prio_buttons' => 'Order them any way you see fit.',
|
||||
'rules_index_test_buttons' => 'You can test your rules or apply them to existing transactions.',
|
||||
'rules_index_rule-triggers' => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
|
||||
'rules_index_outro' => 'Be sure to check out the help pages using the (?) icon in the top right!',
|
||||
|
||||
// create rule:
|
||||
'rules_create_mandatory' => 'Choose a descriptive title, and set when the rule should be fired.',
|
||||
'rules_create_ruletriggerholder' => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
|
||||
'rules_create_test_rule_triggers' => 'Use this button to see which transactions would match your rule.',
|
||||
'rules_create_actions' => 'Set as many actions as you like.',
|
||||
|
||||
// preferences
|
||||
'preferences_index_tabs' => 'More options are available behind these tabs.',
|
||||
|
||||
// currencies
|
||||
'currencies_index_intro' => 'Firefly III supports multiple currencies, which you can change on this page.',
|
||||
'currencies_index_default' => 'Firefly III has one default currency. You can always switch of course using these buttons.',
|
||||
|
||||
// create currency
|
||||
'currencies_create_code' => 'This code should be ISO compliant (Google it for your new currency).',
|
||||
];
|
@ -1,94 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* list.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
'buttons' => '按鈕',
|
||||
'icon' => '圖標',
|
||||
'id' => 'ID',
|
||||
'create_date' => '建立於',
|
||||
'update_date' => '更新於',
|
||||
'balance_before' => '交易前餘額',
|
||||
'balance_after' => '交易後餘額',
|
||||
'name' => '名稱',
|
||||
'role' => '角色',
|
||||
'currentBalance' => '目前餘額',
|
||||
'active' => '是否有效?',
|
||||
'lastActivity' => '最後的活動',
|
||||
'balanceDiff' => ':start 和 :end 之間的餘額差',
|
||||
'matchedOn' => '匹配於',
|
||||
'matchesOn' => '匹配於',
|
||||
'account_type' => '帳戶類型',
|
||||
'created_at' => '建立於',
|
||||
'new_balance' => '新餘額',
|
||||
'account' => '帳戶',
|
||||
'matchingAmount' => '金額',
|
||||
'lastMatch' => '最後出現',
|
||||
'split_number' => '分割編號 #',
|
||||
'destination' => '到',
|
||||
'source' => '來源',
|
||||
'next_expected_match' => 'Next expected match',
|
||||
'automatch' => '自動匹配?',
|
||||
'repeat_freq' => '重複',
|
||||
'description' => '描述',
|
||||
'amount' => '金額',
|
||||
'internal_reference' => '內部參考',
|
||||
'date' => '日期',
|
||||
'interest_date' => '付息日',
|
||||
'book_date' => 'Book date',
|
||||
'process_date' => '處理日期',
|
||||
'due_date' => '到期日',
|
||||
'payment_date' => '付款日期',
|
||||
'invoice_date' => '發票日期',
|
||||
'interal_reference' => '內部參考',
|
||||
'notes' => '備註',
|
||||
'from' => '從',
|
||||
'piggy_bank' => '存錢筒',
|
||||
'to' => '至',
|
||||
'budget' => '預算',
|
||||
'category' => '類別',
|
||||
'bill' => '賬單',
|
||||
'withdrawal' => '取款',
|
||||
'deposit' => '存款',
|
||||
'transfer' => '轉帳',
|
||||
'type' => '類型',
|
||||
'completed' => '已完成',
|
||||
'iban' => '國際銀行賬戶號碼(IBAN)',
|
||||
'paid_current_period' => '在這期間已付',
|
||||
'email' => '電子郵件',
|
||||
'registered_at' => '註冊於',
|
||||
'is_activated' => '已經啟動',
|
||||
'is_blocked' => '被阻止',
|
||||
'is_admin' => '是管理員',
|
||||
'has_two_factor' => '有雙重身份驗證 (2FA)',
|
||||
'confirmed_from' => 'Confirmed from',
|
||||
'registered_from' => 'Registered from',
|
||||
'blocked_code' => 'Block code',
|
||||
'domain' => 'Domain',
|
||||
'registration_attempts' => 'Registration attempts',
|
||||
'source_account' => '來源帳戶',
|
||||
'destination_account' => 'Destination account',
|
||||
|
||||
'accounts_count' => 'Number of accounts',
|
||||
'journals_count' => 'Number of transactions',
|
||||
'attachments_count' => 'Number of attachments',
|
||||
'bills_count' => 'Number of bills',
|
||||
'categories_count' => 'Number of categories',
|
||||
'export_jobs_count' => 'Number of export jobs',
|
||||
'import_jobs_count' => 'Number of import jobs',
|
||||
'budget_count' => 'Number of budgets',
|
||||
'rule_and_groups_count' => 'Number of rules and rule groups',
|
||||
'tags_count' => 'Number of tags',
|
||||
'inward' => 'Inward description',
|
||||
'outward' => 'Outward description',
|
||||
'number_of_transactions' => 'Number of transactions',
|
||||
];
|
@ -1,19 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* pagination.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
'previous' => '« 上一頁',
|
||||
'next' => '下一頁 »',
|
||||
|
||||
];
|
@ -1,21 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* passwords.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
'password' => '密碼至少需要六個字元,並與確認欄中的密碼相同。',
|
||||
'user' => '我們找不到使用該電郵地址的用戶。',
|
||||
'token' => '該密碼重置碼已經失效。',
|
||||
'sent' => '我們已經將密碼重置連結發送至您的電郵!',
|
||||
'reset' => '你的密碼已經被重置!',
|
||||
'blocked' => '好一個嘗試。',
|
||||
];
|
@ -1,94 +0,0 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* validation.php
|
||||
* Copyright (C) 2016 thegrumpydictator@gmail.com
|
||||
*
|
||||
* This software may be modified and distributed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||
*
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
return [
|
||||
'iban' => '這不是有效的 IBAN。',
|
||||
'unique_account_number_for_user' => '此帳號號碼已經存在。',
|
||||
'deleted_user' => 'Due to security constraints, you cannot register using this email address.',
|
||||
'rule_trigger_value' => '此值不能用於所選擇的事件。',
|
||||
'rule_action_value' => '此值不能用於所選擇的動作。',
|
||||
'invalid_domain' => '基於安全理由,你無法使用此域名註冊。',
|
||||
'file_already_attached' => '檔案 ":name" 已附加到該物件上。',
|
||||
'file_attached' => '已成功上傳檔案 ":name"。',
|
||||
'file_invalid_mime' => '檔案 ":name" 的類型為 ":mime",並不容許上載此類型的檔案。',
|
||||
'file_too_large' => '檔案 ":name" 過大。',
|
||||
'belongs_to_user' => ':attribute 的值是未知的。',
|
||||
'accepted' => ':attribute 必須被接受。',
|
||||
'bic' => 'This is not a valid BIC.',
|
||||
'more' => ':attribute must be larger than zero.',
|
||||
'active_url' => ':attribute 不是有效的URL。',
|
||||
'after' => ':attribute 必須是一個在 :date 之後的日期。',
|
||||
'alpha' => ':attribute 只允許包含字母。',
|
||||
'alpha_dash' => ':attribute 只允許數字,字母,和下劃線。',
|
||||
'alpha_num' => ':attribute 只允許包含數字和字母。',
|
||||
'array' => ':attribute 必須是一個陣列。',
|
||||
'unique_for_user' => ':attribute 已存在。',
|
||||
'before' => ':attribute 必須是一個在 :date 之前的日期。',
|
||||
'unique_object_for_user' => '這個名稱已被使用。',
|
||||
'unique_account_for_user' => '這個帳號名稱已被使用。',
|
||||
'between.numeric' => ':attribute 必須在 :min 和 :max 之間。',
|
||||
'between.file' => ':attribute 必須在 :min kB到 :max kB之間。',
|
||||
'between.string' => ':attribute 包含的字符數量必須在 :min 到 :max 之間。',
|
||||
'between.array' => ':attribute 的數目必須在 :min 到 :max 之間。',
|
||||
'boolean' => ':attribute 必須為 true 或 false。',
|
||||
'confirmed' => ':attribute 的屬性不相符',
|
||||
'date' => ':attribute 不是有效的日期。',
|
||||
'date_format' => ':attribute 不符合格式 :format 。',
|
||||
'different' => ':attribute 和 :other 不能相同。',
|
||||
'digits' => ':attribute 必須是 :digits 位數字。',
|
||||
'digits_between' => ':attribute 必須在 :min 位和 :max 位數字之間。',
|
||||
'email' => ':attribute 必須是一個有效的電子郵件地址。',
|
||||
'filled' => ':attribute 欄位是必填的。',
|
||||
'exists' => '所選的 :attribute 無效。',
|
||||
'image' => ':attribute 必須是圖片。',
|
||||
'in' => '所選的 :attribute 無效。',
|
||||
'integer' => ':attribute 必須是整數。',
|
||||
'ip' => ':attribute 必須是一個有效的 IP 地址。',
|
||||
'json' => ':attribute 必須是一個有效的 JSON 字符串。',
|
||||
'max.numeric' => ':attribute 不能大於 :max。',
|
||||
'max.file' => ':attribute 不能大於 :max kB。',
|
||||
'max.string' => ':attribute 不能大於 :max 字元。',
|
||||
'max.array' => ':attribute 的數量不能超過 :max 個。',
|
||||
'mimes' => ':attribute 的文件類型必須是 :values 。',
|
||||
'min.numeric' => ':attribute 至少需要 :min。',
|
||||
'min.file' => ':attribute 大小至少為 :min KB。',
|
||||
'min.string' => ':attribute 最少需要有 :min 個字符。',
|
||||
'min.array' => ':attribute 至少需要有 :min 項。',
|
||||
'not_in' => '所選的 :attribute 無效。',
|
||||
'numeric' => ':attribute 必須是數字。',
|
||||
'regex' => ':attribute 格式無效。',
|
||||
'required' => ':attribute 欄位是必填的。',
|
||||
'required_if' => ':attribute 欄位在 :other 是 :value 時是必填的。',
|
||||
'required_unless' => '除非 :other 是 :value ,否則 :attribute 是必填的。',
|
||||
'required_with' => '當 :values 存在時, :attribute 是必填的。',
|
||||
'required_with_all' => '當 :values 存在時, :attribute 是必填的。',
|
||||
'required_without' => '當 :values 不存在時, :attribute 是必填的。',
|
||||
'required_without_all' => '當沒有任何 :values 存在時, :attribute 為必填項。',
|
||||
'same' => ':attribute 和 :other 必須匹配。',
|
||||
'size.numeric' => ':attribute 必須是 :size 位。',
|
||||
'size.file' => ':attribute 必須為 :size KB。',
|
||||
'size.string' => ':attribute 必須包含 :size 個字符。',
|
||||
'size.array' => ':attribute 必須包含 :size 個項目。',
|
||||
'unique' => ':attribute 已經存在。',
|
||||
'string' => ':attribute 必須是一個字符串。',
|
||||
'url' => ':attribute 格式無效。',
|
||||
'timezone' => ':attribute 必須是有效的區域。',
|
||||
'2fa_code' => ':attribute 格式無效。',
|
||||
'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.',
|
||||
'amount_zero' => 'The total amount cannot be zero',
|
||||
'secure_password' => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
|
||||
];
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
namespace Tests;
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
|
@ -1,4 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
namespace Tests\Unit;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user