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 new translations [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-09 17:56:08 +02:00
parent c933ffec66
commit 7ac24ba418
10 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,9 @@ class BillController extends Controller
*/
public function create()
{
$periods = Config::get('firefly.periods_to_text');
$periods = Config::get('firefly.periods_to_text');
$subTitle = trans('firefly.create_new_bill');
// put previous url in session if not redirect from store (not "create another").
if (Session::get('bills.create.fromStore') !== true) {
@@ -44,7 +46,6 @@ class BillController extends Controller
Session::forget('bills.create.fromStore');
Session::flash('gaEventCategory', 'bills');
Session::flash('gaEventAction', 'create');
$subTitle = 'Create new bill';
return view('bills.create', compact('periods', 'subTitle'));
}
@@ -90,7 +91,7 @@ class BillController extends Controller
public function edit(Bill $bill)
{
$periods = Config::get('firefly.periods_to_text');
$subTitle = 'Edit "' . e($bill->name) . '"';
$subTitle = trans('firefly.edit_bill', ['name' => $bill->name]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('bills.edit.fromUpdate') !== true) {

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

@@ -116,7 +116,7 @@ class BudgetController extends Controller
*/
public function edit(Budget $budget)
{
$subTitle = 'Edit budget "' . e($budget->name) . '"';
$subTitle = trans('firefly.edit_budget',['name' => $budget->name]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('budgets.edit.fromUpdate') !== true) {

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

@@ -43,7 +43,7 @@ class CategoryController extends Controller
Session::forget('categories.create.fromStore');
Session::flash('gaEventCategory', 'categories');
Session::flash('gaEventAction', 'create');
$subTitle = 'Create a new category';
$subTitle = trans('firefly.create_new_category');
return view('categories.create', compact('subTitle'));
}
@@ -90,7 +90,7 @@ class CategoryController extends Controller
*/
public function edit(Category $category)
{
$subTitle = 'Edit category "' . e($category->name) . '"';
$subTitle = trans('firefly.edit_category', ['name' => $category->name]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('categories.edit.fromUpdate') !== true) {
@@ -132,7 +132,10 @@ class CategoryController extends Controller
$start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->startOfMonth());
$list = $repository->getWithoutCategory($start, $end);
$subTitle = 'Transactions without a category between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y');
$subTitle = trans(
'firefly.without_category_between',
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
);
return view('categories.noCategory', compact('list', 'subTitle'));
}

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

@@ -37,7 +37,7 @@ class CurrencyController extends Controller
public function create()
{
$subTitleIcon = 'fa-plus';
$subTitle = 'Create a new currency';
$subTitle = trans('firefly.create_currency');
// put previous url in session if not redirect from store (not "create another").
if (Session::get('currency.create.fromStore') !== true) {
@@ -124,7 +124,7 @@ class CurrencyController extends Controller
public function edit(TransactionCurrency $currency)
{
$subTitleIcon = 'fa-pencil';
$subTitle = 'Edit currency "' . e($currency->name) . '"';
$subTitle = trans('firefly.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/PiggyBankController.php
View File

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

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

@@ -76,15 +76,13 @@ class ReminderController extends Controller
*/
public function show(Reminder $reminder)
{
$title = 'Reminder';
$title = trans('firefly.reminder');
$mainTitleIcon = 'fa-clock-o';
if ($reminder->notnow === true) {
$subTitle = 'Dismissed reminder';
$subTitle = trans('firefly.dismissed_reminder_for_piggy', ['name' => $reminder->remindersable->name]);
} else {
$subTitle = 'Reminder';
$subTitle = trans('firefly.reminder_for_piggy', ['name' => $reminder->remindersable->name]);
}
$subTitle .= ' for piggy bank "' . $reminder->remindersable->name . '"';
return view('reminders.show', compact('reminder', 'title', 'subTitle', 'mainTitleIcon'));

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

@@ -26,7 +26,7 @@ class SearchController extends Controller
if (!is_null(Input::get('q')) && strlen(Input::get('q')) > 0) {
$rawQuery = trim(Input::get('q'));
$words = explode(' ', $rawQuery);
$subTitle = 'Results for "' . e($rawQuery) . '"';
$subTitle = trans('firefly.search_results_for', ['query' => $rawQuery]);
$transactions = $searcher->searchTransactions($words);
$accounts = $searcher->searchAccounts($words);

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

@@ -56,7 +56,7 @@ class TagController extends Controller
*/
public function create()
{
$subTitle = 'New tag';
$subTitle = trans('firefly.new_tag');
$subTitleIcon = 'fa-tag';
$preFilled = [
@@ -120,7 +120,7 @@ class TagController extends Controller
*/
public function edit(Tag $tag, TagRepositoryInterface $repository)
{
$subTitle = 'Edit tag "' . e($tag->tag) . '"';
$subTitle = trans('firefly.edit_tag', ['tag' => $tag->tag]);
$subTitleIcon = 'fa-tag';
/*