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

All new translations for #218

Browse Source
This commit is contained in:
James Cole 2016-03-20 11:38:01 +01:00
parent 935d72d672
commit 7e67eb17e0
15 changed files with 70 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/AccountController.php
View File

@ -91,7 +91,7 @@ class AccountController extends Controller
$repository->destroy($account, $moveTo);
Session::flash('success', trans('firefly.' . $typeName . '_deleted', ['name' => $name]));
Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name])));
Preferences::mark();
return redirect(session('accounts.delete.url'));
@ -224,7 +224,7 @@ class AccountController extends Controller
$account = $repository->store($accountData);
Session::flash('success', 'New account "' . $account->name . '" stored!');
Session::flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name])));
Preferences::mark();
// update preferences if necessary:
@ -271,7 +271,7 @@ class AccountController extends Controller
];
$repository->update($account, $accountData);
Session::flash('success', 'Account "' . $account->name . '" updated.');
Session::flash('success', strval(trans('firefly.updated_account', ['name' => $account->name])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

4
app/Http/Controllers/AttachmentController.php
View File

@ -64,7 +64,7 @@ class AttachmentController extends Controller
$repository->destroy($attachment);
Session::flash('success', trans('firefly.attachment_deleted', ['name' => $name]));
Session::flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name])));
Preferences::mark();
return redirect(session('attachments.delete.url'));
@ -159,7 +159,7 @@ class AttachmentController extends Controller
$repository->update($attachment, $attachmentData);
Session::flash('success', 'Attachment "' . $attachment->filename . '" updated.');
Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

2
app/Http/Controllers/Auth/AuthController.php
View File

@ -142,7 +142,7 @@ class AuthController extends Controller
}
// set flash message
Session::flash('success', 'You have registered successfully!');
Session::flash('success', strval(trans('firefly.registered')));
Session::flash('gaEventCategory', 'user');
Session::flash('gaEventAction', 'new-registration');

11
app/Http/Controllers/BillController.php
View File

@ -73,9 +73,10 @@ class BillController extends Controller
*/
public function destroy(BillRepositoryInterface $repository, Bill $bill)
{
$name = $bill->name;
$repository->destroy($bill);
Session::flash('success', 'The bill was deleted.');
Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name])));
Preferences::mark();
return redirect(session('bills.delete.url'));
@ -129,7 +130,7 @@ class BillController extends Controller
public function rescan(BillRepositoryInterface $repository, Bill $bill)
{
if (intval($bill->active) == 0) {
Session::flash('warning', 'Inactive bills cannot be scanned.');
Session::flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));
return redirect(URL::previous());
}
@ -141,7 +142,7 @@ class BillController extends Controller
}
Session::flash('success', 'Rescanned everything.');
Session::flash('success', strval(trans('firefly.rescanned_bill')));
Preferences::mark();
return redirect(URL::previous());
@ -173,7 +174,7 @@ class BillController extends Controller
{
$billData = $request->getBillData();
$bill = $repository->store($billData);
Session::flash('success', 'Bill "' . e($bill->name) . '" stored.');
Session::flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -200,7 +201,7 @@ class BillController extends Controller
$billData = $request->getBillData();
$bill = $repository->update($bill, $billData);
Session::flash('success', 'Bill "' . e($bill->name) . '" updated.');
Session::flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

6
app/Http/Controllers/BudgetController.php
View File

@ -105,7 +105,7 @@ class BudgetController extends Controller
$repository->destroy($budget);
Session::flash('success', 'The budget "' . e($name) . '" was deleted.');
Session::flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)])));
Preferences::mark();
@ -277,7 +277,7 @@ class BudgetController extends Controller
];
$budget = $repository->store($budgetData);
Session::flash('success', 'New budget "' . $budget->name . '" stored!');
Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -308,7 +308,7 @@ class BudgetController extends Controller
$repository->update($budget, $budgetData);
Session::flash('success', 'Budget "' . $budget->name . '" updated.');
Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

6
app/Http/Controllers/CategoryController.php
View File

@ -80,7 +80,7 @@ class CategoryController extends Controller
$name = $category->name;
$repository->destroy($category);
Session::flash('success', 'The category "' . e($name) . '" was deleted.');
Session::flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)])));
Preferences::mark();
return redirect(session('categories.delete.url'));
@ -248,7 +248,7 @@ class CategoryController extends Controller
];
$category = $repository->store($categoryData);
Session::flash('success', 'New category "' . $category->name . '" stored!');
Session::flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -276,7 +276,7 @@ class CategoryController extends Controller
$repository->update($category, $categoryData);
Session::flash('success', 'Category "' . $category->name . '" updated.');
Session::flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

20
app/Http/Controllers/CsvController.php
View File

@ -61,7 +61,7 @@ class CsvController extends Controller
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-import-account', 'csv-specifix', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Log::error('Could not recover upload.');
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -101,7 +101,7 @@ class CsvController extends Controller
{
$fields = ['csv-date-format', 'csv-has-headers', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -144,7 +144,7 @@ class CsvController extends Controller
{
$fields = ['csv-date-format', 'csv-has-headers', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -211,7 +211,7 @@ class CsvController extends Controller
{
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -227,7 +227,7 @@ class CsvController extends Controller
// Go back when no roles defined:
if (count($roles) === 0) {
Session::flash('warning', 'Please select some roles.');
Session::flash('warning', strval(trans('firefly.must_select_roles')));
return redirect(route('csv.column-roles'));
}
@ -263,7 +263,7 @@ class CsvController extends Controller
// Make sure all fields we need are accounted for.
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -307,7 +307,7 @@ class CsvController extends Controller
*/
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -348,7 +348,7 @@ class CsvController extends Controller
*/
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
Session::flash('warning', strval(trans('firefly.could_not_recover')));
return redirect(route('csv.index'));
}
@ -356,7 +356,7 @@ class CsvController extends Controller
// save mapping to session.
$mapped = [];
if (!is_array(Input::get('mapping'))) {
Session::flash('warning', 'Invalid mapping.');
Session::flash('warning', strval(trans('firefly.invalid_mapping')));
return redirect(route('csv.map'));
}
@ -393,7 +393,7 @@ class CsvController extends Controller
public function upload(Request $request)
{
if (!$request->hasFile('csv')) {
Session::flash('warning', 'No file uploaded.');
Session::flash('warning', strval(trans('firefly.no_file_uploaded')));
return redirect(route('csv.index'));
}

2
app/Http/Controllers/HomeController.php
View File

@ -38,7 +38,7 @@ class HomeController extends Controller
$diff = $start->diffInDays($end);
if ($diff > 50) {
Session::flash('warning', $diff . ' days of data may take a while to load.');
Session::flash('warning', strval(trans('firefly.warning_much_data', ['days' => $diff])));
}
Session::put('start', $start);

11
app/Http/Controllers/NewUserController.php
View File

@ -55,6 +55,7 @@ class NewUserController extends Controller
*/
public function submit(NewUserFormRequest $request, ARI $repository)
{
$count = 1;
// create normal asset account:
$assetAccount = [
'name' => $request->get('bank_name'),
@ -86,6 +87,7 @@ class NewUserController extends Controller
'openingBalanceCurrency' => intval($request->input('amount_currency_id_savings_balance')),
];
$repository->store($savingsAccount);
$count++;
}
@ -108,9 +110,14 @@ class NewUserController extends Controller
// store meta for CC:
$repository->storeMeta($creditCard, 'ccType', 'monthlyFull');
$repository->storeMeta($creditCard, 'ccMonthlyPaymentDate', Carbon::now()->year . '-01-01');
$count++;
}
Session::flash('success', 'New account(s) created!');
if ($count == 1) {
Session::flash('success', strval(trans('firefly.stored_new_account')));
} else {
Session::flash('success', strval(trans('firefly.stored_new_accounts')));
}
Preferences::mark();
return redirect(route('index'));

22
app/Http/Controllers/PiggyBankController.php
View File

@ -108,7 +108,7 @@ class PiggyBankController extends Controller
{
Session::flash('success', 'Piggy bank "' . e($piggyBank->name) . '" deleted.');
Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => e($piggyBank->name)])));
Preferences::mark();
$repository->destroy($piggyBank);
@ -242,11 +242,15 @@ class PiggyBankController extends Controller
// create event
$repository->createEvent($piggyBank, $amount);
Session::flash('success', 'Added ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
Session::flash(
'success', strval(trans('firefly.added_amount_to_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))
);
Preferences::mark();
} else {
Log::error('Cannot add ' . $amount . ' because max amount is ' . $maxAmount . ' (left on account is ' . $leftOnAccount . ')');
Session::flash('error', 'Could not add ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
Session::flash(
'error', strval(trans('firefly.cannot_add_amount_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))
);
}
return redirect(route('piggy-banks.index'));
@ -272,10 +276,14 @@ class PiggyBankController extends Controller
// create event
$repository->createEvent($piggyBank, bcmul($amount, '-1'));
Session::flash('success', 'Removed ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
Session::flash(
'success', strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))
);
Preferences::mark();
} else {
Session::flash('error', 'Could not remove ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
Session::flash(
'error', strval(trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))
);
}
return redirect(route('piggy-banks.index'));
@ -329,7 +337,7 @@ class PiggyBankController extends Controller
$piggyBank = $repository->store($piggyBankData);
Session::flash('success', 'Stored piggy bank "' . e($piggyBank->name) . '".');
Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => e($piggyBank->name)])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -364,7 +372,7 @@ class PiggyBankController extends Controller
$piggyBank = $repository->update($piggyBank, $piggyBankData);
Session::flash('success', 'Updated piggy bank "' . e($piggyBank->name) . '".');
Session::flash('success', strval(trans('firefly.updated_piggy_bank', ['name' => e($piggyBank->name)])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

4
app/Http/Controllers/PreferencesController.php
View File

@ -98,7 +98,7 @@ class PreferencesController extends Controller
Preferences::set('twoFactorAuthEnabled', 1);
Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret'));
Session::flash('success', 'Preferences saved!');
Session::flash('success', strval(trans('firefly.saved_preferences')));
Preferences::mark();
return redirect(route('preferences'));
@ -151,7 +151,7 @@ class PreferencesController extends Controller
}
Session::flash('success', 'Preferences saved!');
Session::flash('success', strval(trans('firefly.saved_preferences')));
Preferences::mark();
// if we don't have a valid secret yet, redirect to the code page.

6
app/Http/Controllers/ProfileController.php
View File

@ -60,7 +60,7 @@ class ProfileController extends Controller
{
// old, new1, new2
if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
Session::flash('error', trans('firefly.invalid_current_password'));
Session::flash('error', strval(trans('firefly.invalid_current_password')));
return redirect(route('profile.change-password'));
}
@ -75,7 +75,7 @@ class ProfileController extends Controller
Auth::user()->password = bcrypt($request->get('new_password'));
Auth::user()->save();
Session::flash('success', trans('firefly.password_changed'));
Session::flash('success', strval(trans('firefly.password_changed')));
return redirect(route('profile'));
}
@ -90,7 +90,7 @@ class ProfileController extends Controller
{
// old, new1, new2
if (!Hash::check($request->get('password'), Auth::user()->password)) {
Session::flash('error', trans('firefly.invalid_password'));
Session::flash('error', strval(trans('firefly.invalid_password')));
return redirect(route('profile.delete-account'));
}

8
app/Http/Controllers/RuleGroupController.php
View File

@ -91,7 +91,7 @@ class RuleGroupController extends Controller
$repository->destroy($ruleGroup, $moveTo);
Session::flash('success', trans('firefly.deleted_rule_group', ['title' => $title]));
Session::flash('success', strval(trans('firefly.deleted_rule_group', ['title' => $title])));
Preferences::mark();
@ -162,7 +162,7 @@ class RuleGroupController extends Controller
$this->dispatch($job);
// Tell the user that the job is queued
Session::flash('success', trans('firefly.executed_group_on_existing_transactions', ['title' => $ruleGroup->title]));
Session::flash('success', strval(trans('firefly.executed_group_on_existing_transactions', ['title' => $ruleGroup->title])));
return redirect()->route('rules.index');
}
@ -204,7 +204,7 @@ class RuleGroupController extends Controller
$ruleGroup = $repository->store($data);
Session::flash('success', trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]));
Session::flash('success', strval(trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -249,7 +249,7 @@ class RuleGroupController extends Controller
$repository->update($ruleGroup, $data);
Session::flash('success', trans('firefly.updated_rule_group', ['title' => $ruleGroup->title]));
Session::flash('success', strval(trans('firefly.updated_rule_group', ['title' => $ruleGroup->title])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

6
app/Http/Controllers/TagController.php
View File

@ -106,7 +106,7 @@ class TagController extends Controller
$tagName = $tag->tag;
$repository->destroy($tag);
Session::flash('success', 'Tag "' . e($tagName) . '" was deleted.');
Session::flash('success', strval(trans('firefly.deleted_tag', ['tag' => e($tagName)])));
Preferences::mark();
return redirect(route('tags.index'));
@ -244,7 +244,7 @@ class TagController extends Controller
$data = $request->collectTagData();
$repository->store($data);
Session::flash('success', 'The tag has been created!');
Session::flash('success', strval(trans('firefly.created_tag', ['tag' => e($data['tag'])])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -271,7 +271,7 @@ class TagController extends Controller
$data = $request->collectTagData();
$repository->update($tag, $data);
Session::flash('success', 'Tag "' . e($data['tag']) . '" updated.');
Session::flash('success', strval(trans('firefly.updated_tag', ['tag' => e($data['tag'])])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {

8
app/Http/Controllers/TransactionController.php
View File

@ -119,7 +119,8 @@ class TransactionController extends Controller
*/
public function destroy(JournalRepositoryInterface $repository, TransactionJournal $transactionJournal)
{
Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');
$type = strtolower($transactionJournal->transaction_type_type ?? TransactionJournal::transactionTypeStr($transactionJournal));
Session::flash('success', strval(trans('firefly.deleted_' . $type, ['description' => e($transactionJournal->description)])));
$repository->delete($transactionJournal);
@ -315,7 +316,7 @@ class TransactionController extends Controller
event(new TransactionJournalStored($journal, intval($request->get('piggy_bank_id'))));
Session::flash('success', 'New transaction "' . $journal->description . '" stored!');
Session::flash('success', strval(trans('firefly.stored_journal', ['description' => e($journal->description)])));
Preferences::mark();
if (intval(Input::get('create_another')) === 1) {
@ -360,7 +361,8 @@ class TransactionController extends Controller
event(new TransactionJournalUpdated($journal));
// update, get events by date and sort DESC
Session::flash('success', 'Transaction "' . e($journalData['description']) . '" updated.');
$type = strtolower($journal->transaction_type_type ?? TransactionJournal::transactionTypeStr($journal));
Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($journalData['description'])])));
Preferences::mark();
if (intval(Input::get('return_to_edit')) === 1) {