kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Some cleaning up courtesy of PHPStorm.

Browse Source
This commit is contained in:
James Cole
2016-01-15 23:12:52 +01:00
parent 3857e8d49f
commit 7bf75128a8
56 changed files with 193 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'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.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_date_parse_error' => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
// create new stuff:

2
resources/lang/en_US/passwords.php
View File

@@ -17,6 +17,6 @@ return [
"token" => "This password reset token is invalid.",
"sent" => "We have e-mailed your password reset link!",
"reset" => "Your password has been reset!",
'blocked' => 'Nice try though.'
'blocked' => 'Nice try though.',
];

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

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'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.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_date_parse_error' => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
// create new stuff:

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

@@ -17,6 +17,6 @@ return [
"token" => "Le jeton de réinitialisation de mot de passe est invalide.",
"sent" => "Nous avons envoyé votre lien de réinitialisation de mot de passe!",
"reset" => "Le mot de passe a été réinitialisé!",
'blocked' => 'Nice try though.'
'blocked' => 'Nice try though.',
];

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

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Vink dit aan als je Rabobank bestanden importeert.',
'csv_specifix_Dummy' => 'Dit vinkje doet niks (dummy).',
'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_delimiter_help' => 'Kies het veldscheidingsteken dat in het invoerbestand is gebruikt. Bij twijfel is de komma de veiligste optie.',
'csv_delimiter_help' => 'Kies het veldscheidingsteken dat in het invoerbestand is gebruikt. Bij twijfel is de komma de veiligste optie.',
'csv_date_parse_error' => 'Firefly kan van ":value" geen datum maken, gegeven het formaat ":format". Weet je zeker dat je CSV goed is?',
// create new stuff:

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

@@ -17,6 +17,6 @@ return [
"token" => "Ongeldig token! Sorry",
"sent" => "Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!",
"reset" => "Je wachtwoord is hersteld!",
'blocked' => 'Leuk geprobeerd wel.'
'blocked' => 'Leuk geprobeerd wel.',
];

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

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'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.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_date_parse_error' => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
// create new stuff:

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

@@ -17,6 +17,6 @@ return [
"token" => "Este token de redefinição de senha é inválido.",
"sent" => "Nós te enviamos um email com um link para trocar a senha!",
"reset" => "Sua senha foi redefinida!",
'blocked' => 'Nice try though.'
'blocked' => 'Nice try though.',
];

1
resources/views/emails/registered-html.twig
View File

@@ -62,6 +62,7 @@
</script>
</body>

6
resources/views/rules/partials/trigger.twig
View File

@@ -23,9 +23,9 @@
<input type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]"
class="form-control">
{% if errors.has(('rule-trigger-value.'~count)) %}
<p class="text-danger">
{{ errors.first('rule-trigger-value.'~count) }}
</p>
<p class="text-danger">
{{ errors.first('rule-trigger-value.'~count) }}
</p>
{% endif %}
</td>
<td style="width:20%;">

1
resources/views/rules/rule/delete.twig
View File

@@ -1,4 +1,3 @@
{% extends "./layout/default.twig" %}
{% block breadcrumbs %}