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

New translations and routes.

Browse Source
This commit is contained in:
James Cole 2018-06-29 12:11:44 +02:00
parent f048e943f8
commit 8c28c4b5ac
22 changed files with 234 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/Api/V1/Controllers/PreferenceController.php
View File

@ -23,11 +23,22 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Models\Preference;
use FireflyIII\Transformers\PreferenceTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
use Preferences;
/**
*
* Class PreferenceController
*/
class PreferenceController extends Controller
{
public function __construct()
@ -67,7 +78,31 @@ class PreferenceController extends Controller
*/
public function index(Request $request): JsonResponse
{
// todo implement.
/** @var User $user */
$user = auth()->user();
$available = [
'language', 'customFiscalYear', 'fiscalYearStart', 'currencyPreference',
'transaction_journal_optional_fields', 'frontPageAccounts', 'viewRange',
'listPageSize, twoFactorAuthEnabled',
];
$preferences = new Collection;
foreach ($available as $name) {
$pref = Preferences::getForUser($user, $name);
if (null !== $pref) {
$preferences->push($pref);
}
}
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($preferences, new PreferenceTransformer($this->parameters), 'preferences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
@ -75,13 +110,21 @@ class PreferenceController extends Controller
* List single resource.
*
* @param Request $request
* @param string $object
* @param Preference $preference
*
* @return JsonResponse
*/
public function show(Request $request, string $object): JsonResponse
public function show(Request $request, Preference $preference): JsonResponse
{
// todo implement me.
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($preference, new PreferenceTransformer($this->parameters), 'preferences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}

24
app/Models/Preference.php
View File

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt;
use Exception;
use FireflyIII\Exceptions\FireflyException;
@ -29,12 +30,16 @@ use FireflyIII\User;
use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Database\Eloquent\Model;
use Log;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class Preference.
*
* @property mixed $data
* @property string $name
* @property Carbon $updated_at
* @property Carbon $created_at
* @property int $id
*/
class Preference extends Model
{
@ -52,6 +57,25 @@ class Preference extends Model
/** @var array */
protected $fillable = ['user_id', 'data', 'name'];
/**
* @param string $value
*
* @return Account
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
public static function routeBinder(string $value): Preference
{
if (auth()->check()) {
$preferenceId = (int)$value;
$preference = auth()->user()->preferences()->find($preferenceId);
if (null !== $preference) {
return $preference;
}
}
throw new NotFoundHttpException;
}
/**
* @param $value
*

6
app/Support/Preferences.php
View File

@ -125,14 +125,14 @@ class Preferences
*
* @return \FireflyIII\Models\Preference|null
*/
public function getForUser(User $user, $name, $default = null)
public function getForUser(User $user, $name, $default = null): ?Preference
{
$fullName = sprintf('preference%s%s', $user->id, $name);
if (Cache::has($fullName)) {
return Cache::get($fullName);
}
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $preference && null === $preference->data) {
try {
$preference->delete();
@ -219,7 +219,7 @@ class Preferences
{
$fullName = sprintf('preference%s%s', $user->id, $name);
Cache::forget($fullName);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $pref) {
$pref->data = $value;

72
app/Transformers/PreferenceTransformer.php Normal file
View File

@ -0,0 +1,72 @@
<?php
/**
* PreferenceTransformer.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Models\Preference;
use League\Fractal\TransformerAbstract;
use Symfony\Component\HttpFoundation\ParameterBag;
class PreferenceTransformer extends TransformerAbstract
{
/**
* List of resources possible to include.
*
* @var array
*/
protected $availableIncludes = ['user'];
/**
* List of resources to automatically include
*
* @var array
*/
protected $defaultIncludes = [];
/** @var ParameterBag */
protected $parameters;
public function __construct(ParameterBag $parameters)
{
$this->parameters = $parameters;
}
/**
* Transform the preference
*
* @param Preference $preference
*
* @return array
*/
public function transform(Preference $preference): array
{
return [
'id' => (int)$preference->id,
'updated_at' => $preference->updated_at->toAtomString(),
'created_at' => $preference->created_at->toAtomString(),
'name' => $preference->name,
'data' => $preference->data,
];
}
}

1
config/firefly.php
View File

@ -270,6 +270,7 @@ return [
'journalLink' => \FireflyIII\Models\TransactionJournalLink::class,
'currency' => \FireflyIII\Models\TransactionCurrency::class,
'piggyBank' => \FireflyIII\Models\PiggyBank::class,
'preference' => \FireflyIII\Models\Preference::class,
'tj' => \FireflyIII\Models\TransactionJournal::class,
'tag' => \FireflyIII\Models\Tag::class,
'recurrence' => \FireflyIII\Models\Recurrence::class,

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

@ -465,7 +465,7 @@ return [
'pref_two_factor_auth_code_help' => 'Scannen Sie den QR-Code mit einer Anwendung wie Authy oder Google Authenticator auf ihrem Handy und geben Sie den generierten Code ein.',
'pref_two_factor_auth_reset_code' => 'Verifizierungscode zurücksetzen',
'pref_two_factor_auth_disable_2fa' => '2FA deaktivieren',
'2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: :secret.',
'2fa_use_secret_instead' => 'Wenn Sie den QR-Code nicht scannen können, verwenden Sie stattdessen das Geheimnis: :secret.',
'pref_save_settings' => 'Einstellungen speichern',
'saved_preferences' => 'Einstellungen gespeichert!',
'preferences_general' => 'Allgemein',
@ -1135,6 +1135,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'is (partially) refunded by_inward' => 'wird (teilweise) erstattet durch',
'is (partially) paid for by_inward' => 'wird (teilweise) bezahlt von',
'is (partially) reimbursed by_inward' => 'wird (teilweise) erstattet durch',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'bezieht sich auf',
'(partially) refunds_outward' => '(Teil-)Erstattungen',
'(partially) pays for_outward' => '(teilweise) bezahlt für',
@ -1261,15 +1263,15 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'update_recurrence' => 'Dauerauftrag aktualisieren',
'updated_recurrence' => 'Dauerauftrag ":title" aktualisiert',
'recurrence_is_inactive' => 'Dieser Dauerauftrag ist nicht aktiv und erzeugt keine neuen Buchungen.',
'delete_recurring' => 'Delete recurring transaction ":title"',
'new_recurring_transaction' => 'New recurring transaction',
'help_weekend' => 'What should Firefly III do when the recurring transaction falls on a Saturday or Sunday?',
'do_nothing' => 'Just create the transaction',
'skip_transaction' => 'Skip the occurence',
'jump_to_friday' => 'Create the transaction on the previous Friday instead',
'jump_to_monday' => 'Create the transaction on the next Monday instead',
'will_jump_friday' => 'Will be created on Friday instead of the weekends.',
'will_jump_monday' => 'Will be created on Monday instead of the weekends.',
'except_weekends' => 'Except weekends',
'recurrence_deleted' => 'Recurring transaction ":title" deleted',
'delete_recurring' => 'Dauerauftrag „:title” löschen',
'new_recurring_transaction' => 'Neue Dauerauftrag',
'help_weekend' => 'Was sollte Firefly III tun, wenn der Dauerauftrag auf einen Samstag oder Sonntag fällt?',
'do_nothing' => 'Einfach die Buchung anlegen',
'skip_transaction' => 'Vorkommen überspringen',
'jump_to_friday' => 'Die Buchung stattdessen am vorhergehenden Freitag ausführen',
'jump_to_monday' => 'Die Buchung stattdessen am darauffolgenden Montag ausführen',
'will_jump_friday' => 'Wird am Freitag statt am Wochenende ausgeführt.',
'will_jump_monday' => 'Wird am Montag statt am Wochenende ausgeführt.',
'except_weekends' => 'Außer an Wochenenden',
'recurrence_deleted' => 'Dauerauftrag „:title” gelöscht',
];

16
resources/lang/de_DE/form.php
View File

@ -150,7 +150,7 @@ return [
'delete_rule_group' => 'Lösche Regelgruppe ":title"',
'delete_link_type' => 'Verknüpfungstyp „:name” löschen',
'delete_user' => 'Benutzer ":email" löschen',
'delete_recurring' => 'Delete recurring transaction ":title"',
'delete_recurring' => 'Dauerauftrag „:title” löschen',
'user_areYouSure' => 'Wenn Sie den Benutzer ":email" löschen, ist alles weg. Es gibt keine Sicherung, Wiederherstellung oder ähnliches. Wenn Sie sich selbst löschen, verlieren Sie den Zugriff auf diese Instanz von Firefly III.',
'attachment_areYouSure' => 'Möchten Sie den Anhang „:name” wirklich löschen?',
'account_areYouSure' => 'Möchten Sie das Konto „:name” wirklich löschen?',
@ -159,7 +159,7 @@ return [
'ruleGroup_areYouSure' => 'Sind Sie sicher, dass sie die Regelgruppe ":title" löschen möchten?',
'budget_areYouSure' => 'Möchten Sie den Kostenrahmen „:name” wirklich löschen?',
'category_areYouSure' => 'Möchten Sie die Kategorie „:name” wirklich löschen?',
'recurring_areYouSure' => 'Are you sure you want to delete the recurring transaction titled ":title"?',
'recurring_areYouSure' => 'Möchten Sie den Dauerauftrag „:title” wirklich löschen?',
'currency_areYouSure' => 'Möchten Sie die Währung „:name” wirklich löschen?',
'piggyBank_areYouSure' => 'Möchten Sie das Sparschwein „:name” wirklich löschen?',
'journal_areYouSure' => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
@ -175,11 +175,11 @@ return [
'also_delete_connections' => 'Die einzige Transaktion, die mit diesem Verknüpfungstyp verknüpft ist, verliert diese Verbindung. • Alle :count Buchungen, die mit diesem Verknüpfungstyp verknüpft sind, verlieren ihre Verbindung.',
'also_delete_rules' => 'Die einzige Regel, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Regeln, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
'also_delete_piggyBanks' => 'Das einzige Sparschwein, das mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Sparschweine, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will be spared deletion.',
'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will be spared deletion.',
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will be spared deletion.',
'recurring_keep_transactions' => 'The only transaction created by this recurring transaction will not be deleted.|All :count transactions created by this recurring transaction will be spared deletion.',
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will be spared deletion.',
'bill_keep_transactions' => 'Die einzige mit dieser Rechnung verbundene Buchung wird nicht gelöscht. | Alle :count Buchungen, die mit dieser Rechnung verbunden sind, werden nicht gelöscht.',
'budget_keep_transactions' => 'Die einzige mit diesem Kostenrahmen verbundene Buchung wird nicht gelöscht. | Alle :count Buchungen, die mit diesem Kostenrahmen verbunden sind, werden nicht gelöscht.',
'category_keep_transactions' => 'Die einzige Buchung, die mit dieser Kategorie verbunden ist, wird nicht gelöscht. | Alle :count Buchungen, die mit dieser Kategorie verbunden sind, werden nicht gelöscht.',
'recurring_keep_transactions' => 'Die einzige Buchung, die durch diesen Dauerauftrag erstellt wurde, wird nicht gelöscht. | Alle :count Buchungen, die durch diesen Dauerauftrag erstellt wurden, werden nicht gelöscht.',
'tag_keep_transactions' => 'Das einzige mit dieser Rechnung verbundene Schlagwort wird nicht gelöscht. | Alle :count Schlagwörter, die mit dieser Rechnung verbunden sind, werden nicht gelöscht.',
'check_for_updates' => 'Nach Updates suchen',
'email' => 'E-Mail Adresse',
@ -236,6 +236,6 @@ return [
'repetition_end' => 'Wiederholung endet',
'repetitions' => 'Wiederholungen',
'calendar' => 'Kalender',
'weekend' => 'Weekend',
'weekend' => 'Wochenende',
];

8
resources/lang/de_DE/import.php
View File

@ -127,16 +127,16 @@ return [
'spectre_no_mapping' => 'Es scheint, dass Sie keine Konten zum Importieren ausgewählt haben.',
'imported_from_account' => 'Von „:account” importiert',
'spectre_account_with_number' => 'Konto :number',
'job_config_spectre_apply_rules' => 'Apply rules',
'job_config_spectre_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
'job_config_spectre_apply_rules' => 'Regeln übernehmen',
'job_config_spectre_apply_rules_text' => 'Standardmäßig werden Ihre Regeln auf die Buchungen angewendet, die während dieser Importfunktion erstellt wurden. Wenn Sie dies nicht wünschen, entfernen Sie die Markierung dieses Kontrollkästchens.',
// job configuration for bunq:
'job_config_bunq_accounts_title' => 'bunq-Konten',
'job_config_bunq_accounts_text' => 'Dies sind jene Konten, die mit Ihrem „bunq”-Konto verknüpft sind. Bitte wählen Sie die Konten aus, von denen Sie importieren möchten, und in welches Konto die Buchungen importiert werden sollen.',
'bunq_no_mapping' => 'Es scheint, dass Sie keine Konten ausgewählt haben.',
'should_download_config' => 'Sie sollten <a href=":route">die Konfigurationsdatei</a> für diesen Aufgabe herunterladen. Dies wird zukünftige Importe erheblich erleichtern.',
'share_config_file' => 'Wenn Sie Daten von einer öffentlichen Bank importiert haben, sollten Sie <a href="https://github.com/firefly-iii/import-configurations/wiki"> Ihre Konfigurationsdatei freigeben</a>, damit es für andere Benutzer einfach ist, ihre Daten zu importieren. Wenn Sie Ihre Konfigurationsdatei freigeben, werden Ihre finanziellen Daten nicht preisgegeben.',
'job_config_bunq_apply_rules' => 'Apply rules',
'job_config_bunq_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
'job_config_bunq_apply_rules' => 'Regeln übernehmen',
'job_config_bunq_apply_rules_text' => 'Standardmäßig werden Ihre Regeln auf die Buchungen angewendet, die während dieser Importfunktion erstellt wurden. Wenn Sie dies nicht wünschen, entfernen Sie die Markierung dieses Kontrollkästchens.',
// keys from "extra" array:
'spectre_extra_key_iban' => 'IBAN',
'spectre_extra_key_swift' => 'SWIFT Code',

4
resources/lang/de_DE/validation.php
View File

@ -44,8 +44,8 @@ return [
'belongs_to_user' => 'Der Wert von :attribute ist nicht bekannt',
'accepted' => ':attribute muss akzeptiert werden.',
'bic' => 'Dies ist kein gültiger BIC.',
'base64' => 'This is not valid base64 encoded data.',
'model_id_invalid' => 'The given ID seems invalid for this model.',
'base64' => 'Dies sind keine gültigen base64-kodierten Daten.',
'model_id_invalid' => 'Die angegebene ID scheint für dieses Modell ungültig zu sein.',
'more' => ':attribute muss größer als Null sein.',
'active_url' => ':attribute ist keine gültige URL.',
'after' => ':attribute muss ein Datum nach :date sein.',

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

@ -1135,6 +1135,8 @@ return [
'is (partially) refunded by_inward' => 'es (parcialmente) es devuelto por',
'is (partially) paid for by_inward' => 'es(parcialmente) pagado por',
'is (partially) reimbursed by_inward' => 'es(parcialmente) reembolsado por',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'relacionado con',
'(partially) refunds_outward' => '(parcialmente) reembolso',
'(partially) pays for_outward' => '(parcialmente) paga por',

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

@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => 'est (partiellement) remboursé par',
'is (partially) paid for by_inward' => 'est (partiellement) payé par',
'is (partially) reimbursed by_inward' => 'est (partiellement) remboursé par',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'se rapporte à',
'(partially) refunds_outward' => 'rembourse (partiellement)',
'(partially) pays for_outward' => 'paye (partiellement) pour',

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

@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => '(sebagian) dikembalikan oleh',
'is (partially) paid for by_inward' => 'adalah (sebagian) dibayar oleh',
'is (partially) reimbursed by_inward' => '(sebagian) diganti oleh',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'berhubungan dengan',
'(partially) refunds_outward' => '(sebagian) pengembalian uang',
'(partially) pays for_outward' => '(sebagian) membayar',

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

@ -465,7 +465,7 @@ return [
'pref_two_factor_auth_code_help' => 'Esegui la scansione del codice QR con un\'applicazione sul tuo telefono come Authy o Google Authenticator e inserisci il codice generato.',
'pref_two_factor_auth_reset_code' => 'Reimposta il codice di verifica',
'pref_two_factor_auth_disable_2fa' => 'Disattiva 2FA',
'2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: :secret.',
'2fa_use_secret_instead' => 'Se non puoi scansionare il codice QR puoi utilizzare il segreto: :secret.',
'pref_save_settings' => 'Salva le impostazioni',
'saved_preferences' => 'Preferenze salvate!',
'preferences_general' => 'Generale',
@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => 'è (parzialmente) rimborsata da',
'is (partially) paid for by_inward' => 'è (parzialmente) pagata da',
'is (partially) reimbursed by_inward' => 'è (parzialmente) rimborsata da',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'inerente a',
'(partially) refunds_outward' => '(parzialmente) rimborsa',
'(partially) pays for_outward' => '(parzialmente) paga per',
@ -1260,15 +1262,15 @@ return [
'update_recurrence' => 'Aggiorna transazione ricorrente',
'updated_recurrence' => 'Transazione ricorrente ":title" aggiornata',
'recurrence_is_inactive' => 'Questa transazione ricorrente non è attiva e non genererà nuove transazioni.',
'delete_recurring' => 'Delete recurring transaction ":title"',
'new_recurring_transaction' => 'New recurring transaction',
'help_weekend' => 'What should Firefly III do when the recurring transaction falls on a Saturday or Sunday?',
'do_nothing' => 'Just create the transaction',
'skip_transaction' => 'Skip the occurence',
'jump_to_friday' => 'Create the transaction on the previous Friday instead',
'jump_to_monday' => 'Create the transaction on the next Monday instead',
'will_jump_friday' => 'Will be created on Friday instead of the weekends.',
'will_jump_monday' => 'Will be created on Monday instead of the weekends.',
'except_weekends' => 'Except weekends',
'recurrence_deleted' => 'Recurring transaction ":title" deleted',
'delete_recurring' => 'Elimina transazione ricorrente ":title"',
'new_recurring_transaction' => 'Nuova transazione ricorrente',
'help_weekend' => 'Cosa vuoi che Firefly III faccia quando la transazione ricorrente cade di sabato o domenica?',
'do_nothing' => 'Crea la transazione',
'skip_transaction' => 'Salta l\'occorrenza',
'jump_to_friday' => 'Crea la transazione il venerdì precedente',
'jump_to_monday' => 'Crea la transazione il lunedì successivo',
'will_jump_friday' => 'Verrà creata il venerdì anziché nel fine settimana.',
'will_jump_monday' => 'Verrà creata il lunedì anziché il fine settimana.',
'except_weekends' => 'Tranne il fine settimana',
'recurrence_deleted' => 'La transazione ricorrente ":title" è stata eliminata',
];

16
resources/lang/it_IT/form.php
View File

@ -150,7 +150,7 @@ return [
'delete_rule_group' => 'Elimina gruppo regole":title"',
'delete_link_type' => 'Elimina tipo collegamento ":name"',
'delete_user' => 'Elimina utente ":email"',
'delete_recurring' => 'Delete recurring transaction ":title"',
'delete_recurring' => 'Elimina transazione ricorrente ":title"',
'user_areYouSure' => 'Se cancelli l\'utente ":email", verrà eliminato tutto. Non sarà più possibile recuperare i dati eliminati. Se cancelli te stesso, perderai l\'accesso a questa istanza di Firefly III.',
'attachment_areYouSure' => 'Sei sicuro di voler eliminare l\'allegato ":name"?',
'account_areYouSure' => 'Sei sicuro di voler eliminare il conto ":name"?',
@ -159,7 +159,7 @@ return [
'ruleGroup_areYouSure' => 'Sei sicuro di voler eliminare il gruppo regole ":title"?',
'budget_areYouSure' => 'Sei sicuro di voler eliminare il budget ":name"?',
'category_areYouSure' => 'Sei sicuro di voler eliminare categoria ":name"?',
'recurring_areYouSure' => 'Are you sure you want to delete the recurring transaction titled ":title"?',
'recurring_areYouSure' => 'Sei sicuro di voler eliminare la transazione ricorrente ":title"?',
'currency_areYouSure' => 'Sei sicuro di voler eliminare la valuta ":name"?',
'piggyBank_areYouSure' => 'Sei sicuro di voler eliminare il salvadanaio ":name"?',
'journal_areYouSure' => 'Sei sicuro di voler eliminare la transazione ":description"?',
@ -175,11 +175,11 @@ return [
'also_delete_connections' => 'L\'unica transazione collegata a questo tipo di collegamento perderà questa connessione. | Tutto :count le transazioni di conteggio collegate a questo tipo di collegamento perderanno la connessione.',
'also_delete_rules' => 'Anche l\'unica regola collegata a questo gruppo di regole verrà eliminata. | Tutto :count verranno eliminate anche le regole di conteggio collegate a questo gruppo di regole.',
'also_delete_piggyBanks' => 'Verrà eliminato anche l\'unico salvadanaio collegato a questo conto. | Tutti :count il conteggio del salvadanaio collegato a questo conto verrà eliminato.',
'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will be spared deletion.',
'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will be spared deletion.',
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will be spared deletion.',
'recurring_keep_transactions' => 'The only transaction created by this recurring transaction will not be deleted.|All :count transactions created by this recurring transaction will be spared deletion.',
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will be spared deletion.',
'bill_keep_transactions' => 'L\'unica transazione connessa a questa bolletta non verrà eliminata.|Tutte le :count transazioni del conto collegate a questa bolletta non verranno cancellate.',
'budget_keep_transactions' => 'L\'unica transazione collegata a questo budget non verrà eliminata.|Tutte le :count transazioni del conto collegate a questo budget non verranno cancellate.',
'category_keep_transactions' => 'L\'unica transazione collegata a questa categoria non verrà eliminata.|Tutte le :count transazioni del conto collegate a questa categoria non verranno cancellate.',
'recurring_keep_transactions' => 'L\'unica transazione creata da questa transazione ricorrente non verrà eliminata.|Tutte le :count transazioni create da questa transazione ricorrente non verranno eliminate.',
'tag_keep_transactions' => 'L\'unica transazione connessa a questa etichetta non verrà eliminata.|Tutte le :count transazioni del conto collegate a questa etichetta non verranno eliminate.',
'check_for_updates' => 'Controlla gli aggiornamenti',
'email' => 'Indirizzo email',
@ -236,6 +236,6 @@ return [
'repetition_end' => 'La ripetizione termina il',
'repetitions' => 'Ripetizioni',
'calendar' => 'Calendario',
'weekend' => 'Weekend',
'weekend' => 'Fine settimana',
];

8
resources/lang/it_IT/import.php
View File

@ -127,16 +127,16 @@ return [
'spectre_no_mapping' => 'Sembra che tu non abbia selezionato nessun account da cui importare.',
'imported_from_account' => 'Importato da ":account"',
'spectre_account_with_number' => 'Conto :number',
'job_config_spectre_apply_rules' => 'Apply rules',
'job_config_spectre_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
'job_config_spectre_apply_rules' => 'Applica regole',
'job_config_spectre_apply_rules_text' => 'Per impostazione predefinita le tue regole verranno applicate alle transazioni create durante questa procedura di importazione. Se non vuoi che questo accada, deseleziona questa casella di controllo.',
// job configuration for bunq:
'job_config_bunq_accounts_title' => 'Account bunq',
'job_config_bunq_accounts_text' => 'Questi sono i conti associati al tuo account bunq. Seleziona i conti dai quali vuoi effettuare l\'importazione e in quale conto devono essere importate le transazioni.',
'bunq_no_mapping' => 'Sembra che tu non abbia selezionato alcun conto.',
'should_download_config' => 'Ti consigliamo di scaricare <a href=":route">il file di configurazione</a> per questa operazione. Ciò renderà le importazioni future più facili.',
'share_config_file' => 'Se hai importato dati da una banca pubblica, dovresti <a href="https://github.com/firefly-iii/import-configurations/wiki">condividere il tuo file di configurazione</a> così da rendere più facile per gli altri utenti importare i loro dati. La condivisione del file di configurazione non espone i tuoi dettagli finanziari.',
'job_config_bunq_apply_rules' => 'Apply rules',
'job_config_bunq_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
'job_config_bunq_apply_rules' => 'Applica regole',
'job_config_bunq_apply_rules_text' => 'Per impostazione predefinita le tue regole verranno applicate alle transazioni create durante questa procedura di importazione. Se non vuoi che questo accada, deseleziona questa casella di controllo.',
// keys from "extra" array:
'spectre_extra_key_iban' => 'IBAN',
'spectre_extra_key_swift' => 'SWIFT',

4
resources/lang/it_IT/validation.php
View File

@ -44,8 +44,8 @@ return [
'belongs_to_user' => 'Il valore di :attribute è sconosciuto',
'accepted' => 'L\' :attribute deve essere accettato.',
'bic' => 'Questo non è un BIC valido.',
'base64' => 'This is not valid base64 encoded data.',
'model_id_invalid' => 'The given ID seems invalid for this model.',
'base64' => 'Questi non sono dati codificati in base64 validi.',
'model_id_invalid' => 'L\'ID fornito sembra non essere valido per questo modello.',
'more' => ':attribute deve essere maggiore di zero.',
'active_url' => ':attribute non è un URL valido.',
'after' => ':attribute deve essere una data dopo :date.',

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

@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => 'wordt (deels) terugbetaald door',
'is (partially) paid for by_inward' => 'wordt (deels) betaald door',
'is (partially) reimbursed by_inward' => 'wordt (deels) vergoed door',
'inward_transaction' => 'Actieve transactie',
'outward_transaction' => 'Passieve transactie',
'relates to_outward' => 'gerelateerd aan',
'(partially) refunds_outward' => 'is een (gedeeltelijke) terugbetaling voor',
'(partially) pays for_outward' => 'betaalt (deels) voor',

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

@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => 'jest (częściowo) zwracane przez',
'is (partially) paid for by_inward' => 'jest (częściowo) opłacane przez',
'is (partially) reimbursed by_inward' => 'jest (częściowo) refundowany przez',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'odnosi się do',
'(partially) refunds_outward' => '(częściowo) refundowany',
'(partially) pays for_outward' => '(częściowo) płaci za',

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

@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => 'é (parcialmente) devolvido por',
'is (partially) paid for by_inward' => 'é (parcialmente) pago por',
'is (partially) reimbursed by_inward' => 'é (parcialmente) reembolsado por',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'relacionado a',
'(partially) refunds_outward' => 'reembolsos (parcialmente)',
'(partially) pays for_outward' => 'paga (parcialmente) por',

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

@ -1134,6 +1134,8 @@ return [
'is (partially) refunded by_inward' => '(частично) возвращён',
'is (partially) paid for by_inward' => '(частично) оплачен',
'is (partially) reimbursed by_inward' => '(частично) возмещён',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'относится к',
'(partially) refunds_outward' => '(частично) возвращены',
'(partially) pays for_outward' => '(частично) оплачены',

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

@ -1135,6 +1135,8 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
'is (partially) refunded by_inward' => 'tarafından (kısmen) geri ödendi',
'is (partially) paid for by_inward' => 'tarafından (kısmen) ödendi',
'is (partially) reimbursed by_inward' => 'tarafından (kısmen) iade edildi',
'inward_transaction' => 'Inward transaction',
'outward_transaction' => 'Outward transaction',
'relates to_outward' => 'ile ilişkili',
'(partially) refunds_outward' => '(kısmen) geri ödeme',
'(partially) pays for_outward' => 'için (kısmen) öder',

14
routes/api.php
View File

@ -182,6 +182,20 @@ Route::group(
}
);
Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences', 'as' => 'api.v1.preferences.'],
function () {
// Piggy Bank API routes:
Route::get('', ['uses' => 'PreferenceController@index', 'as' => 'index']);
Route::get('{preference}', ['uses' => 'PreferenceController@show', 'as' => 'show']);
// Route::post('', ['uses' => 'PiggyBankController@store', 'as' => 'store']);
// Route::put('{piggyBank}', ['uses' => 'PiggyBankController@update', 'as' => 'update']);
// Route::delete('{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'delete']);
}
);
Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies', 'as' => 'api.v1.currencies.'],
function () {