Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 17:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use translated format of months based on locale

Browse Source
This commit is contained in:
Benjamin Beganović 2021-02-25 12:00:01 +01:00
parent 7319d073c8
commit 81dfb25f5f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -656,8 +656,10 @@ trait MakesInvoiceValues
* @param string $value * @param string $value
* @return string|null * @return string|null
*/ */
private function processReservedKeywords(string $value): ?string private function processReservedKeywords(string $value): ?string
{ {
Carbon::setLocale($this->client->locale());
$replacements = [ $replacements = [
'literal' => [ 'literal' => [
':MONTH' => now()->localeMonth, ':MONTH' => now()->localeMonth,
@ -689,7 +691,6 @@ trait MakesInvoiceValues
} }
if (Str::contains($match, '|')) { if (Str::contains($match, '|')) {
$replacement = 'PLACEHOLDER FOR REPLACEMENT!';
$parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ] $parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ]
$left = substr($parts[0], 1); // 'MONTH' $left = substr($parts[0], 1); // 'MONTH'
@ -700,12 +701,12 @@ trait MakesInvoiceValues
continue; continue;
} }
$_left = Carbon::createFromDate(now()->year, now()->month)->format('F Y'); $_left = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
$_right = ''; $_right = '';
// If right side doesn't have any calculations, replace with raw ranges keyword. // If right side doesn't have any calculations, replace with raw ranges keyword.
if (!Str::contains($right, ['-', '+', '/', '*'])) { if (!Str::contains($right, ['-', '+', '/', '*'])) {
$_right = Carbon::createFromDate(now()->year, now()->month)->format('F Y'); $_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
} }
// If right side contains one of math operations, calculate. // If right side contains one of math operations, calculate.
@ -716,7 +717,7 @@ trait MakesInvoiceValues
$_value = explode($_operation, $right); // [MONTHYEAR, 4] $_value = explode($_operation, $right); // [MONTHYEAR, 4]
$_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->format('F Y'); $_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y');
} }
$replacement = sprintf('%s to %s', $_left, $_right); $replacement = sprintf('%s to %s', $_left, $_right);