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

Lots of new translations.

Browse Source
This commit is contained in:
James Cole 2015-07-26 07:39:04 +02:00
parent a137112e66
commit 6c6598dac5
17 changed files with 169 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ class PiggyBankController extends Controller
$periods = Config::get('firefly.piggy_bank_periods'); $periods = Config::get('firefly.piggy_bank_periods');
$accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
$subTitle = trans('firefly.create_new_piggybank'); $subTitle = trans('firefly.new_piggy_bank');
$subTitleIcon = 'fa-plus'; $subTitleIcon = 'fa-plus';
// put previous url in session if not redirect from store (not "create another"). // put previous url in session if not redirect from store (not "create another").

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

@ -4,6 +4,7 @@ use Auth;
use FireflyIII\Http\Requests; use FireflyIII\Http\Requests;
use FireflyIII\Http\Requests\DeleteAccountFormRequest; use FireflyIII\Http\Requests\DeleteAccountFormRequest;
use FireflyIII\Http\Requests\ProfileFormRequest; use FireflyIII\Http\Requests\ProfileFormRequest;
use FireflyIII\User;
use Hash; use Hash;
use Session; use Session;
@ -20,7 +21,7 @@ class ProfileController extends Controller
*/ */
public function changePassword() public function changePassword()
{ {
return view('profile.change-password')->with('title', Auth::user()->email)->with('subTitle', 'Change your password')->with( return view('profile.change-password')->with('title', Auth::user()->email)->with('subTitle', trans('firefly.change_your_password'))->with(
'mainTitleIcon', 'fa-user' 'mainTitleIcon', 'fa-user'
); );
} }
@ -30,7 +31,7 @@ class ProfileController extends Controller
*/ */
public function deleteAccount() public function deleteAccount()
{ {
return view('profile.delete-account')->with('title', Auth::user()->email)->with('subTitle', 'Delete account')->with( return view('profile.delete-account')->with('title', Auth::user()->email)->with('subTitle', trans('firefly.delete_account'))->with(
'mainTitleIcon', 'fa-user' 'mainTitleIcon', 'fa-user'
); );
} }
@ -41,7 +42,7 @@ class ProfileController extends Controller
*/ */
public function index() public function index()
{ {
return view('profile.index')->with('title', 'Profile')->with('subTitle', Auth::user()->email)->with('mainTitleIcon', 'fa-user'); return view('profile.index')->with('title', trans('firefly.profile'))->with('subTitle', Auth::user()->email)->with('mainTitleIcon', 'fa-user');
} }
/** /**
@ -53,7 +54,7 @@ class ProfileController extends Controller
{ {
// old, new1, new2 // old, new1, new2
if (!Hash::check($request->get('current_password'), Auth::user()->password)) { if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
Session::flash('error', 'Invalid current password!'); Session::flash('error', trans('firefly.invalid_current_password'));
return redirect(route('profile.change-password')); return redirect(route('profile.change-password'));
} }
@ -68,7 +69,7 @@ class ProfileController extends Controller
Auth::user()->password = $request->get('new_password'); Auth::user()->password = $request->get('new_password');
Auth::user()->save(); Auth::user()->save();
Session::flash('success', 'Password changed!'); Session::flash('success', trans('firefly.password_changed'));
return redirect(route('profile')); return redirect(route('profile'));
} }
@ -83,7 +84,7 @@ class ProfileController extends Controller
protected function validatePassword($old, $new1) protected function validatePassword($old, $new1)
{ {
if ($new1 == $old) { if ($new1 == $old) {
return 'The idea is to change your password.'; return trans('firefly.should_change');
} }
return true; return true;
@ -100,17 +101,28 @@ class ProfileController extends Controller
{ {
// old, new1, new2 // old, new1, new2
if (!Hash::check($request->get('password'), Auth::user()->password)) { if (!Hash::check($request->get('password'), Auth::user()->password)) {
Session::flash('error', 'Invalid password!'); Session::flash('error', trans('firefly.invalid_password'));
return redirect(route('profile.delete-account')); return redirect(route('profile.delete-account'));
} }
// DELETE! // DELETE!
$email = Auth::user()->email;
Auth::user()->delete(); Auth::user()->delete();
Session::flush(); Session::flush();
Session::flash('gaEventCategory', 'user'); Session::flash('gaEventCategory', 'user');
Session::flash('gaEventAction', 'delete-account'); Session::flash('gaEventAction', 'delete-account');
// create a new user with the same email address so re-registration is blocked.
User::create(
[
'email' => $email,
'password' => 'deleted',
'blocked' => 1,
'blocked_code' => 'deleted'
]
);
return redirect(route('index')); return redirect(route('index'));
} }

80
resources/lang/en/firefly.php
View File

@ -18,9 +18,46 @@ return [
'showEverything' => 'Show everything', 'showEverything' => 'Show everything',
'never' => 'Never', 'never' => 'Never',
'search_results_for' => 'Search results for ":query"', 'search_results_for' => 'Search results for ":query"',
'bounce_error' => 'The message sent to :email bounced, so no access for you.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
'deleted_error' => 'These credentials do not match our records.',
'removed_amount' => 'Removed :amount', 'removed_amount' => 'Removed :amount',
'added_amount' => 'Added :amount', 'added_amount' => 'Added :amount',
'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
// preferences
'pref_home_screen_accounts' => 'Home screen accounts',
'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
'pref_budget_settings' => 'Budget settings',
'pref_budget_settings_help' => 'What\'s the maximum amount of money a budget envelope may contain?',
'pref_view_range' => 'View range',
'pref_view_range_help' => 'Some charts are automatically grouped in periods. What period would you prefer?',
'pref_1D' => 'One day',
'pref_1W' => 'One week',
'pref_1M' => 'One month',
'pref_3M' => 'Three months (quarter)',
'pref_6M' => 'Six months',
'pref_languages' => 'Languages',
'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
'pref_save_settings' => 'Save settings',
// profile:
'change_your_password' => 'Change your password',
'delete_account' => 'Delete account',
'current_password' => 'Current password',
'new_password' => 'New password',
'new_password_again' => 'New password (again)',
'delete_your_account' => 'Delete your account',
'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved' .
' into Firefly III. It\'ll be GONE.',
'delete_your_account_password' => 'Enter your password to continue.',
'password' => 'Password',
'are_you_sure' => 'Are you sure? You cannot undo this.',
'delete_account_button' => 'DELETE your account',
'invalid_current_password' => 'Invalid current password!',
'password_changed' => 'Password changed!',
'should_change' => 'The idea is to change your password.',
'invalid_password' => 'Invalid password!',
// attachments // attachments
'nr_of_attachments' => 'One attachment|:count attachments', 'nr_of_attachments' => 'One attachment|:count attachments',
@ -52,22 +89,23 @@ return [
'csv_define_column_roles' => 'Define column roles', 'csv_define_column_roles' => 'Define column roles',
'csv_map_values' => 'Map found values to existing values', 'csv_map_values' => 'Map found values to existing values',
'csv_download_config' => 'Download CSV configuration file.', 'csv_download_config' => 'Download CSV configuration file.',
'csv_index_text' => 'This form allows you to import a CSV file with transactions into Firefly. It is based on the excellent CSV importer made by' 'csv_index_text' => 'This form allows you to import a CSV file with transactions into Firefly. It is based on the excellent CSV' .
. ' the folks at <a href="https://www.atlassian.com/">Atlassian</a>. Simply upload your CSV file and follow the instructions.' ' importer made by the folks at <a href="https://www.atlassian.com/">Atlassian</a>. Simply upload your CSV' .
. ' If you would like to learn more, please click on the <i class="fa fa-question-circle"></i> button at the top of this page.', ' file and follow the instructions. If you would like to learn more, please click on the <i ' .
'class="fa fa-question-circle"></i> button at the top of this page.',
'csv_index_beta_warning' => 'This tool is very much in beta. Please proceed with caution', 'csv_index_beta_warning' => 'This tool is very much in beta. Please proceed with caution',
'csv_header_help' => 'Check this box when your CSV file\'s first row consists of column names, not actual data', 'csv_header_help' => 'Check this box when your CSV file\'s first row consists of column names, not actual data',
'csv_date_help' => 'Date time format in your CSV. Follow the format like <a href="https://secure.' 'csv_date_help' => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/' .
. 'php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this' 'datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> ' .
. ' page</a> indicates. The default value will parse dates that look like this: ' . date('Ymd'), 'indicates. The default value will parse dates that look like this: ' . date('Ymd'),
'csv_csv_file_help' => 'Select the CSV file here. You can only upload one file at a time', 'csv_csv_file_help' => 'Select the CSV file here. You can only upload one file at a time',
'csv_csv_config_file_help' => 'Select your CSV import configuration here. If you do not know what this is, ignore it. It will be explained later.', 'csv_csv_config_file_help' => 'Select your CSV import configuration here. If you do not know what this is, ignore it. It will be explained later.',
'csv_upload_button' => 'Start importing CSV', 'csv_upload_button' => 'Start importing CSV',
'csv_column_roles_title' => 'Define column roles', 'csv_column_roles_title' => 'Define column roles',
'csv_column_roles_text' => 'Firefly does not know what each column means. You need to indicate what every column is. Please check out the example ' 'csv_column_roles_text' => 'Firefly does not know what each column means. You need to indicate what every column is. ' .
. 'data if you\'re not sure yourself. Click on the question mark (top right of the page) to learn what' 'Please check out the example data if you\'re not sure yourself. Click on the question mark ' .
. ' each column means. If you want to map imported data onto existing data in Firefly, use the checkbox. ' '(top right of the page) to learn what each column means. If you want to map imported data ' .
. 'The next step will show you what this button does.', 'onto existing data in Firefly, use the checkbox. The next step will show you what this button does.',
'csv_column_roles_table' => 'Column roles', 'csv_column_roles_table' => 'Column roles',
'csv_column' => 'CSV column', 'csv_column' => 'CSV column',
'cvs_column_name' => 'CSV column name', 'cvs_column_name' => 'CSV column name',
@ -77,15 +115,15 @@ return [
'csv_continue' => 'Continue to the next step', 'csv_continue' => 'Continue to the next step',
'csv_go_back' => 'Go back to the previous step', 'csv_go_back' => 'Go back to the previous step',
'csv_map_title' => 'Map found values to existing values', 'csv_map_title' => 'Map found values to existing values',
'csv_map_text' => 'This page allows you to map the values from the CSV file to existing entries in your database. This ensures that accounts and other' 'csv_map_text' => 'This page allows you to map the values from the CSV file to existing entries in your ' .
. ' things won\'t be created twice.', 'database. This ensures that accounts and other things won\'t be created twice.',
'cvs_field_value' => 'Field value from CSV', 'cvs_field_value' => 'Field value from CSV',
'csv_field_mapped_to' => 'Must be mapped to...', 'csv_field_mapped_to' => 'Must be mapped to...',
'csv_do_not_map' => 'Do not map this value', 'csv_do_not_map' => 'Do not map this value',
'csv_download_config_title' => 'Download CSV configuration', 'csv_download_config_title' => 'Download CSV configuration',
'csv_download_config_text' => 'Everything you\'ve just set up can be downloaded as a configuration file. Click the button to do so.', 'csv_download_config_text' => 'Everything you\'ve just set up can be downloaded as a configuration file. Click the button to do so.',
'csv_more_information_text' => 'If the import fails, you can use this configuration file so you don\'t have to start all over again.' 'csv_more_information_text' => 'If the import fails, you can use this configuration file so you don\'t have to start all ' .
. ' But, if the import succeeds, it will be easier to upload similar CSV files.', 'over again. But, if the import succeeds, it will be easier to upload similar CSV files.',
'csv_do_download_config' => 'Download configuration file.', 'csv_do_download_config' => 'Download configuration file.',
'csv_empty_description' => '(empty description)', 'csv_empty_description' => '(empty description)',
'csv_upload_form' => 'CSV upload form', 'csv_upload_form' => 'CSV upload form',
@ -131,7 +169,8 @@ return [
'csv_column_tags-space' => 'Tags (space separated)', 'csv_column_tags-space' => 'Tags (space separated)',
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.', 'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.', 'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'csv_import_account_help' => 'Als jouw CSV bestand geen referenties bevat naar jouw rekening(en), geef dan hier aan om welke rekening het gaat.', 'csv_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which'
. ' account the transactions in the CSV belong to.',
// create new stuff: // create new stuff:
@ -144,9 +183,12 @@ return [
'create_new_piggy_bank' => 'Create new piggy bank', 'create_new_piggy_bank' => 'Create new piggy bank',
'create_new_bill' => 'Create new bill', 'create_new_bill' => 'Create new bill',
// currencies: // currencies:
'create_currency' => 'Create a new currency', 'create_currency' => 'Create a new currency',
'edit_currency' => 'Edit currency ":name"', 'edit_currency' => 'Edit currency ":name"',
'store_currency' => 'Store new currency',
'update_currency' => 'Update currency',
// new user: // new user:
'submit' => 'Submit', 'submit' => 'Submit',
@ -174,10 +216,13 @@ return [
'delete_budget' => 'Delete budget ":name"', 'delete_budget' => 'Delete budget ":name"',
'edit_budget' => 'Edit budget ":name"', 'edit_budget' => 'Edit budget ":name"',
'update_amount' => 'Update amount', 'update_amount' => 'Update amount',
'update_budget' => 'Update budget',
// bills: // bills:
'delete_bill' => 'Delete bill ":name"', 'delete_bill' => 'Delete bill ":name"',
'edit_bill' => 'Edit bill ":name"', 'edit_bill' => 'Edit bill ":name"',
'update_bill' => 'Update bill',
'store_new_bill' => 'Store new bill',
// accounts: // accounts:
'details_for_asset' => 'Details for asset account ":name"', 'details_for_asset' => 'Details for asset account ":name"',
@ -229,6 +274,7 @@ return [
'no_category' => '(no category)', 'no_category' => '(no category)',
'category' => 'Category', 'category' => 'Category',
'delete_category' => 'Delete category ":name"', 'delete_category' => 'Delete category ":name"',
'store_category' => 'Store new category',
// transactions: // transactions:
'update_withdrawal' => 'Update withdrawal', 'update_withdrawal' => 'Update withdrawal',
@ -369,7 +415,7 @@ return [
// piggy banks: // piggy banks:
'piggy_bank' => 'Piggy bank', 'piggy_bank' => 'Piggy bank',
'new_piggy_bank' => 'Create new piggy bank', 'new_piggy_bank' => 'Create new piggy bank',
'create_new_piggybank' => 'Create new piggy bank', 'store_piggy_bank' => 'Store new piggy bank',
'account_status' => 'Account status', 'account_status' => 'Account status',
'left_for_piggy_banks' => 'Left for piggy banks', 'left_for_piggy_banks' => 'Left for piggy banks',
'sum_of_piggy_banks' => 'Sum of piggy banks', 'sum_of_piggy_banks' => 'Sum of piggy banks',

49
resources/lang/nl/firefly.php
View File

@ -18,9 +18,45 @@ return [
'showEverything' => 'Laat alles zien', 'showEverything' => 'Laat alles zien',
'never' => 'Nooit', 'never' => 'Nooit',
'search_results_for' => 'Zoekresultaten voor ":query"', 'search_results_for' => 'Zoekresultaten voor ":query"',
'bounce_error' => 'Het emailtje naar :email kwam nooit aan.', 'bounced_error' => 'Het emailtje naar :email kwam nooit aan.',
'deleted_error' => 'These credentials do not match our records.',
'removed_amount' => ':amount weggehaald', 'removed_amount' => ':amount weggehaald',
'added_amount' => ':amount toegevoegd', 'added_amount' => ':amount toegevoegd',
'asset_account_role_help' => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.',
// preferences
'pref_home_screen_accounts' => 'Voorpaginarekeningen',
'pref_home_screen_accounts_help' => 'Welke betaalrekeningen wil je op de voorpagina zien?',
'pref_budget_settings' => 'Budgetinstellingen',
'pref_budget_settings_help' => 'Wat is het maximale bedrag dat je voor een budget kan instellen?',
'pref_view_range' => 'Bereik',
'pref_view_range_help' => 'Sommige pagina\'s springen naar een standaard bereik. Welk bereik heeft jouw voorkeur?',
'pref_1D' => 'Eén dag',
'pref_1W' => 'Eén week',
'pref_1M' => 'Eén maand',
'pref_3M' => 'Drie maanden (kwartaal)',
'pref_6M' => 'Zes maanden',
'pref_languages' => 'Talen',
'pref_languages_help' => 'Firefly III ondersteunt meerdere talen. Welke heeft jouw voorkeur?',
'pref_save_settings' => 'Instellingen opslaan',
// profile:
'change_your_password' => 'Verander je wachtwoord',
'delete_account' => 'Verwijder je account',
'current_password' => 'Huidige wachtwoord',
'new_password' => 'Nieuw wachtwoord',
'new_password_again' => 'Nieuw wachtwoord (bevestiging)',
'delete_your_account' => 'Verwijder je account',
'delete_your_account_help' => 'Als je je account verwijderd worden ook al je rekeningen, transacties en <em>alle andere zaken</em> verwijderd.' .
' Alles is dan WEG.',
'delete_your_account_password' => 'Voer je wachtwoord in om door te gaan.',
'password' => 'Wachtwoord',
'are_you_sure' => 'Zeker weten? Je kan niet meer terug!',
'delete_account_button' => 'VERWIJDER je account',
'invalid_current_password' => 'Huidige wachtwoord is niet geldig!',
'password_changed' => 'Je wachtwoord is veranderd!',
'should_change' => 'Vul ook echt een ander wachtwoord in.',
'invalid_password' => 'Ongeldig wachtwoord!',
// attach // attach
'nr_of_attachments' => 'Eén bijlage|:count bijlagen', 'nr_of_attachments' => 'Eén bijlage|:count bijlagen',
@ -137,8 +173,7 @@ return [
'csv_column_tags-space' => 'Tags (spatiegescheiden)', 'csv_column_tags-space' => 'Tags (spatiegescheiden)',
'csv_specifix_RabobankDescription' => 'Vink dit aan als je Rabobank bestanden importeert.', 'csv_specifix_RabobankDescription' => 'Vink dit aan als je Rabobank bestanden importeert.',
'csv_specifix_Dummy' => 'Dit vinkje doet niks (dummy).', 'csv_specifix_Dummy' => 'Dit vinkje doet niks (dummy).',
'csv_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which' 'csv_import_account_help' => 'Als jouw CSV bestand geen referenties bevat naar jouw rekening(en), geef dan hier aan om welke rekening het gaat.',
. ' account the transactions in the CSV belong to.',
// create new stuff: // create new stuff:
'create_new_withdrawal' => 'Nieuwe uitgave', 'create_new_withdrawal' => 'Nieuwe uitgave',
@ -153,6 +188,8 @@ return [
// currencies: // currencies:
'create_currency' => 'Voeg nieuwe valuta toe', 'create_currency' => 'Voeg nieuwe valuta toe',
'edit_currency' => 'Wijzig valuta ":name"', 'edit_currency' => 'Wijzig valuta ":name"',
'store_currency' => 'Sla nieuwe valuta op',
'update_currency' => 'Wijzig valuta',
// new user: // new user:
'submit' => 'Invoeren', 'submit' => 'Invoeren',
@ -180,10 +217,13 @@ return [
'delete_budget' => 'Verwijder budget ":name"', 'delete_budget' => 'Verwijder budget ":name"',
'edit_budget' => 'Wijzig budget ":name"', 'edit_budget' => 'Wijzig budget ":name"',
'update_amount' => 'Bedrag bijwerken', 'update_amount' => 'Bedrag bijwerken',
'update_budget' => 'Budget bijwerken',
// bills: // bills:
'delete_bill' => 'Verwijder contract ":name"', 'delete_bill' => 'Verwijder contract ":name"',
'update_bill' => 'Wijzig contract',
'edit_bill' => 'Wijzig contract ":name"', 'edit_bill' => 'Wijzig contract ":name"',
'store_new_bill' => 'Sla nieuw contract op',
// accounts: // accounts:
'details_for_asset' => 'Overzicht voor betaalrekening ":name"', 'details_for_asset' => 'Overzicht voor betaalrekening ":name"',
@ -244,6 +284,7 @@ return [
'no_category' => '(geen categorie)', 'no_category' => '(geen categorie)',
'category' => 'Categorie', 'category' => 'Categorie',
'delete_category' => 'Verwijder categorie ":name"', 'delete_category' => 'Verwijder categorie ":name"',
'store_category' => 'Sla nieuwe categorie op',
// transactions: // transactions:
'update_withdrawal' => 'Wijzig uitgave', 'update_withdrawal' => 'Wijzig uitgave',
@ -384,7 +425,7 @@ return [
// piggy banks: // piggy banks:
'piggy_bank' => 'Spaarpotje', 'piggy_bank' => 'Spaarpotje',
'new_piggy_bank' => 'Nieuw spaarpotje', 'new_piggy_bank' => 'Nieuw spaarpotje',
'create_new_piggybank' => 'Nieuw spaarpotje', 'store_piggy_bank' => 'Sla spaarpotje op',
'account_status' => 'Rekeningoverzicht', 'account_status' => 'Rekeningoverzicht',
'left_for_piggy_banks' => 'Over voor spaarpotjes', 'left_for_piggy_banks' => 'Over voor spaarpotjes',
'sum_of_piggy_banks' => 'Som van spaarpotjes', 'sum_of_piggy_banks' => 'Som van spaarpotjes',

2
resources/twig/accounts/create.twig
View File

@ -32,7 +32,7 @@
{{ ExpandedForm.text('iban') }} {{ ExpandedForm.text('iban') }}
{{ ExpandedForm.balance('openingBalance') }} {{ ExpandedForm.balance('openingBalance') }}
{{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }} {{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }}
{{ ExpandedForm.select('accountRole', Config.get('firefly.accountRoles'),null,{'helpText' : 'Any extra options resulting from your choice can be set later.'}) }} {{ ExpandedForm.select('accountRole', Config.get('firefly.accountRoles'),null,{'helpText' : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.balance('virtualBalance') }} {{ ExpandedForm.balance('virtualBalance') }}
</div> </div>

2
resources/twig/bills/create.twig
View File

@ -47,7 +47,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn pull-right btn-success"> <button type="submit" class="btn pull-right btn-success">
Store new bill {{ 'store_new_bill'|_ }}
</button> </button>
</div> </div>
</div> </div>

2
resources/twig/bills/edit.twig
View File

@ -49,7 +49,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn pull-right btn-success"> <button type="submit" class="btn pull-right btn-success">
Update bill {{ 'update_bill'|_ }}
</button> </button>
</div> </div>
</div> </div>

2
resources/twig/budgets/edit.twig
View File

@ -30,7 +30,7 @@
{{ ExpandedForm.optionsList('update','budget') }} {{ ExpandedForm.optionsList('update','budget') }}
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn pull-right btn-success">Update budget</button> <button type="submit" class="btn pull-right btn-success">{{ 'update_budget'|_ }}</button>
</div> </div>
</div> </div>
</div> </div>

2
resources/twig/categories/create.twig
View File

@ -31,7 +31,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn pull-right btn-success"> <button type="submit" class="btn pull-right btn-success">
Store new category {{ 'store_category'|_ }}
</button> </button>
</div> </div>
</div> </div>

2
resources/twig/currency/create.twig
View File

@ -33,7 +33,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn pull-right btn-success"> <button type="submit" class="btn pull-right btn-success">
Store new currency {{ 'store_currency'|_ }}
</button> </button>
</div> </div>
</div> </div>

2
resources/twig/currency/edit.twig
View File

@ -34,7 +34,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn btn-success pull-right"> <button type="submit" class="btn btn-success pull-right">
Update currency {{ 'update_currency'|_ }}
</button> </button>
</div> </div>
</div> </div>

2
resources/twig/layout/default.twig
View File

@ -143,7 +143,7 @@
</div> </div>
<div class="modal-body" id="helpBody">&nbsp;</div> <div class="modal-body" id="helpBody">&nbsp;</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
</div> </div>
</div> </div>
</div> </div>

2
resources/twig/piggy-banks/create.twig
View File

@ -43,7 +43,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn btn-success pull-right"> <button type="submit" class="btn btn-success pull-right">
Store new piggy bank {{ 'store_piggy_bank'|_ }}
</button> </button>
</div> </div>
</div> </div>

28
resources/twig/preferences/index.twig
View File

@ -11,10 +11,10 @@
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Home screen accounts</h3> <h3 class="box-title">{{ 'pref_home_screen_accounts'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-info">Which accounts should be displayed on the home page?</p> <p class="text-info">{{ 'pref_home_screen_accounts_help'|_ }}</p>
{% for account in accounts %} {% for account in accounts %}
<div class="form-group"> <div class="form-group">
<div class="col-sm-10"> <div class="col-sm-10">
@ -34,11 +34,11 @@
</div> </div>
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Budget settings</h3> <h3 class="box-title">{{ 'pref_budget_settings'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-info"> <p class="text-info">
What's the maximum amount of money a budget envelope may contain? {{ 'pref_budget_settings_help'|_ }}
</p> </p>
{{ ExpandedForm.amount('budgetMaximum',budgetMaximum,{'label' : 'Budget maximum'}) }} {{ ExpandedForm.amount('budgetMaximum',budgetMaximum,{'label' : 'Budget maximum'}) }}
</div> </div>
@ -48,43 +48,43 @@
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">View range</h3> <h3 class="box-title">{{ 'pref_view_range'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-info">Some charts are automatically grouped in periods. What period would you prefer?</p> <p class="text-info">{{ 'pref_view_range_help'|_ }}</p>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="viewRange" value="1D" {% if viewRange == '1D' %} checked {% endif %}> <input type="radio" name="viewRange" value="1D" {% if viewRange == '1D' %} checked {% endif %}>
One day {{ 'pref_1D'|_ }}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="viewRange" value="1W" {% if viewRange == '1W' %} checked {% endif %}> <input type="radio" name="viewRange" value="1W" {% if viewRange == '1W' %} checked {% endif %}>
One week {{ 'pref_1W'|_ }}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="viewRange" value="1M" {% if viewRange == '1M' %} checked {% endif %}> <input type="radio" name="viewRange" value="1M" {% if viewRange == '1M' %} checked {% endif %}>
One month {{ 'pref_1M'|_ }}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="viewRange" value="3M" {% if viewRange == '3M' %} checked {% endif %}> <input type="radio" name="viewRange" value="3M" {% if viewRange == '3M' %} checked {% endif %}>
Three months {{ 'pref_3M'|_ }}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="viewRange" value="6M" {% if viewRange == '6M' %} checked {% endif %}> <input type="radio" name="viewRange" value="6M" {% if viewRange == '6M' %} checked {% endif %}>
Six months {{ 'pref_6M'|_ }}
</label> </label>
</div> </div>
</div> </div>
@ -93,10 +93,10 @@
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Languages</h3> <h3 class="box-title">{{ 'pref_languages'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-info">Firefly III supports several languages. Which one do you prefer?</p> <p class="text-info">{{ 'pref_languages_help'|_ }}</p>
{% for key, lang in Config.get('firefly.lang') %} {% for key, lang in Config.get('firefly.lang') %}
<div class="radio"> <div class="radio">
<label> <label>
@ -118,7 +118,7 @@
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<button type="submit" class="btn btn-success btn-lg">Save settings</button> <button type="submit" class="btn btn-success btn-lg">{{ 'pref_save_settings'|_ }}</button>
</div> </div>
</div> </div>
</div> </div>

16
resources/twig/profile/change-password.twig
View File

@ -11,7 +11,7 @@
<div class="col-lg-6 col-md-12 col-sm-12"> <div class="col-lg-6 col-md-12 col-sm-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Change your password</h3> <h3 class="box-title">{{ 'change_your_password'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -28,26 +28,26 @@
<div class="form-group"> <div class="form-group">
<label for="inputOldPassword" class="col-sm-4 control-label">Old password</label> <label for="inputOldPassword" class="col-sm-4 control-label">{{ 'current_password'|_ }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="password" class="form-control" id="inputOldPassword" placeholder="Old password" name="current_password"> <input type="password" class="form-control" id="inputOldPassword" placeholder="{{ 'current_password'|_ }}" name="current_password">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="inputNewPassword1" class="col-sm-4 control-label">New password</label> <label for="inputNewPassword1" class="col-sm-4 control-label">{{ 'new_password'|_ }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="password" class="form-control" id="inputNewPassword1" placeholder="New password" name="new_password"> <input type="password" class="form-control" id="inputNewPassword1" placeholder="{{ 'new_password'|_ }}" name="new_password">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="inputNewPassword2" class="col-sm-4 control-label">New password (again)</label> <label for="inputNewPassword2" class="col-sm-4 control-label">{{ 'new_password_again'|_ }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="password" class="form-control" id="inputNewPassword2" placeholder="New password (again)" <input type="password" class="form-control" id="inputNewPassword2" placeholder="{{ 'new_password_again'|_ }}"
name="new_password_confirmation"> name="new_password_confirmation">
</div> </div>
</div> </div>
@ -55,7 +55,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn btn-success pull-right">Change your password</button> <button type="submit" class="btn btn-success pull-right">{{ 'change_your_password'|_ }}</button>
</div> </div>
</div> </div>
</div> </div>

15
resources/twig/profile/delete-account.twig
View File

@ -11,17 +11,17 @@
<div class="col-lg-6 col-md-12 col-sm-12"> <div class="col-lg-6 col-md-12 col-sm-12">
<div class="box box-danger"> <div class="box box-danger">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Delete your account</h3> <h3 class="box-title">{{ 'delete_your_account'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p class="text-danger"> <p class="text-danger">
Deleting your account will also delete any accounts, transactions, <em>anything</em> {{ 'delete_your_account_help'|_ }}
you might have saved into Firefly III. It'll be GONE.
</p> </p>
<p class="text-danger"> <p class="text-danger">
Enter your password to continue. {{ 'delete_your_account_password'|_ }}
</p> </p>
{% if errors|length > 0 %} {% if errors|length > 0 %}
@ -36,15 +36,16 @@
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<label for="password" class="col-sm-4 control-label">Password</label> <label for="password" class="col-sm-4 control-label">{{ 'password'|_ }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="password" class="form-control" id="password" placeholder="Password" name="password"> <input type="password" class="form-control" id="password" placeholder="{{ 'password'|_ }}" name="password">
</div> </div>
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" onclick="confirm('Are you sure? You cannot undo this.')" class="btn btn-danger pull-right">DELETE your account <button type="submit" onclick="confirm('{{ 'are_you_sure'|_ }}')" class="btn btn-danger pull-right">
{{ 'delete_account_button'|_ }}
</button> </button>
</div> </div>
</div> </div>

4
resources/twig/profile/index.twig
View File

@ -13,8 +13,8 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<ul> <ul>
<li><a href="{{ route('profile.change-password') }}">Change your password</a></li> <li><a href="{{ route('profile.change-password') }}">{{ 'change_your_password'|_ }}</a></li>
<li><a class="text-danger" href="{{ route('profile.delete-account') }}">Delete account</a></li> <li><a class="text-danger" href="{{ route('profile.delete-account') }}">{{ 'delete_account'|_ }}</a></li>
</ul> </ul>
</div> </div>
</div> </div>