mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Some new translations.
This commit is contained in:
parent
e426f5d5da
commit
ffb11b01a6
@ -55,10 +55,10 @@ class Range
|
|||||||
if (!Session::has('start') && !Session::has('end')) {
|
if (!Session::has('start') && !Session::has('end')) {
|
||||||
|
|
||||||
/** @var \FireflyIII\Models\Preference $viewRange */
|
/** @var \FireflyIII\Models\Preference $viewRange */
|
||||||
$viewRange = Preferences::get('viewRange', '1M');
|
$viewRange = Preferences::get('viewRange', '1M')->data;
|
||||||
$start = new Carbon;
|
$start = new Carbon;
|
||||||
$start = Navigation::updateStartDate($viewRange->data, $start);
|
$start = Navigation::updateStartDate($viewRange, $start);
|
||||||
$end = Navigation::updateEndDate($viewRange->data, $start);
|
$end = Navigation::updateEndDate($viewRange, $start);
|
||||||
|
|
||||||
Session::put('start', $start);
|
Session::put('start', $start);
|
||||||
Session::put('end', $end);
|
Session::put('end', $end);
|
||||||
|
@ -6,7 +6,7 @@ $(function () {
|
|||||||
ranges[currentMonthName] = [moment().startOf('month'), moment().endOf('month')];
|
ranges[currentMonthName] = [moment().startOf('month'), moment().endOf('month')];
|
||||||
ranges[previousMonthName] = [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')];
|
ranges[previousMonthName] = [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')];
|
||||||
ranges[nextMonthName] = [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf('month')];
|
ranges[nextMonthName] = [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf('month')];
|
||||||
ranges['Everything'] = [firstDate, moment()];
|
ranges[everything] = [firstDate, moment()];
|
||||||
|
|
||||||
$('#daterange').daterangepicker(
|
$('#daterange').daterangepicker(
|
||||||
{
|
{
|
||||||
@ -15,10 +15,19 @@ $(function () {
|
|||||||
//View::share('nextMonthName', $next);
|
//View::share('nextMonthName', $next);
|
||||||
|
|
||||||
|
|
||||||
ranges: ranges
|
ranges: ranges,
|
||||||
,
|
|
||||||
opens: 'left',
|
opens: 'left',
|
||||||
|
locale: {
|
||||||
|
applyLabel: applyLabel,
|
||||||
|
cancelLabel: cancelLabel,
|
||||||
|
fromLabel: fromLabel,
|
||||||
|
toLabel: toLabel,
|
||||||
|
weekLabel: 'W',
|
||||||
|
customRangeLabel: customRangeLabel,
|
||||||
|
daysOfWeek: moment.weekdaysMin(),
|
||||||
|
monthNames: moment.monthsShort(),
|
||||||
|
firstDay: moment.localeData()._week.dow
|
||||||
|
},
|
||||||
format: 'DD-MM-YYYY',
|
format: 'DD-MM-YYYY',
|
||||||
startDate: start,
|
startDate: start,
|
||||||
endDate: end
|
endDate: end
|
||||||
|
@ -14,6 +14,13 @@ return [
|
|||||||
'delete' => 'Delete',
|
'delete' => 'Delete',
|
||||||
'welcomeBack' => 'What\'s playing?',
|
'welcomeBack' => 'What\'s playing?',
|
||||||
|
|
||||||
|
'everything' => 'Everything',
|
||||||
|
'customRange' => 'Custom range',
|
||||||
|
'apply' => 'Apply',
|
||||||
|
'cancel' => 'Cancel',
|
||||||
|
'from' => 'From',
|
||||||
|
'to' => 'To',
|
||||||
|
|
||||||
'details_for_asset' => 'Details for asset account ":name"',
|
'details_for_asset' => 'Details for asset account ":name"',
|
||||||
'details_for_expense' => 'Details for expense account ":name"',
|
'details_for_expense' => 'Details for expense account ":name"',
|
||||||
'details_for_revenue' => 'Details for revenue account ":name"',
|
'details_for_revenue' => 'Details for revenue account ":name"',
|
||||||
@ -36,7 +43,6 @@ return [
|
|||||||
'make_new_revenue_account' => 'New revenue account',
|
'make_new_revenue_account' => 'New revenue account',
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// new user:
|
// new user:
|
||||||
'welcome' => 'Welcome to Firefly!',
|
'welcome' => 'Welcome to Firefly!',
|
||||||
'createNewAsset' => 'Create a new asset account to get started. This will allow you to create transactions and start your financial management',
|
'createNewAsset' => 'Create a new asset account to get started. This will allow you to create transactions and start your financial management',
|
||||||
|
@ -14,6 +14,13 @@ return [
|
|||||||
'delete' => 'Verwijder',
|
'delete' => 'Verwijder',
|
||||||
'welcomeBack' => 'Hoe staat het er voor?',
|
'welcomeBack' => 'Hoe staat het er voor?',
|
||||||
|
|
||||||
|
'everything' => 'Alles',
|
||||||
|
'customRange' => 'Zelf bereik kiezen',
|
||||||
|
'apply' => 'Go',
|
||||||
|
'cancel' => 'Annuleren',
|
||||||
|
'from' => 'Van',
|
||||||
|
'to' => 'Tot',
|
||||||
|
|
||||||
'details_for_asset' => 'Overzicht voor betaalrekening ":name"',
|
'details_for_asset' => 'Overzicht voor betaalrekening ":name"',
|
||||||
'details_for_expense' => 'Overzicht voor crediteur ":name"',
|
'details_for_expense' => 'Overzicht voor crediteur ":name"',
|
||||||
'details_for_revenue' => 'Overzicht voor debiteur ":name"',
|
'details_for_revenue' => 'Overzicht voor debiteur ":name"',
|
||||||
|
@ -128,13 +128,22 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var start = "{{Session.get('start').format('d-m-Y')}}";
|
var start = "{{Session.get('start').format('d-m-Y')}}";
|
||||||
var end = "{{Session.get('end').format('d-m-Y')}}";
|
var end = "{{Session.get('end').format('d-m-Y')}}";
|
||||||
var titleString = "{{Session.get('start').format('j M Y')}} - {{Session.get('end').format('j M Y')}}";
|
var titleString = "{{Session.get('start').formatLocalized(monthAndDayFormat)}} - {{Session.get('end').formatLocalized(monthAndDayFormat)}}";
|
||||||
var dateRangeURL = "{{route('daterange')}}";
|
var dateRangeURL = "{{route('daterange')}}";
|
||||||
var token = "{{csrf_token()}}";
|
var token = "{{csrf_token()}}";
|
||||||
var firstDate = moment("{{Session.get('first').format('Y-m-d')}}");
|
var firstDate = moment("{{Session.get('first').format('Y-m-d')}}");
|
||||||
var currentMonthName = "{{ currentMonthName }}";
|
var currentMonthName = "{{ currentMonthName }}";
|
||||||
var previousMonthName = "{{ previousMonthName }}";
|
var previousMonthName = "{{ previousMonthName }}";
|
||||||
var language = "{{ language }}";
|
var language = "{{ language }}";
|
||||||
|
|
||||||
|
// translations:
|
||||||
|
var everything = '{{ 'everything'|_ }}';
|
||||||
|
var customRangeLabel = '{{ 'customRange'|_ }}';
|
||||||
|
var applyLabel = '{{ 'apply'|_ }}';
|
||||||
|
var cancelLabel = '{{ 'cancel'|_ }}';
|
||||||
|
var fromLabel = '{{ 'from'|_ }}';
|
||||||
|
var toLabel = '{{ 'to'|_ }}';
|
||||||
|
|
||||||
var nextMonthName = "{{ nextMonthName }}";
|
var nextMonthName = "{{ nextMonthName }}";
|
||||||
var currencyCode = '{{getCurrencyCode() }}';
|
var currencyCode = '{{getCurrencyCode() }}';
|
||||||
$('#daterange span').text(titleString);
|
$('#daterange span').text(titleString);
|
||||||
|
Loading…
Reference in New Issue
Block a user