shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #520 from cuneytsenturk/1.3-dev

Browse Source 
refs #517 date rage language text
This commit is contained in:
Cüneyt Şentürk 2018-10-04 17:28:25 +03:00 committed by GitHub
commit 7744708dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/lang/en-GB/general.php
View File

@ -120,4 +120,11 @@ return [
'no_file_selected' => 'No file selected...',
],
'date_range' => [
'today' => 'Today',
'yesterday' => 'Yesterday',
'last_days' => 'Last :day Days',
'this_month' => 'This Month',
'last_month' => 'Last Month',
],
];

12
resources/views/partials/form/date_range.blade.php
View File

@ -12,12 +12,12 @@
$('.date-range-btn').daterangepicker(
{
ranges : {
'Today' : [moment(), moment()],
'Yesterday' : [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days' : [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month' : [moment().startOf('month'), moment().endOf('month')],
'Last Month' : [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
'{{ trans("general.date_range.today") }}' : [moment(), moment()],
'{{ trans("general.date_range.yesterday") }}' : [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'{{ trans("general.date_range.last_days", ["day" => "7"]) }}' : [moment().subtract(6, 'days'), moment()],
'{{ trans("general.date_range.last_days", ["day" => "30"]) }}': [moment().subtract(29, 'days'), moment()],
'{{ trans("general.date_range.this_month") }}' : [moment().startOf('month'), moment().endOf('month')],
'{{ trans("general.date_range.last_month") }}' : [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
},
startDate: moment().subtract(29, 'days'),
endDate : moment()