Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:hillelcoren/invoice-ninja

Browse Source
This commit is contained in:
Hillel Coren 2014-04-10 22:29:13 +03:00
commit 3cfa9a5ce5
4 changed files with 4 additions and 4 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())
{
$locale = Session::get(SESSION_LOCALE, DEFUALT_LOCALE);
$locale = Session::get(SESSION_LOCALE, DEFAULT_LOCALE);
App::setLocale($locale);
}
});

2
app/lang/it/texts.php
View File

@ -145,7 +145,7 @@ return array(
'status' => 'Stato',
'invoice_total' => 'Totale Fattura',
'frequency' => 'Frequenza',
'start_date' => 'Daata Inizio',
'start_date' => 'Data Inizio',
'end_date' => 'Data Fine',
'transaction_reference' => 'Riferimento Transazione',
'method' => 'Metodo',

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_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_LOCALE, $this->language_id ? $this->language->locale : DEFUALT_LOCALE);
Session::put(SESSION_LOCALE, $this->language_id ? $this->language->locale : DEFAULT_LOCALE);
}
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_DATETIME_FORMAT', 'F j, Y, g:i a');
define('DEFAULT_QUERY_CACHE', 120); // minutes
define('DEFUALT_LOCALE', 'en');
define('DEFAULT_LOCALE', 'en');
define('GATEWAY_PAYPAL_EXPRESS', 17);
define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');