kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 04:46:44 +00:00
Code Issues Projects Releases Wiki Activity

sprintf ALL THE THINGS

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-11-02 07:04:14 +01:00
parent af16205965
commit 5be317d73c
8 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Import.php
View File

@@ -66,7 +66,7 @@ class Import extends Command
return; return;
} }
$this->line('Going to import job with key "' . $job->key . '" of type ' . $job->file_type); $this->line(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
$monolog = Log::getMonolog(); $monolog = Log::getMonolog();
$handler = new CommandHandler($this); $handler = new CommandHandler($this);

7
app/Console/Commands/VerifyDatabase.php
View File

@@ -127,8 +127,11 @@ class VerifyDatabase extends Command
/** @var stdClass $entry */ /** @var stdClass $entry */
foreach ($set as $entry) { foreach ($set as $entry) {
$line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has budget #' . $entry->id . ' ("' . Crypt::decrypt($entry->name)
. '") which has no budget limits.'; $line = sprintf(
'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.',
$entry->user_id, $entry->email, $entry->id, Crypt::decrypt($entry->name)
);
$this->line($line); $this->line($line);
} }
} }

9
app/Helpers/Help/Help.php
View File

@@ -35,7 +35,9 @@ class Help implements HelpInterface
*/ */
public function getFromCache(string $route, string $language): string public function getFromCache(string $route, string $language): string
{ {
return Cache::get('help.' . $route . '.' . $language); $line = sprintf('help.%s.%s', $route, $language);
return Cache::get($line);
} }
/** /**
@@ -93,7 +95,8 @@ class Help implements HelpInterface
*/ */
public function inCache(string $route, string $language):bool public function inCache(string $route, string $language):bool
{ {
$result = Cache::has('help.' . $route . '.' . $language); $line = sprintf('help.%s.%s', $route, $language);
$result = Cache::has($line);
if ($result) { if ($result) {
Log::debug(sprintf('Cache has this entry: %s', 'help.' . $route . '.' . $language)); Log::debug(sprintf('Cache has this entry: %s', 'help.' . $route . '.' . $language));
} }
@@ -115,7 +118,7 @@ class Help implements HelpInterface
*/ */
public function putInCache(string $route, string $language, string $content) public function putInCache(string $route, string $language, string $content)
{ {
$key = 'help.' . $route . '.' . $language; $key = sprintf('help.%s.%s', $route, $language);
Log::debug(sprintf('Will store entry in cache: %s', $key)); Log::debug(sprintf('Will store entry in cache: %s', $key));
Cache::put($key, $content, 10080); // a week. Cache::put($key, $content, 10080); // a week.
} }

12
app/Support/Amount.php
View File

@@ -59,14 +59,14 @@ class Amount
if ($coloured === true) { if ($coloured === true) {
if ($amount > 0) { if ($amount > 0) {
return '<span class="text-success" title="' . e($float) . '">' . $result . '</span>'; return sprintf('<span class="text-success">%s</span>', $result);
} else { } else {
if ($amount < 0) { if ($amount < 0) {
return '<span class="text-danger" title="' . e($float) . '">' . $result . '</span>'; return sprintf('<span class="text-danger">%s</span>', $result);
} }
} }
return '<span style="color:#999" title="' . e($float) . '">' . $result . '</span>'; return sprintf('<span style="color:#999">%s</span>', $result);
} }
@@ -139,14 +139,14 @@ class Amount
if ($coloured === true) { if ($coloured === true) {
if ($amount > 0) { if ($amount > 0) {
return '<span class="text-success" title="' . e($float) . '">' . $result . '</span>'; return sprintf('<span class="text-success">%s</span>', $result);
} else { } else {
if ($amount < 0) { if ($amount < 0) {
return '<span class="text-danger" title="' . e($float) . '">' . $result . '</span>'; return sprintf('<span class="text-danger">%s</span>', $result);
} }
} }
return '<span style="color:#999" title="' . e($float) . '">' . $result . '</span>'; return sprintf('<span style="color:#999">%s</span>', $result);
} }

21
app/Support/Twig/Journal.php
View File

@@ -146,7 +146,7 @@ class Journal extends Twig_Extension
$array[] = '<span class="text-success">(cash)</span>'; $array[] = '<span class="text-success">(cash)</span>';
continue; continue;
} }
$array[] = '<a title="' . e($entry->name) . '" href="' . route('accounts.show', $entry->id) . '">' . e($entry->name) . '</a>'; $array[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($entry->name), route('accounts.show', $entry->id));
} }
$array = array_unique($array); $array = array_unique($array);
$result = join(', ', $array); $result = join(', ', $array);
@@ -221,7 +221,7 @@ class Journal extends Twig_Extension
$array[] = '<span class="text-success">(cash)</span>'; $array[] = '<span class="text-success">(cash)</span>';
continue; continue;
} }
$array[] = '<a title="' . e($entry->name) . '" href="' . route('accounts.show', $entry->id) . '">' . e($entry->name) . '</a>'; $array[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($entry->name), route('accounts.show', $entry->id));
} }
$array = array_unique($array); $array = array_unique($array);
$result = join(', ', $array); $result = join(', ', $array);
@@ -253,12 +253,12 @@ class Journal extends Twig_Extension
$budgets = []; $budgets = [];
// get all budgets: // get all budgets:
foreach ($journal->budgets as $budget) { foreach ($journal->budgets as $budget) {
$budgets[] = '<a href="' . route('budgets.show', [$budget->id]) . '" title="' . e($budget->name) . '">' . e($budget->name) . '</a>'; $budgets[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($budget->name), route('accounts.show', $budget->id));
} }
// and more! // and more!
foreach ($journal->transactions as $transaction) { foreach ($journal->transactions as $transaction) {
foreach ($transaction->budgets as $budget) { foreach ($transaction->budgets as $budget) {
$budgets[] = '<a href="' . route('budgets.show', [$budget->id]) . '" title="' . e($budget->name) . '">' . e($budget->name) . '</a>'; $budgets[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($budget->name), route('accounts.show', $budget->id));
} }
} }
$string = join(', ', array_unique($budgets)); $string = join(', ', array_unique($budgets));
@@ -288,7 +288,7 @@ class Journal extends Twig_Extension
$categories = []; $categories = [];
// get all categories for the journal itself (easy): // get all categories for the journal itself (easy):
foreach ($journal->categories as $category) { foreach ($journal->categories as $category) {
$categories[] = '<a href="' . route('categories.show', [$category->id]) . '" title="' . e($category->name) . '">' . e($category->name) . '</a>'; $categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('accounts.show', $category->id));
} }
if (count($categories) === 0) { if (count($categories) === 0) {
$set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id') $set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id')
@@ -299,8 +299,7 @@ class Journal extends Twig_Extension
->get(['categories.*']); ->get(['categories.*']);
/** @var Category $category */ /** @var Category $category */
foreach ($set as $category) { foreach ($set as $category) {
$categories[] = '<a href="' . route('categories.show', [$category->id]) . '" title="' . e($category->name) . '">' . e($category->name) $categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('accounts.show', $category->id));
. '</a>';
} }
} }
@@ -324,16 +323,16 @@ class Journal extends Twig_Extension
switch (true) { switch (true) {
case $journal->isWithdrawal(): case $journal->isWithdrawal():
$txt = '<i class="fa fa-long-arrow-left fa-fw" title="' . trans('firefly.withdrawal') . '"></i>'; $txt = sprintf('<i class="fa fa-long-arrow-left fa-fw" title="%s"></i>', trans('firefly.withdrawal'));
break; break;
case $journal->isDeposit(): case $journal->isDeposit():
$txt = '<i class="fa fa-long-arrow-right fa-fw" title="' . trans('firefly.deposit') . '"></i>'; $txt = sprintf('<i class="fa fa-long-arrow-right fa-fw" title="%s"></i>', trans('firefly.deposit'));
break; break;
case $journal->isTransfer(): case $journal->isTransfer():
$txt = '<i class="fa fa-fw fa-exchange" title="' . trans('firefly.transfer') . '"></i>'; $txt = sprintf('<i class="fa fa-fw fa-exchange" title="%s"></i>', trans('firefly.transfer'));
break; break;
case $journal->isOpeningBalance(): case $journal->isOpeningBalance():
$txt = '<i class="fa-fw fa fa-ban" title="' . trans('firefly.openingBalance') . '"></i>'; $txt = sprintf('<i class="fa-fw fa fa-ban" title="%s"></i>', trans('firefly.openingBalance'));
break; break;
default: default:
$txt = ''; $txt = '';

12
app/Support/Twig/Transaction.php
View File

@@ -210,7 +210,7 @@ class Transaction extends Twig_Extension
return '<span class="text-success">(cash)</span>'; return '<span class="text-success">(cash)</span>';
} }
return '<a title="' . e($name) . '" href="' . route('accounts.show', [$id]) . '">' . e($name) . '</a>'; return sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($name), route('accounts.show', [$id]));
}, ['is_safe' => ['html']] }, ['is_safe' => ['html']]
); );
@@ -276,7 +276,7 @@ class Transaction extends Twig_Extension
return '<span class="text-success">(cash)</span>'; return '<span class="text-success">(cash)</span>';
} }
return '<a title="' . e($name) . '" href="' . route('accounts.show', [$id]) . '">' . e($name) . '</a>'; return sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($name), route('accounts.show', [$id]));
}, ['is_safe' => ['html']] }, ['is_safe' => ['html']]
); );
@@ -294,16 +294,16 @@ class Transaction extends Twig_Extension
switch ($transaction->transaction_type_type) { switch ($transaction->transaction_type_type) {
case TransactionType::WITHDRAWAL: case TransactionType::WITHDRAWAL:
$txt = '<i class="fa fa-long-arrow-left fa-fw" title="' . trans('firefly.withdrawal') . '"></i>'; $txt = sprintf('<i class="fa fa-long-arrow-left fa-fw" title="%s"></i>' . trans('firefly.withdrawal'));
break; break;
case TransactionType::DEPOSIT: case TransactionType::DEPOSIT:
$txt = '<i class="fa fa-long-arrow-right fa-fw" title="' . trans('firefly.deposit') . '"></i>'; $txt = sprintf('<i class="fa fa-long-arrow-right fa-fw" title="%s"></i>', trans('firefly.deposit'));
break; break;
case TransactionType::TRANSFER: case TransactionType::TRANSFER:
$txt = '<i class="fa fa-fw fa-exchange" title="' . trans('firefly.transfer') . '"></i>'; $txt = sprintf('<i class="fa fa-fw fa-exchange" title="%s"></i>', trans('firefly.transfer'));
break; break;
case TransactionType::OPENING_BALANCE: case TransactionType::OPENING_BALANCE:
$txt = '<i class="fa-fw fa fa-ban" title="' . trans('firefly.openingBalance') . '"></i>'; $txt = sprintf('<i class="fa-fw fa fa-ban" title="%s"></i>', trans('firefly.openingBalance'));
break; break;
default: default:
$txt = ''; $txt = '';

2
app/Support/Twig/Translation.php
View File

@@ -35,7 +35,7 @@ class Translation extends Twig_Extension
$filters[] = new Twig_SimpleFilter( $filters[] = new Twig_SimpleFilter(
'_', function ($name) { '_', function ($name) {
return trans('firefly.' . $name); return strval(trans(sprintf('firefly.%s', $name)));
}, ['is_safe' => ['html']] }, ['is_safe' => ['html']]
); );