IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/5.5.3' into main

Browse Source
This commit is contained in:
James Cole
2021-04-03 18:50:36 +02:00
parent 6a37ad7c15 a3091f7509
commit 2b086879cc
138 changed files with 459 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@@ -320,6 +320,7 @@ BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
CACHE_PREFIX=firefly
PUSHER_KEY=
IPINFO_TOKEN=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=

132
app/Exceptions/Handler.php
View File

@@ -32,6 +32,7 @@ use FireflyIII\Jobs\MailError;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Validation\ValidationException as LaravelValidationException;
use League\OAuth2\Server\Exception\OAuthServerException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -44,33 +45,42 @@ use Throwable;
*/
class Handler extends ExceptionHandler
{
/**
* @var array
*/
protected $dontReport
= [
AuthenticationException::class,
LaravelValidationException::class,
];
/**
* Render an exception into an HTTP response.
*
* @param Request $request
* @param Exception $exception
* @param Throwable $e
*
* @return mixed
*/
public function render($request, Throwable $exception)
public function render($request, Throwable $e)
{
if ($exception instanceof LaravelValidationException && $request->expectsJson()) {
if ($e instanceof LaravelValidationException && $request->expectsJson()) {
// ignore it: controller will handle it.
return parent::render($request, $exception);
return parent::render($request, $e);
}
if ($exception instanceof NotFoundHttpException && $request->expectsJson()) {
if ($e instanceof NotFoundHttpException && $request->expectsJson()) {
// JSON error:
return response()->json(['message' => 'Resource not found', 'exception' => 'NotFoundHttpException'], 404);
}
if ($exception instanceof AuthenticationException && $request->expectsJson()) {
if ($e instanceof AuthenticationException && $request->expectsJson()) {
// somehow Laravel handler does not catch this:
return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401);
}
if ($exception instanceof OAuthServerException && $request->expectsJson()) {
if ($e instanceof OAuthServerException && $request->expectsJson()) {
// somehow Laravel handler does not catch this:
return response()->json(['message' => $exception->getMessage(), 'exception' => 'OAuthServerException'], 401);
return response()->json(['message' => $e->getMessage(), 'exception' => 'OAuthServerException'], 401);
}
if ($request->expectsJson()) {
@@ -78,33 +88,33 @@ class Handler extends ExceptionHandler
if ($isDebug) {
return response()->json(
[
'message' => $exception->getMessage(),
'exception' => get_class($exception),
'line' => $exception->getLine(),
'file' => $exception->getFile(),
'trace' => $exception->getTrace(),
'message' => $e->getMessage(),
'exception' => get_class($e),
'line' => $e->getLine(),
'file' => $e->getFile(),
'trace' => $e->getTrace(),
],
500
);
}
return response()->json(
['message' => sprintf('Internal Firefly III Exception: %s', $exception->getMessage()), 'exception' => get_class($exception)], 500
['message' => sprintf('Internal Firefly III Exception: %s', $e->getMessage()), 'exception' => get_class($e)], 500
);
}
if ($exception instanceof NotFoundHttpException) {
if ($e instanceof NotFoundHttpException) {
$handler = app(GracefulNotFoundHandler::class);
return $handler->render($request, $exception);
return $handler->render($request, $e);
}
if ($exception instanceof FireflyException || $exception instanceof ErrorException || $exception instanceof OAuthServerException) {
if ($e instanceof FireflyException || $e instanceof ErrorException || $e instanceof OAuthServerException) {
$isDebug = config('app.debug');
return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500);
return response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500);
}
return parent::render($request, $exception);
return parent::render($request, $e);
}
/**
@@ -112,49 +122,63 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry etc.
*
* // it's five its fine.
*
* @param Exception $exception
* @param Throwable $e
*
* @return void
* @throws Exception
* @throws Throwable
*
*/
public function report(Throwable $exception)
public function report(Throwable $e)
{
$doMailError = config('firefly.send_error_message');
// if the user wants us to mail:
if (true === $doMailError
// and if is one of these error instances
&& ($exception instanceof FireflyException || $exception instanceof ErrorException)) {
$userData = [
'id' => 0,
'email' => 'unknown@example.com',
];
if (auth()->check()) {
$userData['id'] = auth()->user()->id;
$userData['email'] = auth()->user()->email;
}
$data = [
'class' => get_class($exception),
'errorMessage' => $exception->getMessage(),
'time' => date('r'),
'stackTrace' => $exception->getTraceAsString(),
'file' => $exception->getFile(),
'line' => $exception->getLine(),
'code' => $exception->getCode(),
'version' => config('firefly.version'),
'url' => request()->fullUrl(),
'userAgent' => request()->userAgent(),
'json' => request()->acceptsJson(),
];
if ($this->shouldntReportLocal($e) || !$doMailError) {
parent::report($e);
// create job that will mail.
$ipAddress = request()->ip() ?? '0.0.0.0';
$job = new MailError($userData, (string)config('firefly.site_owner'), $ipAddress, $data);
dispatch($job);
return;
}
$userData = [
'id' => 0,
'email' => 'unknown@example.com',
];
if (auth()->check()) {
$userData['id'] = auth()->user()->id;
$userData['email'] = auth()->user()->email;
}
$data = [
'class' => get_class($e),
'errorMessage' => $e->getMessage(),
'time' => date('r'),
'stackTrace' => $e->getTraceAsString(),
'file' => $e->getFile(),
'line' => $e->getLine(),
'code' => $e->getCode(),
'version' => config('firefly.version'),
'url' => request()->fullUrl(),
'userAgent' => request()->userAgent(),
'json' => request()->acceptsJson(),
];
parent::report($exception);
// create job that will mail.
$ipAddress = request()->ip() ?? '0.0.0.0';
$job = new MailError($userData, (string)config('firefly.site_owner'), $ipAddress, $data);
dispatch($job);
parent::report($e);
}
/**
* @param Throwable $e
*
* @return bool
*/
private function shouldntReportLocal(Throwable $e): bool
{
return !is_null(
Arr::first(
$this->dontReport, function ($type) use ($e) {
return $e instanceof $type;
}
)
);
}
}

2
app/Http/Controllers/Bill/IndexController.php
View File

@@ -116,7 +116,7 @@ class IndexController extends Controller
}
$current = $array['pay_dates'][0] ?? null;
if (null !== $current && !$nextExpectedMatch->isToday()) {
$currentExpectedMatch = Carbon::createFromFormat('!Y-m-d', $current);
$currentExpectedMatch = Carbon::createFromFormat(Carbon::ATOM, $current);
$array['next_expected_match_diff'] = $currentExpectedMatch->diffForHumans(today(), Carbon::DIFF_RELATIVE_TO_NOW);
}

11
app/Jobs/MailError.php
View File

@@ -72,11 +72,12 @@ class MailError extends Job implements ShouldQueue
*/
public function handle()
{
$email = config('firefly.site_owner');
$args = $this->exception;
$args['loggedIn'] = $this->userData['id'] > 0;
$args['user'] = $this->userData;
$args['ipAddress'] = $this->ipAddress;
$email = config('firefly.site_owner');
$args = $this->exception;
$args['loggedIn'] = $this->userData['id'] > 0;
$args['user'] = $this->userData;
$args['ip'] = $this->ipAddress;
$args['token'] = config('firefly.ipinfo_token');
if ($this->attempts() < 3) {
try {
Mail::send(

2
app/Mail/AccessTokenCreatedMail.php
View File

@@ -61,7 +61,7 @@ class AccessTokenCreatedMail extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.access-token-created-html')->text('v1.emails.access-token-created-text')
return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text')
->subject((string)trans('email.access_token_created_subject'));
}
}

2
app/Mail/AdminTestMail.php
View File

@@ -61,7 +61,7 @@ class AdminTestMail extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.admin-test-html')->text('v1.emails.admin-test-text')
return $this->view('emails.admin-test-html')->text('emails.admin-test-text')
->subject((string)trans('email.admin_test_subject'));
}
}

2
app/Mail/ConfirmEmailChangeMail.php
View File

@@ -69,7 +69,7 @@ class ConfirmEmailChangeMail extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.confirm-email-change-html')->text('v1.emails.confirm-email-change-text')
return $this->view('emails.confirm-email-change-html')->text('emails.confirm-email-change-text')
->subject((string)trans('email.email_change_subject'));
}
}

2
app/Mail/NewIPAddressWarningMail.php
View File

@@ -64,7 +64,7 @@ class NewIPAddressWarningMail extends Mailable
$this->host = $hostName;
}
return $this->view('v1.emails.new-ip-html')->text('v1.emails.new-ip-text')
return $this->view('emails.new-ip-html')->text('emails.new-ip-text')
->subject((string)trans('email.login_from_new_ip'));
}
}

2
app/Mail/OAuthTokenCreatedMail.php
View File

@@ -65,7 +65,7 @@ class OAuthTokenCreatedMail extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.oauth-client-created-html')->text('v1.emails.oauth-client-created-text')
return $this->view('emails.oauth-client-created-html')->text('emails.oauth-client-created-text')
->subject((string)trans('email.oauth_created_subject'));
}
}

2
app/Mail/RegisteredUser.php
View File

@@ -62,6 +62,6 @@ class RegisteredUser extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.registered-html')->text('v1.emails.registered-text')->subject((string)trans('email.registered_subject'));
return $this->view('emails.registered-html')->text('emails.registered-text')->subject((string)trans('email.registered_subject'));
}
}

2
app/Mail/ReportNewJournalsMail.php
View File

@@ -68,7 +68,7 @@ class ReportNewJournalsMail extends Mailable
{
$this->transform();
return $this->view('v1.emails.report-new-journals-html')->text('v1.emails.report-new-journals-text')
return $this->view('emails.report-new-journals-html')->text('emails.report-new-journals-text')
->subject((string)trans_choice('email.new_journals_subject', $this->groups->count()));
}

2
app/Mail/RequestedNewPassword.php
View File

@@ -61,6 +61,6 @@ class RequestedNewPassword extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.password-html')->text('v1.emails.password-text')->subject((string)trans('email.reset_pw_subject'));
return $this->view('emails.password-html')->text('emails.password-text')->subject((string)trans('email.reset_pw_subject'));
}
}

2
app/Mail/UndoEmailChangeMail.php
View File

@@ -67,7 +67,7 @@ class UndoEmailChangeMail extends Mailable
*/
public function build(): self
{
return $this->view('v1.emails.undo-email-change-html')->text('v1.emails.undo-email-change-text')
return $this->view('emails.undo-email-change-html')->text('emails.undo-email-change-text')
->subject((string)trans('email.email_change_subject'));
}
}

3
app/Repositories/Budget/BudgetRepository.php
View File

@@ -396,10 +396,11 @@ class BudgetRepository implements BudgetRepositoryInterface
{
Log::debug('Now in update()');
// TODO update rules
$oldName = $budget->name;
if (array_key_exists('name', $data)) {
$budget->name = $data['name'];
$this->updateRuleActions($oldName, $budget->name);
$this->updateRuleTriggers($oldName, $budget->name);
}
if (array_key_exists('active', $data)) {
$budget->active = $data['active'];

14
app/Services/Internal/Update/AccountUpdateService.php
View File

@@ -320,18 +320,4 @@ class AccountUpdateService
}
Log::debug('Account was not marked as inactive, do nothing.');
}
/**
* @param string $type
*
* @return bool
*/
private function isLiabilityType(string $type): bool
{
if ('' === $type) {
return false;
}
return 1 === AccountType::whereIn('type', [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE])->where('type', ucfirst($type))->count();
}
}

10
changelog.md
View File

@@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## Unreleased
## 5.5.2 (API 1.5.1) 2021-04-03
## 5.5.3 (API 1.5.1) 2021-04-03
### Changed
- Upgraded the render engine for the frontend.
@@ -31,6 +31,10 @@ This release features an update API version. Check out [the difference](https://
- All endpoints that used to deliver dates (`2021-04-27`) will now deliver date time strings (`2021-04-27T16:43:12+02:00`).
- [Issue 4566](https://github.com/firefly-iii/firefly-iii/issues/4566) Some API end points did not deliver the promised data.
## 5.5.2
Skipped.
## 5.5.1 (API 1.5.0) 2021-03-27
### Added
@@ -96,6 +100,10 @@ This release features an update API version. Check out [the difference](https://
- [Issue 4435](https://github.com/firefly-iii/firefly-iii/issues/4435) Storing piggy banks with object group information would fail.
- Users can submit almost any field without other fields changing as well.
## 5.5.0
Skipped.
## 5.4.6 (API 1.4.0) - 2020-10-07
### Added

3
config/firefly.php
View File

@@ -99,7 +99,7 @@ return [
'webhooks' => false,
],
'version' => '5.5.2',
'version' => '5.5.3',
'api_version' => '1.5.1',
'db_version' => 16,
'maxUploadSize' => 1073741824, // 1 GB
@@ -123,6 +123,7 @@ return [
'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
'custom_logout_uri' => envNonEmpty('CUSTOM_LOGOUT_URI', ''),
'cer_provider' => envNonEmpty('CER_PROVIDER', 'fixer'),
'ipinfo_token' => env('IPINFO_TOKEN',''),
'update_endpoint' => 'https://version.firefly-iii.org/index.json',
'send_telemetry' => env('SEND_TELEMETRY', false),
'allow_webhooks' => env('ALLOW_WEBHOOKS', false),

1
frontend/mix-manifest.json
View File

@@ -4,6 +4,7 @@
"/public/js/accounts/show.js": "/public/js/accounts/show.js",
"/public/js/transactions/create.js": "/public/js/transactions/create.js",
"/public/js/transactions/edit.js": "/public/js/transactions/edit.js",
"/public/js/transactions/index.js": "/public/js/transactions/index.js",
"/public/js/empty.js": "/public/js/empty.js",
"/public/js/register.js": "/public/js/register.js",
"/public/js/manifest.js": "/public/js/manifest.js",

8
frontend/src/components/dashboard/BudgetListGroup.vue
View File

@@ -25,6 +25,14 @@
</div>
<div class="card-body table-responsive p-0">
<table class="table table-sm">
<caption style="display:none;">{{ title }}</caption>
<thead>
<tr>
<th scope="col">{{ $t('firefly.budget') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
<th scope="col">{{ $t('firefly.left') }}</th>
</tr>
</thead>
<tbody>
<BudgetLimitRow v-for="(budgetLimit, key) in budgetLimits" v-bind:key="key" :budgetLimit="budgetLimit"/>
<BudgetRow v-for="(budget, key) in budgets" v-bind:key="key" :budget="budget"/>

20
frontend/src/components/dashboard/MainAccountList.vue
View File

@@ -100,7 +100,7 @@ export default {
]),
'datesReady': function () {
return null !== this.start && null !== this.end && this.ready;
}
},
},
watch: {
datesReady: function (value) {
@@ -137,7 +137,8 @@ export default {
id: accountIds[key],
title: '',
url: '',
current_balance: '',
include: false,
current_balance: '0',
currency_code: 'EUR',
transactions: []
});
@@ -148,12 +149,15 @@ export default {
loadSingleAccount(key, accountId) {
axios.get('./api/v1/accounts/' + accountId)
.then(response => {
this.accounts[key].title = response.data.data.attributes.name;
this.accounts[key].url = './accounts/show/' + response.data.data.id;
this.accounts[key].current_balance = response.data.data.attributes.current_balance;
this.accounts[key].currency_code = response.data.data.attributes.currency_code;
this.loadTransactions(key, accountId);
let account = response.data.data;
if ('asset' === account.attributes.type || 'liabilities' === account.attributes.type) {
this.accounts[key].title = account.attributes.name;
this.accounts[key].url = './accounts/show/' + account.id;
this.accounts[key].current_balance = account.attributes.current_balance;
this.accounts[key].currency_code = account.attributes.currency_code;
this.accounts[key].include = true;
this.loadTransactions(key, accountId);
}
}
);
},

7
frontend/src/components/dashboard/MainCategoryList.vue
View File

@@ -38,6 +38,13 @@
<!-- body if normal -->
<div v-if="!loading && !error" class="card-body table-responsive p-0">
<table class="table table-sm">
<caption style="display:none;">{{ $t('firefly.categories') }}</caption>
<thead>
<tr>
<th scope="col">{{ $t('firefly.category') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
</tr>
</thead>
<tbody>
<tr v-for="category in sortedList">
<td style="width:20%;">

7
frontend/src/components/dashboard/MainCreditList.vue
View File

@@ -38,6 +38,13 @@
<!-- body if normal -->
<div v-if="!loading && !error" class="card-body table-responsive p-0">
<table class="table table-sm">
<caption style="display:none;">{{ $t('firefly.revenue_accounts') }}</caption>
<thead>
<tr>
<th scope="col">{{ $t('firefly.category') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
</tr>
</thead>
<tbody>
<tr v-for="entry in income">
<td style="width:20%;"><a :href="'./accounts/show/' + entry.id">{{ entry.name }}</a></td>

7
frontend/src/components/dashboard/MainDebitList.vue
View File

@@ -38,6 +38,13 @@
<!-- body if normal -->
<div v-if="!loading && !error" class="card-body table-responsive p-0">
<table class="table table-sm">
<caption style="display:none;">{{ $t('firefly.expense_accounts') }}</caption>
<thead>
<tr>
<th scope="col">{{ $t('firefly.category') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
</tr>
</thead>
<tbody>
<tr v-for="entry in expenses">
<td style="width:20%;"><a :href="'./accounts/show/' + entry.id">{{ entry.name }}</a></td>

33
frontend/src/components/transactions/Index.vue Normal file
View File

@@ -0,0 +1,33 @@
<!--
- Index.vue
- Copyright (c) 2021 james@firefly-iii.org
-
- This file is part of Firefly III (https://github.com/firefly-iii).
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<template>
<div>Hello</div>
</template>
<script>
export default {
name: "Index"
}
</script>
<style scoped>
</style>

2
frontend/src/components/transactions/SplitForm.vue
View File

@@ -56,6 +56,7 @@
:errors="transaction.errors.source"
:index="index"
:source-allowed-types="sourceAllowedTypes"
:transaction-type="transactionType"
direction="source"
/>
</div>
@@ -79,6 +80,7 @@
:destination-allowed-types="destinationAllowedTypes"
:errors="transaction.errors.destination"
:index="index"
:transaction-type="transactionType"
:source-allowed-types="sourceAllowedTypes"
direction="destination"
/>

14
frontend/src/components/transactions/TransactionAccount.vue
View File

@@ -96,6 +96,10 @@ export default {
type: Object,
default: () => ({})
},
transactionType: {
type: String,
default: 'any'
},
},
data() {
return {
@@ -234,10 +238,6 @@ export default {
}
},
computed: {
// 'transactionType',
// 'sourceAllowedTypes',
// 'destinationAllowedTypes',
// 'allowedOpposingTypes'
accountKey: {
get() {
return 'source' === this.direction ? 'source_account' : 'destination_account';
@@ -249,11 +249,13 @@ export default {
if (0 === this.index) {
return true;
}
// console.log('Direction of account ' + this.index + ' is ' + this.direction + '(' + this.transactionType + ')');
// console.log(this.transactionType);
if ('source' === this.direction) {
return 'any' === this.transactionType || 'Deposit' === this.transactionType
return 'any' === this.transactionType || 'Deposit' === this.transactionType || typeof this.transactionType === 'undefined';
}
if ('destination' === this.direction) {
return 'any' === this.transactionType || 'Withdrawal' === this.transactionType;
return 'any' === this.transactionType || 'Withdrawal' === this.transactionType || typeof this.transactionType === 'undefined';
}
return false;
}

21
frontend/src/components/transactions/TransactionDate.vue
View File

@@ -66,7 +66,8 @@ export default {
return {
localDate: this.date,
localTime: this.time,
timeZone: ''
timeZone: '',
timeString: '',
}
},
methods: {},
@@ -98,6 +99,7 @@ export default {
// console.log('Time is: ' + localStr);
return localStr;
}
// console.log('Return empty string!');
return '';
},
set(value) {
@@ -115,9 +117,20 @@ export default {
let parts = value.split(':');
// console.log('Parts are:');
// console.log(parts);
current.setHours(parseInt(parts[0] ?? 0));
current.setMinutes(parseInt(parts[1] ?? 0));
current.setSeconds(parseInt(parts[2] ?? 0));
let hrs = parts[0] ?? '0';
let min = parts[1] ?? '0';
let sec = parts[2] ?? '0';
hrs = 3 === hrs.length ? hrs.substr(1, 2) : hrs;
min = 3 === min.length ? min.substr(1, 2) : min;
sec = 3 === sec.length ? sec.substr(1, 2) : sec;
// console.log('Hrs: ' + hrs);
// console.log('Min: ' + min);
// console.log('Sec: ' + sec);
current.setHours(parseInt(hrs));
current.setMinutes(parseInt(min));
current.setSeconds(parseInt(sec));
this.localTime = current;
this.$emit('set-time', {time: this.localTime});
}

7
frontend/src/components/transactions/TransactionLinks.vue
View File

@@ -105,12 +105,13 @@
<div class="row">
<div class="col">
<span v-if="searching"><i class="fas fa-spinner fa-spin"></i></span>
<h4 v-if="searchResults.length > 0">Search results</h4>
<h4 v-if="searchResults.length > 0">{{ $t('firefly.search_results') }}</h4>
<table v-if="searchResults.length > 0" class="table table-sm">
<caption style="display:none;">{{ $t('firefly.search_results') }}</caption>
<thead>
<tr>
<th colspan="2" style="width:33%">Include?</th>
<th>Transaction</th>
<th scope="col" colspan="2" style="width:33%">{{ $t('firefly.include') }}</th>
<th scope="col">{{ $t('firefly.transaction') }}</th>
</tr>
</thead>
<tbody>

5
frontend/src/locales/bg.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "\u041a\u0430\u0441\u0438\u0447\u043a\u0438",
"piggy_bank": "\u041a\u0430\u0441\u0438\u0447\u043a\u0430",
"amounts": "\u0421\u0443\u043c\u0438",
"left": "\u041e\u0441\u0442\u0430\u043d\u0430\u043b\u0438",
"spent": "\u041f\u043e\u0445\u0430\u0440\u0447\u0435\u043d\u0438",
"Default asset account": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0430\u043a\u0442\u0438\u0432\u0438 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
"search_results": "\u0420\u0435\u0437\u0443\u043b\u0442\u0430\u0442\u0438 \u043e\u0442 \u0442\u044a\u0440\u0441\u0435\u043d\u0435\u0442\u043e",
"include": "Include?",
"transaction": "\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f",
"account_role_defaultAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0430\u043a\u0442\u0438\u0432\u0438 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
"account_role_savingAsset": "\u0421\u043f\u0435\u0441\u0442\u043e\u0432\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430",
"account_role_sharedAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u0430\u043a\u0442\u0438\u0432\u0438",

5
frontend/src/locales/cs.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Pokladni\u010dky",
"piggy_bank": "Pokladni\u010dka",
"amounts": "Amounts",
"left": "Zb\u00fdv\u00e1",
"spent": "Utraceno",
"Default asset account": "V\u00fdchoz\u00ed \u00fa\u010det s aktivy",
"search_results": "V\u00fdsledky hled\u00e1n\u00ed",
"include": "Include?",
"transaction": "Transakce",
"account_role_defaultAsset": "V\u00fdchoz\u00ed \u00fa\u010det aktiv",
"account_role_savingAsset": "Spo\u0159ic\u00ed \u00fa\u010det",
"account_role_sharedAsset": "Sd\u00edlen\u00fd \u00fa\u010det aktiv",

5
frontend/src/locales/de.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Sparschweine",
"piggy_bank": "Sparschwein",
"amounts": "Betr\u00e4ge",
"left": "\u00dcbrig",
"spent": "Ausgegeben",
"Default asset account": "Standard-Bestandskonto",
"search_results": "Suchergebnisse",
"include": "Inbegriffen?",
"transaction": "\u00dcberweisung",
"account_role_defaultAsset": "Standard-Bestandskonto",
"account_role_savingAsset": "Sparkonto",
"account_role_sharedAsset": "Gemeinsames Bestandskonto",

5
frontend/src/locales/el.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "\u039a\u03bf\u03c5\u03bc\u03c0\u03b1\u03c1\u03ac\u03b4\u03b5\u03c2",
"piggy_bank": "\u039a\u03bf\u03c5\u03bc\u03c0\u03b1\u03c1\u03ac\u03c2",
"amounts": "\u03a0\u03bf\u03c3\u03ac",
"left": "\u0391\u03c0\u03bf\u03bc\u03ad\u03bd\u03bf\u03c5\u03bd",
"spent": "\u0394\u03b1\u03c0\u03b1\u03bd\u03ae\u03b8\u03b7\u03ba\u03b1\u03bd",
"Default asset account": "\u0392\u03b1\u03c3\u03b9\u03ba\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
"search_results": "\u0391\u03c0\u03bf\u03c4\u03b5\u03bb\u03ad\u03c3\u03bc\u03b1\u03c4\u03b1 \u03b1\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7\u03c2",
"include": "Include?",
"transaction": "\u03a3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae",
"account_role_defaultAsset": "\u0392\u03b1\u03c3\u03b9\u03ba\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
"account_role_savingAsset": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03b1\u03c0\u03bf\u03c4\u03b1\u03bc\u03af\u03b5\u03c5\u03c3\u03b7\u03c2",
"account_role_sharedAsset": "\u039a\u03bf\u03b9\u03bd\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",

5
frontend/src/locales/en-gb.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Piggy banks",
"piggy_bank": "Piggy bank",
"amounts": "Amounts",
"left": "Left",
"spent": "Spent",
"Default asset account": "Default asset account",
"search_results": "Search results",
"include": "Include?",
"transaction": "Transaction",
"account_role_defaultAsset": "Default asset account",
"account_role_savingAsset": "Savings account",
"account_role_sharedAsset": "Shared asset account",

5
frontend/src/locales/en.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Piggy banks",
"piggy_bank": "Piggy bank",
"amounts": "Amounts",
"left": "Left",
"spent": "Spent",
"Default asset account": "Default asset account",
"search_results": "Search results",
"include": "Include?",
"transaction": "Transaction",
"account_role_defaultAsset": "Default asset account",
"account_role_savingAsset": "Savings account",
"account_role_sharedAsset": "Shared asset account",

5
frontend/src/locales/es.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Huchas",
"piggy_bank": "Hucha",
"amounts": "Importes",
"left": "Disponible",
"spent": "Gastado",
"Default asset account": "Cuenta de ingresos por defecto",
"search_results": "Buscar resultados",
"include": "Include?",
"transaction": "Transaccion",
"account_role_defaultAsset": "Cuentas de ingresos por defecto",
"account_role_savingAsset": "Cuentas de ahorros",
"account_role_sharedAsset": "Cuenta de ingresos compartida",

5
frontend/src/locales/fi.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "S\u00e4\u00e4st\u00f6possut",
"piggy_bank": "S\u00e4\u00e4st\u00f6possu",
"amounts": "Amounts",
"left": "J\u00e4ljell\u00e4",
"spent": "K\u00e4ytetty",
"Default asset account": "Oletusomaisuustili",
"search_results": "Haun tulokset",
"include": "Include?",
"transaction": "Tapahtuma",
"account_role_defaultAsset": "Oletusk\u00e4ytt\u00f6tili",
"account_role_savingAsset": "S\u00e4\u00e4st\u00f6tili",
"account_role_sharedAsset": "Jaettu k\u00e4ytt\u00f6tili",

7
frontend/src/locales/fr.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Tirelires",
"piggy_bank": "Tirelire",
"amounts": "Montants",
"left": "Reste",
"spent": "D\u00e9pens\u00e9",
"Default asset account": "Compte d\u2019actif par d\u00e9faut",
"search_results": "R\u00e9sultats de la recherche",
"include": "Inclure ?",
"transaction": "Op\u00e9ration",
"account_role_defaultAsset": "Compte d'actif par d\u00e9faut",
"account_role_savingAsset": "Compte d\u2019\u00e9pargne",
"account_role_sharedAsset": "Compte d'actif partag\u00e9",
@@ -78,7 +83,7 @@
"create_another": "Apr\u00e8s enregistrement, revenir ici pour en cr\u00e9er un nouveau.",
"update_transaction": "Mettre \u00e0 jour l'op\u00e9ration",
"after_update_create_another": "Apr\u00e8s la mise \u00e0 jour, revenir ici pour continuer l'\u00e9dition.",
"transaction_updated_no_changes": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> (\"{title}\") did not receive any changes.",
"transaction_updated_no_changes": "<a href=\"transactions\/show\/{ID}\">L'op\u00e9ration n\u00b0{ID}<\/a> (\"{title}\") n'a pas \u00e9t\u00e9 modifi\u00e9e.",
"transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">L'op\u00e9ration n\u00b0{ID}<\/a> (\"{title}\") a \u00e9t\u00e9 mise \u00e0 jour.",
"spent_x_of_y": "D\u00e9pens\u00e9 {amount} sur {total}",
"search": "Rechercher",

5
frontend/src/locales/hu.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Malacperselyek",
"piggy_bank": "Malacpersely",
"amounts": "Mennyis\u00e9gek",
"left": "Maradv\u00e1ny",
"spent": "Elk\u00f6lt\u00f6tt",
"Default asset account": "Alap\u00e9rtelmezett eszk\u00f6zsz\u00e1mla",
"search_results": "Keres\u00e9si eredm\u00e9nyek",
"include": "Include?",
"transaction": "Tranzakci\u00f3",
"account_role_defaultAsset": "Alap\u00e9rtelmezett eszk\u00f6zsz\u00e1mla",
"account_role_savingAsset": "Megtakar\u00edt\u00e1si sz\u00e1mla",
"account_role_sharedAsset": "Megosztott eszk\u00f6zsz\u00e1mla",

5
frontend/src/locales/it.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Salvadanai",
"piggy_bank": "Salvadanaio",
"amounts": "Importi",
"left": "Resto",
"spent": "Speso",
"Default asset account": "Conto attivit\u00e0 predefinito",
"search_results": "Risultati ricerca",
"include": "Includere?",
"transaction": "Transazione",
"account_role_defaultAsset": "Conto attivit\u00e0 predefinito",
"account_role_savingAsset": "Conto risparmio",
"account_role_sharedAsset": "Conto attivit\u00e0 condiviso",

5
frontend/src/locales/nb.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Sparegriser",
"piggy_bank": "Sparegris",
"amounts": "Amounts",
"left": "Gjenv\u00e6rende",
"spent": "Brukt",
"Default asset account": "Standard aktivakonto",
"search_results": "S\u00f8keresultater",
"include": "Include?",
"transaction": "Transaksjon",
"account_role_defaultAsset": "Standard aktivakonto",
"account_role_savingAsset": "Sparekonto",
"account_role_sharedAsset": "Delt aktivakonto",

5
frontend/src/locales/nl.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Spaarpotjes",
"piggy_bank": "Spaarpotje",
"amounts": "Bedragen",
"left": "Over",
"spent": "Uitgegeven",
"Default asset account": "Standaard betaalrekening",
"search_results": "Zoekresultaten",
"include": "Opnemen?",
"transaction": "Transactie",
"account_role_defaultAsset": "Standaard betaalrekening",
"account_role_savingAsset": "Spaarrekening",
"account_role_sharedAsset": "Gedeelde betaalrekening",

5
frontend/src/locales/pl.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Skarbonki",
"piggy_bank": "Skarbonka",
"amounts": "Kwoty",
"left": "Pozosta\u0142o",
"spent": "Wydano",
"Default asset account": "Domy\u015blne konto aktyw\u00f3w",
"search_results": "Wyniki wyszukiwania",
"include": "Include?",
"transaction": "Transakcja",
"account_role_defaultAsset": "Domy\u015blne konto aktyw\u00f3w",
"account_role_savingAsset": "Konto oszcz\u0119dno\u015bciowe",
"account_role_sharedAsset": "Wsp\u00f3\u0142dzielone konto aktyw\u00f3w",

5
frontend/src/locales/pt-br.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Cofrinhos",
"piggy_bank": "Cofrinho",
"amounts": "Quantias",
"left": "Restante",
"spent": "Gasto",
"Default asset account": "Conta padr\u00e3o",
"search_results": "Resultados da pesquisa",
"include": "Incluir?",
"transaction": "Transa\u00e7\u00e3o",
"account_role_defaultAsset": "Conta padr\u00e3o",
"account_role_savingAsset": "Conta poupan\u00e7a",
"account_role_sharedAsset": "Contas de ativos compartilhadas",

5
frontend/src/locales/pt.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Mealheiros",
"piggy_bank": "Mealheiro",
"amounts": "Montantes",
"left": "Em falta",
"spent": "Gasto",
"Default asset account": "Conta de activos padr\u00e3o",
"search_results": "Resultados da pesquisa",
"include": "Include?",
"transaction": "Transac\u00e7\u00e3o",
"account_role_defaultAsset": "Conta de activos padr\u00e3o",
"account_role_savingAsset": "Conta poupan\u00e7a",
"account_role_sharedAsset": "Conta de activos partilhados",

5
frontend/src/locales/ro.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Pu\u0219culi\u021b\u0103",
"piggy_bank": "Pu\u0219culi\u021b\u0103",
"amounts": "Amounts",
"left": "R\u0103mas",
"spent": "Cheltuit",
"Default asset account": "Cont de active implicit",
"search_results": "Rezultatele c\u0103utarii",
"include": "Include?",
"transaction": "Tranzac\u0163ie",
"account_role_defaultAsset": "Contul implicit activ",
"account_role_savingAsset": "Cont de economii",
"account_role_sharedAsset": "Contul de active partajat",

5
frontend/src/locales/ru.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "\u041a\u043e\u043f\u0438\u043b\u043a\u0438",
"piggy_bank": "\u041a\u043e\u043f\u0438\u043b\u043a\u0430",
"amounts": "\u0421\u0443\u043c\u043c\u0430",
"left": "\u041e\u0441\u0442\u0430\u043b\u043e\u0441\u044c",
"spent": "\u0420\u0430\u0441\u0445\u043e\u0434",
"Default asset account": "\u0421\u0447\u0451\u0442 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
"search_results": "\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u044b \u043f\u043e\u0438\u0441\u043a\u0430",
"include": "Include?",
"transaction": "\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f",
"account_role_defaultAsset": "\u0421\u0447\u0451\u0442 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
"account_role_savingAsset": "\u0421\u0431\u0435\u0440\u0435\u0433\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0441\u0447\u0435\u0442",
"account_role_sharedAsset": "\u041e\u0431\u0449\u0438\u0439 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0441\u0447\u0451\u0442",

5
frontend/src/locales/sk.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Pokladni\u010dky",
"piggy_bank": "Pokladni\u010dka",
"amounts": "Suma",
"left": "Zost\u00e1va",
"spent": "Utraten\u00e9",
"Default asset account": "Prednastaven\u00fd \u00fa\u010det akt\u00edv",
"search_results": "V\u00fdsledky vyh\u013ead\u00e1vania",
"include": "Include?",
"transaction": "Transakcia",
"account_role_defaultAsset": "Predvolen\u00fd \u00fa\u010det akt\u00edv",
"account_role_savingAsset": "\u0160etriaci \u00fa\u010det",
"account_role_sharedAsset": "Zdie\u013ean\u00fd \u00fa\u010det akt\u00edv",

5
frontend/src/locales/sv.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Spargrisar",
"piggy_bank": "Spargris",
"amounts": "Belopp",
"left": "\u00c5terst\u00e5r",
"spent": "Spenderat",
"Default asset account": "F\u00f6rvalt tillg\u00e5ngskonto",
"search_results": "S\u00f6kresultat",
"include": "Include?",
"transaction": "Transaktion",
"account_role_defaultAsset": "F\u00f6rvalt tillg\u00e5ngskonto",
"account_role_savingAsset": "Sparkonto",
"account_role_sharedAsset": "Delat tillg\u00e5ngskonto",

5
frontend/src/locales/vi.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "Heo \u0111\u1ea5t",
"piggy_bank": "Heo \u0111\u1ea5t",
"amounts": "Amounts",
"left": "C\u00f2n l\u1ea1i",
"spent": "\u0110\u00e3 chi",
"Default asset account": "M\u1eb7c \u0111\u1ecbnh t\u00e0i kho\u1ea3n",
"search_results": "K\u1ebft qu\u1ea3 t\u00ecm ki\u1ebfm",
"include": "Include?",
"transaction": "Giao d\u1ecbch",
"account_role_defaultAsset": "t\u00e0i kho\u1ea3n m\u1eb7c \u0111\u1ecbnh",
"account_role_savingAsset": "T\u00e0i kho\u1ea3n ti\u1ebft ki\u1ec7m",
"account_role_sharedAsset": "t\u00e0i kho\u1ea3n d\u00f9ng chung",

5
frontend/src/locales/zh-cn.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "\u5b58\u94b1\u7f50",
"piggy_bank": "\u5b58\u94b1\u7f50",
"amounts": "\u91d1\u989d",
"left": "\u5269\u4f59",
"spent": "\u652f\u51fa",
"Default asset account": "\u9ed8\u8ba4\u8d44\u4ea7\u8d26\u6237",
"search_results": "\u641c\u7d22\u7ed3\u679c",
"include": "Include?",
"transaction": "\u4ea4\u6613",
"account_role_defaultAsset": "\u9ed8\u8ba4\u8d44\u4ea7\u8d26\u6237",
"account_role_savingAsset": "\u50a8\u84c4\u8d26\u6237",
"account_role_sharedAsset": "\u5171\u7528\u8d44\u4ea7\u8d26\u6237",

5
frontend/src/locales/zh-tw.json
View File

@@ -54,7 +54,12 @@
"piggy_banks": "\u5c0f\u8c6c\u64b2\u6eff",
"piggy_bank": "\u5c0f\u8c6c\u64b2\u6eff",
"amounts": "Amounts",
"left": "\u5269\u9918",
"spent": "\u652f\u51fa",
"Default asset account": "\u9810\u8a2d\u8cc7\u7522\u5e33\u6236",
"search_results": "\u641c\u5c0b\u7d50\u679c",
"include": "Include?",
"transaction": "\u4ea4\u6613",
"account_role_defaultAsset": "\u9810\u8a2d\u8cc7\u7522\u5e33\u6236",
"account_role_savingAsset": "\u5132\u84c4\u5e33\u6236",
"account_role_sharedAsset": "\u5171\u7528\u8cc7\u7522\u5e33\u6236",

42
frontend/src/pages/transactions/index.js vendored Normal file
View File

@@ -0,0 +1,42 @@
/*
* index.js
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import Vue from "vue";
import store from "../../components/store";
import Index from "../../components/transactions/Index";
require('../../bootstrap');
// i18n
let i18n = require('../../i18n');
let props = {};
new Vue({
i18n,
store,
render(createElement) {
return createElement(Index, {props: props});
},
beforeCreate() {
this.$store.commit('initialiseStore');
//this.$store.dispatch('updateCurrencyPreference');
},
}).$mount('#transactions_index');

1
frontend/webpack.mix.js vendored
View File

@@ -53,6 +53,7 @@ mix.js('src/pages/accounts/show.js', 'public/js/accounts').vue({version: 2});
// transactions.
mix.js('src/pages/transactions/create.js', 'public/js/transactions').vue({version: 2});
mix.js('src/pages/transactions/edit.js', 'public/js/transactions').vue({version: 2});
mix.js('src/pages/transactions/index.js', 'public/js/transactions').vue({version: 2});
// static pages
mix.js('src/pages/empty.js', 'public/js').vue({version: 2});

2
public/v2/js/accounts/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/show.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/dashboard.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/dashboard.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/create.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/edit.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/edit.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/index.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

1
public/v2/js/transactions/index.js.map Executable file
View File

File diff suppressed because one or more lines are too long

1
resources/lang/bg_BG/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Приложете правило ":title" към селекция от вашите транзакции',
'apply_rule_selection_intro' => 'Правила като ":title" обикновено се прилагат само за нови или актуализирани транзакции, но можете да кажете на Firefly III да го стартира върху селекция от вашите съществуващи транзакции. Това може да бъде полезно, когато сте актуализирали правило и се нуждаете промените, да се отразят на всички останали транзакции.',
'include_transactions_from_accounts' => 'Включете транзакции от тези сметки',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Изпълни',
'apply_rule_group_selection' => 'Приложете групата правила ":title" към селекция от вашите транзакции',

1
resources/lang/cs_CZ/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Uplatnit pravidlo „:title“ na vybrané transakce',
'apply_rule_selection_intro' => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
'include_transactions_from_accounts' => 'Zahrnout transakce z těchto účtů',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Vykonat',
'apply_rule_group_selection' => 'Uplatnit skupinu pravidel „:title“ na vybrané transakce',

1
resources/lang/de_DE/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Regel „:title” auf eine Auswahl Ihrer Buchungen anwenden',
'apply_rule_selection_intro' => 'Regeln wie „:title” werden im Normalfall nur auf neue oder aktualisierte Buchungen angewandt. Sie können die Regel aber auch auf eine Auswahl Ihrer bestehenden Buchungen anwenden. Dies kann nützlich sein, wenn Sie eine Regel aktualisiert haben und Sie die Änderungen auf andere Buchungen übertragen möchten.',
'include_transactions_from_accounts' => 'Buchungen von diesem Konto einbeziehen',
'include' => 'Inbegriffen?',
'applied_rule_selection' => '{0} In Ihrer Auswahl wurden keine Buchungen durch die Regel „:title” geändert.|[1] In Ihrer Auswahl wurde eine Buchung durch die Regel „:title” geändert.|[2,*] In Ihrer Auswahl wurden :count Buchungen durch die Regel „:title” geändert.',
'execute' => 'Ausführen',
'apply_rule_group_selection' => 'Regelgruppe „:title” auf eine Auswahl Ihrer Buchungen anwenden',

1
resources/lang/el_GR/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Εφαρμογή του κανόνα ":title" σε μία επιλογή των συναλλαγών σας',
'apply_rule_selection_intro' => 'Κανόνες όπως ":title" εφαρμόζονται συνήθως σε νέες ή ενημερωμένες συναλλαγές, αλλά μπορείτε να πείτε στο Firefly ΙΙΙ να τους εκτελέσει σε μια επιλογή υπαρχόντων συναλλαγών. Αυτό μπορεί να είναι χρήσιμο όταν έχετε ενημερώσει έναν κανόνα και χρειάζεστε οι αλλαγές να εφαρμοστούν σε όλες τις άλλες συναλλαγές σας.',
'include_transactions_from_accounts' => 'Συμπερίληψη συναλλαγών από αυτούς τους λογαριασμούς',
'include' => 'Include?',
'applied_rule_selection' => '{0} Καμία συναλλαγή στην επιλογή σας δεν άλλαξε από τον κανόνα ":title".|[1] Μία συναλλαγή στην επιλογή σας άλλαξε από τον κανόνα ":title".|[2,*]:count συναλλαγές στην επιλογή σας άλλαξαν από τον κανόνα ":title".',
'execute' => 'Εκτέλεση',
'apply_rule_group_selection' => 'Εφαρμογή ομάδας κανόνων ":title" σε μία επιλογή των συναλλαγών σας',

1
resources/lang/en_GB/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Apply rule ":title" to a selection of your transactions',
'apply_rule_selection_intro' => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
'include_transactions_from_accounts' => 'Include transactions from these accounts',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Execute',
'apply_rule_group_selection' => 'Apply rule group ":title" to a selection of your transactions',

1
resources/lang/en_US/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Apply rule ":title" to a selection of your transactions',
'apply_rule_selection_intro' => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
'include_transactions_from_accounts' => 'Include transactions from these accounts',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Execute',
'apply_rule_group_selection' => 'Apply rule group ":title" to a selection of your transactions',

1
resources/lang/es_ES/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Aplique la regla ":title" a una seleccion de sus transacciones',
'apply_rule_selection_intro' => 'Las reglas como ":title" normalmente sólo se aplican a transacciones nuevas o actualizadas, pero puedes indicarle a Firefly III que las ejecute en una selección de transacciones existentes. Esto puede ser útil si has actualizado una regla y necesitas que los cambios se apliquen a todas tus otras transacciones.',
'include_transactions_from_accounts' => 'Introduzca transacciones desde estas cuentas',
'include' => 'Include?',
'applied_rule_selection' => '{0} Ninguna transacción en su selección fue cambiada por la regla ":title".|[1] Una transacción en su selección fue cambiada por la regla ":title".|[2,*] :count transacciones en su selección fueron cambiadas por la regla ":title".',
'execute' => 'Ejecutar',
'apply_rule_group_selection' => 'Aplique la regla de grupo ":title" a una selección de sus transacciones',

1
resources/lang/fi_FI/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Aja sääntö ":title" valitsemillesi tapahtumille',
'apply_rule_selection_intro' => 'Säännöt kuten ":title" ajetaan normaalisti ainoastaan uusille tai päivitetyille tapahtumille, mutta voit pyytää Firefly III:a ajamaan sen myös sinun valitsemillesi, jo olemassa oleville tapahtumille. Tämä voi olla kätevää kun päivität sääntöä ja haluat muutosten vaikuttavan jo olemassaoleviin tapahtumiin.',
'include_transactions_from_accounts' => 'Sisällytä tapahtumat näiltä tileiltä',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Suorita',
'apply_rule_group_selection' => 'Aja sääntöryhmä ":title" valituille tapahtumille',

3
resources/lang/fr_FR/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Appliquer la règle ":title" à une sélection de vos opérations',
'apply_rule_selection_intro' => 'Les règles comme ":title" ne s\'appliquent normalement qu\'aux opérations nouvelles ou mises à jour, mais vous pouvez dire à Firefly III de l’exécuter sur une sélection de vos opérations existantes. Cela peut être utile lorsque vous avez mis à jour une règle et avez besoin que les modifications soient appliquées à l’ensemble de vos autres opérations.',
'include_transactions_from_accounts' => 'Inclure les opérations depuis ces comptes',
'include' => 'Inclure ?',
'applied_rule_selection' => '{0} Aucune opération dans votre sélection n\'a été modifiée par la règle ":title".|[1] Une opération dans votre sélection a été modifiée par la règle ":title".|[2,*] :count opérations dans votre sélection ont été modifiées par la règle ":title".',
'execute' => 'Exécuter',
'apply_rule_group_selection' => 'Appliquer le groupe de règles ":title" à une sélection de vos opérations',
@@ -1241,7 +1242,7 @@ return [
'transaction_stored_link' => '<a href="transactions/show/{ID}">L\'opération n°{ID} ("{title}")</a> a été enregistrée.',
'transaction_new_stored_link' => '<a href="transactions/show/{ID}">L\'opération n°{ID}</a> a été enregistrée.',
'transaction_updated_link' => '<a href="transactions/show/{ID}">L\'opération n°{ID}</a> ("{title}") a été mise à jour.',
'transaction_updated_no_changes' => '<a href="transactions/show/{ID}">Transaction #{ID}</a> ("{title}") did not receive any changes.',
'transaction_updated_no_changes' => '<a href="transactions/show/{ID}">L\'opération n°{ID}</a> ("{title}") n\'a pas été modifiée.',
'first_split_decides' => 'La première ventilation détermine la valeur de ce champ',
'first_split_overrules_source' => 'La première ventilation peut remplacer le compte source',
'first_split_overrules_destination' => 'La première ventilation peut remplacer le compte de destination',

1
resources/lang/hu_HU/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => '":title" szabály alkalmazása a tranzakciók egy csoportján',
'apply_rule_selection_intro' => 'Az olyan szabályok mint a ":title" normális esetben csak az új vagy a frissített tranzakciókon lesznek alkalmazva, de meg lehet mondani a Firefly III-nak, hogy futtassa le a már létező tranzakciókon. Ez hasznos lehet, ha egy szabály frissítve lett és a módosításokat az összes tranzakción alkalmazni kell.',
'include_transactions_from_accounts' => 'Beleértve a tranzakciókat ezekből a számlákból',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Végrehajtás',
'apply_rule_group_selection' => '":title" szabálycsoport alkalmazása a tranzakciók egy csoportján',

1
resources/lang/id_ID/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Terapkan aturan ":title" untuk pilihan transaksi Anda',
'apply_rule_selection_intro' => 'Aturan seperti ":title" biasanya hanya diterapkan pada transaksi baru atau yang telah diperbarui, namun Anda bisa memberi tahu Firefly III untuk menjalankannya pada pilihan transaksi Anda yang ada. Ini bisa berguna bila Anda telah memperbarui peraturan dan Anda memerlukan perubahan yang akan diterapkan pada semua transaksi Anda yang lain.',
'include_transactions_from_accounts' => 'Sertakan transaksi dari akun ini',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Menjalankan',
'apply_rule_group_selection' => 'Terapkan grup aturan ":title" ke pilihan transaksi Anda',

1
resources/lang/it_IT/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Applica la regola ":title" a una selezione delle tue transazioni',
'apply_rule_selection_intro' => 'Regole come ":title" sono normalmente applicate solo a transazioni nuove o aggiornate, ma puoi dire a Firefly III di eseguirle su una selezione delle tue transazioni esistenti. Questo può essere utile quando hai aggiornato una regola e hai bisogno che le modifiche vengano applicate a tutte le altre transazioni.',
'include_transactions_from_accounts' => 'Includi transazioni da questi conti',
'include' => 'Includere?',
'applied_rule_selection' => '{0} Nessuna transazione della selezione è stata cambiata dalla regola ":title".|[1] Una transazione della selezione è stata modificata dalla regola ":title".|[2,*] :count transazioni della selezione sono state modificate dalla regola ":title".',
'execute' => 'Eseguire',
'apply_rule_group_selection' => 'Applica il gruppo di regole ":title" a una selezione delle tue transazioni',

1
resources/lang/nb_NO/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Bruk regel ":title" til et utvalg av dine transaksjoner',
'apply_rule_selection_intro' => 'Regler som ":title" brukes normalt bare til nye eller oppdaterte transaksjoner, men du kan få Firefly III til å kjøre dem på et utvalg av dine eksisterende transaksjoner. Dette kan være nyttig når du har oppdatert en regel, og du trenger at endringene blir brukt på alle dine tidligere transaksjoner.',
'include_transactions_from_accounts' => 'Ta med transaksjoner fra disse kontoene',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Kjør',
'apply_rule_group_selection' => 'Bruk regelgruppe ":title" til et utvalg av dine transaksjoner',

1
resources/lang/nl_NL/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Pas regel ":title" toe op een selectie van je transacties',
'apply_rule_selection_intro' => 'Regels zoals ":title" worden normaal alleen op nieuwe of geüpdate transacties toegepast, maar Firefly III kan ze ook toepassen op (een selectie van) je bestaande transacties. Dit kan praktisch zijn als je een regels hebt veranderd en je wilt de veranderingen toepassen op al je transacties.',
'include_transactions_from_accounts' => 'Gebruik transacties van deze rekeningen',
'include' => 'Opnemen?',
'applied_rule_selection' => '{0} Er zijn geen transacties in je selectie veranderd door regel ":title".|[1] Eén transactie in je selectie is veranderd door regel ":title".|[2,*] :count transacties in je selectie zijn veranderd door regel ":title".',
'execute' => 'Uitvoeren',
'apply_rule_group_selection' => 'Pas regelgroep ":title" toe op een selectie van je transacties',

1
resources/lang/pl_PL/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Zastosuj regułę ":title" do niektórych swoich transakcji',
'apply_rule_selection_intro' => 'Reguły takie jak ":title" są zwykle stosowane tylko do nowych lub modyfikowanych transakcji, ale możesz powiedzieć Firefly III aby uruchomił ją dla istniejących transakcji. Może to być przydatne, gdy zmodyfikowałeś regułę i potrzebujesz zastosować zmiany dla wszystkich pozostałych transakcji.',
'include_transactions_from_accounts' => 'Uwzględnij transakcje z tych kont',
'include' => 'Include?',
'applied_rule_selection' => '{0} Żadna transakcja w Twoim wyborze nie została zmieniona przez regułę ":title".|[1] Jedna transakcja w Twoim wyborze została zmieniona przez regułę ":title".|[2,*] :count transakcje w Twoim wyborze zostały zmienione przez regułę ":title".',
'execute' => 'Wykonaj',
'apply_rule_group_selection' => 'Zastosuj grupę reguł ":title" do niektórych swoich transakcji',

1
resources/lang/pt_BR/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Aplicar a regra ":title" para uma seleção de suas transações',
'apply_rule_selection_intro' => 'As regras como ":title" normalmente são aplicadas apenas a transações novas ou atualizadas, mas você pode informar o Firefly III para executá-lo em uma seleção de suas transações existentes. Isso pode ser útil quando você atualizou uma regra e você precisa das alterações a serem aplicadas a todas as suas outras transações.',
'include_transactions_from_accounts' => 'Incluir as transações destas contas',
'include' => 'Incluir?',
'applied_rule_selection' => '{0} Nenhuma transação em sua seleção foi alterada pela regra ":title".|[1] Uma transação em sua seleção foi alterada pela regra ":title".|[2,*] :count transações em sua seleção foram alteradas pela regra ":title".',
'execute' => 'Executar',
'apply_rule_group_selection' => 'Aplicar grupo de regras ":title" para uma seleção de suas transações',

1
resources/lang/pt_PT/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Aplicar a regra ":title" a uma selecção de transacções',
'apply_rule_selection_intro' => 'Regras como ":title" são normalmente aplicadas a transações novas ou atualizadas, no entanto pode dizer ao Firefly III para executar as mesmas em transações selecionadas. Isto pode ser útil quando tiver atualizado uma regra e necessite de aplicar as alterações a todas as transações que devem ser afetas.',
'include_transactions_from_accounts' => 'Incluir transações destas contas',
'include' => 'Include?',
'applied_rule_selection' => '{0} Nenhuma transação na sua seleção foi alterada pela regra ":title".[1] Uma transação na sua seleção foi alterada pela regra ":title".├[2,*] :count transações na sua seleção foram alteradas pela regra ":title".',
'execute' => 'Executar',
'apply_rule_group_selection' => 'Aplicar grupo de regras ":title" a uma selecção de transacções',

1
resources/lang/ro_RO/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Aplicați regula ":title" la o selecție a tranzacțiilor dvs.',
'apply_rule_selection_intro' => 'Reguli de genul ":title" se aplică, în mod normal, tranzacțiilor noi sau actualizate, dar puteți să-i spuneți aplicației să o ruleze pe o selecție a tranzacțiilor existente. Acest lucru poate fi util atunci când ați actualizat o regulă și aveți nevoie de modificările care vor fi aplicate tuturor celorlalte tranzacții.',
'include_transactions_from_accounts' => 'Includeți tranzacții din aceste conturi',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Execută',
'apply_rule_group_selection' => 'Aplicați grupul de reguli ":title" la o selecție a tranzacțiilor dvs.',

1
resources/lang/ru_RU/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Применить ":title" к выбранным вами транзакциям',
'apply_rule_selection_intro' => 'Такие правила, как ":title", обычно применяются только к новым или обновлённым транзакциям, но Firefly III может применить его для выбранных вами существующих транзакций. Это может быть полезно, если вы обновили правило, и вам нужно изменить ранее созданные транзакции в соответствии с новыми условиями.',
'include_transactions_from_accounts' => 'Включить транзакции с указанных счетов',
'include' => 'Include?',
'applied_rule_selection' => '{0} В вашем выборе ни одна транзакция не была изменена правилом ":title".|[1] В вашем выборе одна транзакция была изменена правилом ":title".|[2,*] :count транзакции(-ий) в вашем выборе было изменено правилом ":title".',
'execute' => 'Выполнить',
'apply_rule_group_selection' => 'Применить группу правил":title" к выбранным вами транзакциям',

1
resources/lang/sk_SK/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Uplatniť pravidlo „:title“ na vybrané transakcie',
'apply_rule_selection_intro' => 'Pravidlá ako „:title“ sa zvyčajne uplatňujú iba na nové alebo aktualizované transakcie, môžete však Firefly III povedať, aby ho spustil pri výbere vašich existujúcich transakcií. To môže byť užitočné, keď ste aktualizovali pravidlo a potrebujete zmeny, ktoré sa majú uplatniť na všetky vaše ďalšie transakcie.',
'include_transactions_from_accounts' => 'Zahrnúť transakcie z týchto účtov',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Vykonať',
'apply_rule_group_selection' => 'Uplatniť skupinu pravidiel „:title“ na vybrané transakcie',

1
resources/lang/sv_SE/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Tillämpa regel ":title" till ditt val av transaktioner',
'apply_rule_selection_intro' => 'Regler som ":title" används normalt bara för nya eller uppdaterade transaktioner, men du kan få Firefly III att köra det på ett utval av nuvarande transaktioner. Detta kan vara användbart när du har uppdaterat en regel ändringen behöver göras på alla dina transaktioner.',
'include_transactions_from_accounts' => 'Inkludera transaktioner från dessa konton',
'include' => 'Include?',
'applied_rule_selection' => '{0} Inga transaktioner i ditt urval ändrades av regeln ":title".|[1] En transaktion i ditt urval ändrades av regeln ":title".|[2,*] :count transaktioner i ditt urval ändrades av regeln ":title".',
'execute' => 'Utför',
'apply_rule_group_selection' => 'Tillämpa regel grupp ":title" till dit val av transaktioner',

1
resources/lang/tr_TR/firefly.php
View File

@@ -424,6 +424,7 @@ return [
'apply_rule_selection' => 'İşleminizin bir bölümüne ":title" kuralını uygulayın',
'apply_rule_selection_intro' => '":title" gibi kurallar normalde sadece yeni ve güncellenen işlemlerde geçerlidir ama Firefly III\'e onları mevcut işlemlerinizin istediğiniz bölümlerinde uygulanmasını söyleyebilirsiniz. Bu bir kuralı değiştirdiğinizde ve bunun diğer tüm işlemlerde uygulanmasını istediğinizde yararlı olabilir.',
'include_transactions_from_accounts' => 'Bu hesaplardan gelen işlemleri dahil et',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Çalıştır',
'apply_rule_group_selection' => 'İşlemlerinizin bir bölümüne ":title" kural grubunu uygulayın',

1
resources/lang/vi_VN/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => 'Áp dụng quy tắc ":title" cho giao dịch bạn lựa chọn',
'apply_rule_selection_intro' => 'Quy tắc như ":title" thường chỉ được áp dụng cho các giao dịch mới hoặc được cập nhật, nhưng bạn có thể yêu cầu Firefly III chạy nó trên một lựa chọn các giao dịch hiện tại của bạn. Điều này có thể hữu ích khi bạn đã cập nhật quy tắc và bạn cần thay đổi để áp dụng cho tất cả các giao dịch khác của mình.',
'include_transactions_from_accounts' => 'Bao gồm các giao dịch từ các tài khoản này',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => 'Hoàn thành',
'apply_rule_group_selection' => 'Áp dụng nhóm quy tắc ":title" để lựa chọn các giao dịch của bạn',

1
resources/lang/zh_CN/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => '选取交易并应用规则“:title”',
'apply_rule_selection_intro' => '规则如“:title”一般仅应用于新增的或更新后的交易，但您可要求 Firefly III 针对已有的单笔或多笔交易执行规则。在您更新一条规则后，且必须应用此规则至其他交易时，即可使用此功能。',
'include_transactions_from_accounts' => '包含来自这些账户的交易',
'include' => 'Include?',
'applied_rule_selection' => '{0} 规则“:title”没有改变任何您选择的交易。|[1] 规则“:title”改变了一条您选择的交易。|[2,*] 规则“:title”改变了:count条您选择的交易。',
'execute' => '执行',
'apply_rule_group_selection' => '选取交易并应用规则组“:title”',

1
resources/lang/zh_TW/firefly.php
View File

@@ -423,6 +423,7 @@ return [
'apply_rule_selection' => '將規則 ":title" 套用至您所選的交易',
'apply_rule_selection_intro' => '規則如 ":title" 一般僅套用至新的或更新後的交易，但您可要求 Firefly III 針對既有的單筆或多筆交易執行規則。在您更新一則規則後，且必須套用該規則至其他交易時，即可使用此功能。',
'include_transactions_from_accounts' => '包含來自這些帳戶的交易',
'include' => 'Include?',
'applied_rule_selection' => '{0} No transactions in your selection were changed by rule ":title".|[1] One transaction in your selection was changed by rule ":title".|[2,*] :count transactions in your selection were changed by rule ":title".',
'execute' => '執行',
'apply_rule_group_selection' => '將規則群組 ":title" 套用至您所選的交易',

4
resources/views/v1/emails/access-token-created-html.twig → resources/views/emails/access-token-created-html.twig
View File

@@ -1,4 +1,4 @@
{% include 'v1.emails.header-html' %}
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.access_token_created_body') }}
</p>
@@ -10,4 +10,4 @@
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
</p>
{% include 'v1.emails.footer-html' %}
{% include 'emails.footer-html' %}

4
resources/views/v2/emails/access-token-created-text.twig → resources/views/emails/access-token-created-text.twig
View File

@@ -1,7 +1,7 @@
{% include 'v2.emails.header-text' %}
{% include 'emails.header-text' %}
{{ trans('email.access_token_created_body')|raw }}
{{ trans('email.access_token_created_explanation')|striptags|raw }}
{{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
{% include 'v2.emails.footer-text' %}
{% include 'emails.footer-text' %}

4
resources/views/v2/emails/admin-test-html.twig → resources/views/emails/admin-test-html.twig
View File

@@ -1,5 +1,5 @@
{% include 'v2.emails.header-html' %}
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.admin_test_body', {email: email })}}
</p>
{% include 'v2.emails.footer-html' %}
{% include 'emails.footer-html' %}

3
resources/views/emails/admin-test-text.twig Normal file
View File

@@ -0,0 +1,3 @@
{% include 'emails.header-text' %}
{{ trans('email.admin_test_body', {email: email })|raw }}
{% include 'emails.footer-text' %}

4
resources/views/v1/emails/confirm-email-change-html.twig → resources/views/emails/confirm-email-change-html.twig
View File

@@ -1,4 +1,4 @@
{% include 'v1.emails.header-html' %}
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.email_change_body_to_new')}}
</p>
@@ -15,4 +15,4 @@
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
<a href="{{ uri }}">{{ uri }}</a>
</p>
{% include 'v1.emails.footer-html' %}
{% include 'emails.footer-html' %}

4
resources/views/v2/emails/confirm-email-change-text.twig → resources/views/emails/confirm-email-change-text.twig
View File

@@ -1,4 +1,4 @@
{% include 'v2.emails.header-text' %}
{% include 'emails.header-text' %}
{{ trans('email.email_change_body_to_new')|raw }}
{{trans('email.email_change_old', { email: oldEmail })|raw }}
@@ -7,4 +7,4 @@
{{ trans('email.email_change_instructions')|raw }}
{{ uri }}
{% include 'v2.emails.footer-text' %}
{% include 'emails.footer-text' %}

6
resources/views/v1/emails/error-html.twig → resources/views/emails/error-html.twig
View File

@@ -1,4 +1,4 @@
{% include 'v1.emails.header-html' %}
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
</p>
@@ -25,7 +25,7 @@
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.error_ip', { ip: ip }) }}<br />
{{ trans('email.error_ip', { ip: ip }) }} (<a href="https://ipinfo.io/{{ ip }}/json?token={{ token }}">info</a>)<br />
{{ trans('email.error_url', {url :url }) }}<br />
{{ trans('email.error_user_agent', {userAgent: userAgent }) }}
</p>
@@ -42,4 +42,4 @@
<p style="font-family: monospace;font-size:11px;color:#aaa">
{{ stackTrace|nl2br }}
</p>
{% include 'v1.emails.footer-html' %}
{% include 'emails.footer-html' %}

4
resources/views/v2/emails/error-text.twig → resources/views/emails/error-text.twig
View File

@@ -1,4 +1,4 @@
{% include 'v2.emails.header-text' %}
{% include 'emails.header-text' %}
{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}
{{ trans('email.error_type', {class: class })|raw }}
@@ -24,4 +24,4 @@
{{ trans('email.error_stacktrace_below')|raw }}
{{ stackTrace|raw }}
{% include 'v2.emails.footer-text' %}
{% include 'emails.footer-text' %}

0
resources/views/v1/emails/footer-html.twig → resources/views/emails/footer-html.twig
View File

0
resources/views/v1/emails/footer-text.twig → resources/views/emails/footer-text.twig
View File

0
resources/views/v1/emails/header-html.twig → resources/views/emails/header-html.twig
View File

0
resources/views/v1/emails/header-text.twig → resources/views/emails/header-text.twig
View File

Some files were not shown because too many files have changed in this diff Show More