From 50f4df54b3b509d24f98c271f9a02fd9d406b9b1 Mon Sep 17 00:00:00 2001 From: SergeyDruid Date: Wed, 9 Apr 2014 15:15:43 +0200 Subject: [PATCH 1/2] Update texts.php --- app/lang/it/texts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index 59e4c1d69813..19c9ea443085 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -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', From bd0e2ffe559ac1bcbefa511ec86e3a65a5b02330 Mon Sep 17 00:00:00 2001 From: Joel Limberg Date: Thu, 10 Apr 2014 00:53:09 +0300 Subject: [PATCH 2/2] Fix "DEFAULT_LOCALE" constant spelling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Was “DEFUALT_LOCALE” --- app/filters.php | 2 +- app/models/Account.php | 2 +- app/routes.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/filters.php b/app/filters.php index 8ad7d5ae42fd..129ab5df25d2 100755 --- a/app/filters.php +++ b/app/filters.php @@ -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); } }); diff --git a/app/models/Account.php b/app/models/Account.php index bc500de3d6f0..1afdedb9dfb0 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -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() diff --git a/app/routes.php b/app/routes.php index 4a5f4a54cf84..802d210cd964 100755 --- a/app/routes.php +++ b/app/routes.php @@ -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');