Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from joellimberg/master

Browse Source 
Fix "DEFAULT_LOCALE" constant spelling
This commit is contained in:
Hillel Coren 2014-04-10 15:31:29 +03:00
commit e7d626cf7d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/filters.php
View File

@ -29,7 +29,7 @@ App::before(function($request)
} }
else if (Auth::check()) else if (Auth::check())
{ {
$locale = Session::get(SESSION_LOCALE, DEFUALT_LOCALE); $locale = Session::get(SESSION_LOCALE, DEFAULT_LOCALE);
App::setLocale($locale); App::setLocale($locale);
} }
}); });

2
app/models/Account.php
View File

@ -178,7 +178,7 @@ class Account extends Eloquent
Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT); Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
Session::put(SESSION_DATETIME_FORMAT, $this->datetime_format ? $this->datetime_format->format : DEFAULT_DATETIME_FORMAT); Session::put(SESSION_DATETIME_FORMAT, $this->datetime_format ? $this->datetime_format->format : DEFAULT_DATETIME_FORMAT);
Session::put(SESSION_CURRENCY, $this->currency_id ? $this->currency_id : DEFAULT_CURRENCY); Session::put(SESSION_CURRENCY, $this->currency_id ? $this->currency_id : DEFAULT_CURRENCY);
Session::put(SESSION_LOCALE, $this->language_id ? $this->language->locale : DEFUALT_LOCALE); Session::put(SESSION_LOCALE, $this->language_id ? $this->language->locale : DEFAULT_LOCALE);
} }
public function getInvoiceLabels() public function getInvoiceLabels()

2
app/routes.php
View File

@ -229,7 +229,7 @@ define('DEFAULT_DATE_FORMAT', 'M j, Y');
define('DEFAULT_DATE_PICKER_FORMAT', 'M d, yyyy'); define('DEFAULT_DATE_PICKER_FORMAT', 'M d, yyyy');
define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a'); define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a');
define('DEFAULT_QUERY_CACHE', 120); // minutes define('DEFAULT_QUERY_CACHE', 120); // minutes
define('DEFUALT_LOCALE', 'en'); define('DEFAULT_LOCALE', 'en');
define('GATEWAY_PAYPAL_EXPRESS', 17); define('GATEWAY_PAYPAL_EXPRESS', 17);
define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');