IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-26 08:51:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename languages.

Browse Source
This commit is contained in:
James Cole 2015-12-19 20:54:27 +01:00
parent 719af38a61
commit c1ba591b26
13 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -12,6 +12,7 @@ CACHE_DRIVER=file
SESSION_DRIVER=file
DEFAULT_CURRENCY=EUR
DEFAULT_LANGUAGE=en_US
EMAIL_SMTP=
EMAIL_DRIVER=smtp

4
app/Generator/Chart/Account/ChartJsAccountChartGenerator.php
View File

@ -105,7 +105,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$data = [
'count' => 0,
@ -151,7 +151,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
public function single(Account $account, Carbon $start, Carbon $end)
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$data = [

2
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@ -71,7 +71,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
public function single(Bill $bill, Collection $entries)
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$data = [

4
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@ -24,7 +24,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
public function budget(Collection $entries, $dateFormat = 'month')
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [
@ -115,7 +115,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
public function year(Collection $budgets, Collection $entries)
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$data = [

4
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@ -101,7 +101,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$data = [
@ -135,7 +135,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$data = [

2
app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
View File

@ -25,7 +25,7 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$data = [

2
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@ -22,7 +22,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
public function yearInOut(Collection $entries)
{
// language:
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$data = [

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

@ -34,7 +34,7 @@ abstract class Controller extends BaseController
View::share('hideTags', false);
if (Auth::check()) {
$pref = Preferences::get('language', 'en');
$pref = Preferences::get('language',env('DEFAULT_LANGUAGE','en_US'));
$lang = $pref->data;
$this->monthFormat = Config::get('firefly.month.' . $lang);
$this->monthAndDayFormat = Config::get('firefly.monthAndDay.' . $lang);

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

@ -37,7 +37,7 @@ class PreferencesController extends Controller
$viewRange = $viewRangePref->data;
$frontPageAccounts = Preferences::get('frontPageAccounts', []);
$budgetMax = Preferences::get('budgetMaximum', 1000);
$language = Preferences::get('language', 'en')->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$budgetMaximum = $budgetMax->data;
return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange'));

2
app/Http/Middleware/Authenticate.php
View File

@ -61,7 +61,7 @@ class Authenticate
}
// if logged in, set user language:
$pref = Preferences::get('language', 'en');
$pref = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'));
App::setLocale($pref->data);
Carbon::setLocale($pref->data);

2
app/Http/breadcrumbs.php
View File

@ -354,7 +354,7 @@ Breadcrumbs::register(
'reports.report', function (Generator $breadcrumbs, Carbon $start, Carbon $end, $reportType, $accountIds) {
$breadcrumbs->parent('reports.index');
$pref = Preferences::get('language', 'en')->data;
$pref = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$monthFormat = Config::get('firefly.monthAndDay.' . $pref);
$title = trans('firefly.report_default', ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);

4
config/app.php
View File

@ -52,7 +52,7 @@ return [
|
*/
'locale' => 'en',
'locale' => 'en_US',
/*
|--------------------------------------------------------------------------
@ -65,7 +65,7 @@ return [
|
*/
'fallback_locale' => 'en',
'fallback_locale' => 'en_US',
/*
|--------------------------------------------------------------------------

16
config/firefly.php
View File

@ -99,12 +99,12 @@ return [
'Cash account' => 'cash',
],
'lang' => [
'en' => 'English',
'nl' => 'Nederlands'
'en_US' => 'English',
'nl_NL' => 'Nederlands'
],
'locales' => [
'en' => ['en', 'English', 'en_US', 'en_US.utf8'],
'nl' => ['nl', 'Dutch', 'nl_NL', 'nl_NL.utf8'],
'en_US' => ['en', 'English', 'en_US', 'en_US.utf8'],
'nl_NL' => ['nl', 'Dutch', 'nl_NL', 'nl_NL.utf8'],
],
'transactionTypesByWhat' => [
'expenses' => ['Withdrawal'],
@ -125,12 +125,12 @@ return [
],
'month' => [
'en' => '%B %Y',
'nl' => '%B %Y',
'en_US' => '%B %Y',
'nl_NL' => '%B %Y',
],
'monthAndDay' => [
'en' => '%B %e, %Y',
'nl' => '%e %B %Y',
'en_US' => '%B %e, %Y',
'nl_NL' => '%e %B %Y',
],
];