From 99da41669bfeb1b38095858e1d70cc2e53aaa691 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 22 May 2016 13:10:58 +0300 Subject: [PATCH] Fixes for #442 and #702 --- app/Models/DateFormat.php | 7 ++ app/Models/DatetimeFormat.php | 7 ++ database/seeds/DateFormatsSeeder.php | 96 ++++++------------- .../views/accounts/localization.blade.php | 14 +-- 4 files changed, 51 insertions(+), 73 deletions(-) diff --git a/app/Models/DateFormat.php b/app/Models/DateFormat.php index b343fd422657..47afafb4cc76 100644 --- a/app/Models/DateFormat.php +++ b/app/Models/DateFormat.php @@ -5,4 +5,11 @@ use Eloquent; class DateFormat extends Eloquent { public $timestamps = false; + + public function __toString() + { + $date = mktime(0, 0, 0, 12, 31, date('Y')); + + return date($this->format, $date); + } } diff --git a/app/Models/DatetimeFormat.php b/app/Models/DatetimeFormat.php index 1d7ba8b93657..6b7edf85ec63 100644 --- a/app/Models/DatetimeFormat.php +++ b/app/Models/DatetimeFormat.php @@ -5,4 +5,11 @@ use Eloquent; class DatetimeFormat extends Eloquent { public $timestamps = false; + + public function __toString() + { + $date = mktime(0, 0, 0, 12, 31, date('Y')); + + return date($this->format, $date); + } } diff --git a/database/seeds/DateFormatsSeeder.php b/database/seeds/DateFormatsSeeder.php index 40568ca3000a..208b213912a9 100644 --- a/database/seeds/DateFormatsSeeder.php +++ b/database/seeds/DateFormatsSeeder.php @@ -11,22 +11,24 @@ class DateFormatsSeeder extends Seeder // Date formats $formats = [ - ['format' => 'd/M/Y', 'picker_format' => 'dd/M/yyyy', 'label' => '10/Mar/2013'], - ['format' => 'd-M-Y', 'picker_format' => 'dd-M-yyyy', 'label' => '10-Mar-2013'], - ['format' => 'd/F/Y', 'picker_format' => 'dd/MM/yyyy', 'label' => '10/March/2013'], - ['format' => 'd-F-Y', 'picker_format' => 'dd-MM-yyyy', 'label' => '10-March-2013'], - ['format' => 'M j, Y', 'picker_format' => 'M d, yyyy', 'label' => 'Mar 10, 2013'], - ['format' => 'F j, Y', 'picker_format' => 'MM d, yyyy', 'label' => 'March 10, 2013'], - ['format' => 'D M j, Y', 'picker_format' => 'D MM d, yyyy', 'label' => 'Mon March 10, 2013'], - ['format' => 'Y-m-d', 'picker_format' => 'yyyy-mm-dd', 'label' => '2013-03-10'], - ['format' => 'd-m-Y', 'picker_format' => 'dd-mm-yyyy', 'label' => '20-03-2013'], - ['format' => 'm/d/Y', 'picker_format' => 'mm/dd/yyyy', 'label' => '03/20/2013'] + ['format' => 'd/M/Y', 'picker_format' => 'dd/M/yyyy'], + ['format' => 'd-M-Y', 'picker_format' => 'dd-M-yyyy'], + ['format' => 'd/F/Y', 'picker_format' => 'dd/MM/yyyy'], + ['format' => 'd-F-Y', 'picker_format' => 'dd-MM-yyyy'], + ['format' => 'M j, Y', 'picker_format' => 'M d, yyyy'], + ['format' => 'F j, Y', 'picker_format' => 'MM d, yyyy'], + ['format' => 'D M j, Y', 'picker_format' => 'D MM d, yyyy'], + ['format' => 'Y-m-d', 'picker_format' => 'yyyy-mm-dd'], + ['format' => 'd-m-Y', 'picker_format' => 'dd-mm-yyyy'], + ['format' => 'm/d/Y', 'picker_format' => 'mm/dd/yyyy'], + ['format' => 'd.m.Y', 'picker_format' => 'dd.mm.yyyy'], + ['format' => 'j. M. Y', 'picker_format' => 'd. M. yyyy'], + ['format' => 'j. F. Y', 'picker_format' => 'd. MM. yyyy'] ]; - + foreach ($formats as $format) { - $record = DateFormat::whereLabel($format['label'])->first(); + $record = DateFormat::whereFormat($format['format'])->first(); if ($record) { - $record->format = $format['format']; $record->picker_format = $format['picker_format']; $record->save(); } else { @@ -36,62 +38,24 @@ class DateFormatsSeeder extends Seeder // Date/time formats $formats = [ - [ - 'format' => 'd/M/Y g:i a', - 'format_moment' => 'DD/MMM/YYYY h:mm:ss a', - 'label' => '10/Mar/2013' - ], - [ - 'format' => 'd-M-Y g:i a', - 'format_moment' => 'DD-MMM-YYYY h:mm:ss a', - 'label' => '10-Mar-2013' - ], - [ - 'format' => 'd/F/Y g:i a', - 'format_moment' => 'DD/MMMM/YYYY h:mm:ss a', - 'label' => '10/March/2013' - ], - [ - 'format' => 'd-F-Y g:i a', - 'format_moment' => 'DD-MMMM-YYYY h:mm:ss a', - 'label' => '10-March-2013' - ], - [ - 'format' => 'M j, Y g:i a', - 'format_moment' => 'MMM D, YYYY h:mm:ss a', - 'label' => 'Mar 10, 2013 6:15 pm' - ], - [ - 'format' => 'F j, Y g:i a', - 'format_moment' => 'MMMM D, YYYY h:mm:ss a', - 'label' => 'March 10, 2013 6:15 pm' - ], - [ - 'format' => 'D M jS, Y g:i a', - 'format_moment' => 'ddd MMM Do, YYYY h:mm:ss a', - 'label' => 'Mon March 10th, 2013 6:15 pm' - ], - [ - 'format' => 'Y-m-d g:i a', - 'format_moment' => 'YYYY-MMM-DD h:mm:ss a', - 'label' => '2013-03-10 6:15 pm' - ], - [ - 'format' => 'd-m-Y g:i a', - 'format_moment' => 'DD-MM-YYYY h:mm:ss a', - 'label' => '20-03-2013 6:15 pm' - ], - [ - 'format' => 'm/d/Y g:i a', - 'format_moment' => 'MM/DD/YYYY h:mm:ss a', - 'label' => '03/20/2013 6:15 pm' - ] + ['format' => 'd/M/Y g:i a', 'format_moment' => 'DD/MMM/YYYY h:mm:ss a'], + ['format' => 'd-M-Y g:i a', 'format_moment' => 'DD-MMM-YYYY h:mm:ss a'], + ['format' => 'd/F/Y g:i a', 'format_moment' => 'DD/MMMM/YYYY h:mm:ss a'], + ['format' => 'd-F-Y g:i a', 'format_moment' => 'DD-MMMM-YYYY h:mm:ss a'], + ['format' => 'M j, Y g:i a', 'format_moment' => 'MMM D, YYYY h:mm:ss a'], + ['format' => 'F j, Y g:i a', 'format_moment' => 'MMMM D, YYYY h:mm:ss a'], + ['format' => 'D M j, Y g:i a', 'format_moment' => 'ddd MMM D, YYYY h:mm:ss a'], + ['format' => 'Y-m-d g:i a', 'format_moment' => 'YYYY-MMM-DD h:mm:ss a'], + ['format' => 'd-m-Y g:i a', 'format_moment' => 'DD-MM-YYYY h:mm:ss a'], + ['format' => 'm/d/Y g:i a', 'format_moment' => 'MM/DD/YYYY h:mm:ss a'], + ['format' => 'd.m.Y g:i a', 'format_moment' => 'D.MM.YYYY h:mm:ss a'], + ['format' => 'j. M. Y g:i a', 'format_moment' => 'DD. MMM. YYYY h:mm:ss a'], + ['format' => 'j. F. Y g:i a', 'format_moment' => 'DD. MMMM. YYYY h:mm:ss a'] ]; - + foreach ($formats as $format) { - $record = DatetimeFormat::whereLabel($format['label'])->first(); + $record = DatetimeFormat::whereFormat($format['format'])->first(); if ($record) { - $record->format = $format['format']; $record->format_moment = $format['format_moment']; $record->save(); } else { diff --git a/resources/views/accounts/localization.blade.php b/resources/views/accounts/localization.blade.php index b921c8710567..ccca9f3c4e20 100644 --- a/resources/views/accounts/localization.blade.php +++ b/resources/views/accounts/localization.blade.php @@ -1,6 +1,6 @@ @extends('header') -@section('content') +@section('content') @parent {!! Former::open_for_files()->addClass('warn-on-exit') !!} @@ -11,7 +11,7 @@ @include('accounts.nav', ['selected' => ACCOUNT_LOCALIZATION])
- +
@@ -21,15 +21,15 @@
{!! Former::select('currency_id')->addOption('','') - ->fromQuery($currencies, 'name', 'id') !!} + ->fromQuery($currencies, 'name', 'id') !!} {!! Former::select('language_id')->addOption('','') - ->fromQuery($languages, 'name', 'id') !!} + ->fromQuery($languages, 'name', 'id') !!} {!! Former::select('timezone_id')->addOption('','') ->fromQuery($timezones, 'location', 'id') !!} {!! Former::select('date_format_id')->addOption('','') - ->fromQuery($dateFormats, 'label', 'id') !!} + ->fromQuery($dateFormats) !!} {!! Former::select('datetime_format_id')->addOption('','') - ->fromQuery($datetimeFormats, 'label', 'id') !!} + ->fromQuery($datetimeFormats) !!} {!! Former::checkbox('military_time')->text(trans('texts.enable')) !!} {{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}} @@ -48,4 +48,4 @@ @section('onReady') $('#currency_id').focus(); -@stop \ No newline at end of file +@stop