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

Various translation updates.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-09-09 11:19:19 +02:00
parent e937aa2f74
commit 8d19f60091
10 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,8 +252,7 @@ class BudgetController extends Controller
$count = $journals->count();
$journals = $journals->slice($offset, $pageSize);
$list = new LengthAwarePaginator($journals, $count, $pageSize);
$subTitle = trans(
'firefly.without_budget_between',
$subTitle = trans('firefly.without_budget_between',
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
);
$list->setPath('/budgets/list/noBudget');

3
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -350,8 +350,7 @@ class BudgetController extends Controller
$expenses = $this->repository->spentInPeriod(new Collection([$budget]), new Collection, $repetition->startdate, $repetition->enddate);
if ($repetitions->count() > 1) {
$name = $budget->name . ' ' . trans(
'firefly.between_dates',
$name = $budget->name . ' ' . trans('firefly.between_dates',
['start' => $repetition->startdate->formatLocalized($format), 'end' => $repetition->enddate->formatLocalized($format)]
);
}

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

@@ -134,7 +134,7 @@ class CurrencyController extends Controller
public function edit(TransactionCurrency $currency)
{
$subTitleIcon = 'fa-pencil';
$subTitle = trans('firefly.edit_currency', ['name' => $currency->name]);
$subTitle = trans('breadcrumbs.edit_currency', ['name' => $currency->name]);
$currency->symbol = htmlentities($currency->symbol);
// put previous url in session if not redirect from store (not "return_to_edit").

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

@@ -43,7 +43,7 @@ class NewUserController extends Controller
public function index(ARI $repository)
{
View::share('title', 'Welcome to Firefly!');
View::share('title', trans('firefly.welcome'));
View::share('mainTitleIcon', 'fa-fire');