Merge pull request #706 from ridgarou/master

Fix datetomepicker and search box traslations (issue #705)

app/Ninja/Repositories/AccountRepository.php

@@ -75,21 +75,21 @@ class AccountRepository
             ->where('clients.deleted_at', '=', null)
             ->where('clients.account_id', '=', \Auth::user()->account_id)
             ->whereRaw("clients.name <> ''")
-            ->select(\DB::raw("'Clients' as type, clients.public_id, clients.name, '' as token"));
+            ->select(\DB::raw("'" . trans('texts.clients') . "' as type, clients.public_id, clients.name, '' as token"));
 
         $contacts = \DB::table('clients')
             ->join('contacts', 'contacts.client_id', '=', 'clients.id')
             ->where('clients.deleted_at', '=', null)
             ->where('clients.account_id', '=', \Auth::user()->account_id)
             ->whereRaw("CONCAT(contacts.first_name, contacts.last_name, contacts.email) <> ''")
-            ->select(\DB::raw("'Contacts' as type, clients.public_id, CONCAT(contacts.first_name, ' ', contacts.last_name, ' ', contacts.email) as name, '' as token"));
+            ->select(\DB::raw("'" . trans('texts.contacts') . "' as type, clients.public_id, CONCAT(contacts.first_name, ' ', contacts.last_name, ' ', contacts.email) as name, '' as token"));
 
         $invoices = \DB::table('clients')
             ->join('invoices', 'invoices.client_id', '=', 'clients.id')
             ->where('clients.account_id', '=', \Auth::user()->account_id)
             ->where('clients.deleted_at', '=', null)
             ->where('invoices.deleted_at', '=', null)
-            ->select(\DB::raw("'Invoices' as type, invoices.public_id, CONCAT(invoices.invoice_number, ': ', clients.name) as name, invoices.invoice_number as token"));
+            ->select(\DB::raw("'" . trans('texts.invoices') . "' as type, invoices.public_id, CONCAT(invoices.invoice_number, ': ', clients.name) as name, invoices.invoice_number as token"));
 
         $data = [];
 

public/js/jquery.datetimepicker.js

@@ -120,6 +120,14 @@
 					"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"
 				]
 			},
+			'fr-CA': { //French - Canada
+				months: [
+					"Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
+				],
+				dayOfWeek: [
+					"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"
+				]
+			},
 			es: { // Spanish
 				months: [
 					"Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"
@@ -128,6 +136,14 @@
 					"Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb"
 				]
 			},
+			'es-ES': { // Spanish - Spain
+				months: [
+					"Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"
+				],
+				dayOfWeek: [
+					"Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb"
+				]
+			},
 			th: { // Thai
 				months: [
 					'มกราคม', 'กุมภาพันธ์', 'มีนาคม', 'เมษายน', 'พฤษภาคม', 'มิถุนายน', 'กรกฎาคม', 'สิงหาคม', 'กันยายน', 'ตุลาคม', 'พฤศจิกายน', 'ธันวาคม'
@@ -200,6 +216,14 @@
 					"Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"
 				]
 			},
+			'nb_NO': { // Norwegian
+				months: [
+					"Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"
+				],
+				dayOfWeek: [
+					"Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"
+				]
+			},
 			ja: { // Japanese
 				months: [
 					"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"

resources/views/master.blade.php

@@ -77,11 +77,11 @@
             }
         } );
         
-        /*   
+		var appLocale = '{{App::getLocale()}}';
+  
         $.extend( true, $.fn.datepicker.defaults, {
-            language:'{{App::getLocale()}}'
+			language: appLocale.replace("_", "-")
         });
-        */
         
         @if (env('FACEBOOK_PIXEL'))
             <!-- Facebook Pixel Code -->
@@ -202,4 +202,4 @@
 
 </body>
 
-</html>
+</html>