diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Functions/FunctionsImport.php | 2 | ||||
| -rw-r--r-- | app/Http/RequestHandlers/CalendarEvents.php | 2 | ||||
| -rw-r--r-- | app/Individual.php | 4 | ||||
| -rw-r--r-- | app/Module/LanguageFrench.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/Functions/FunctionsImport.php b/app/Functions/FunctionsImport.php index 0a299e0a34..24c15073b9 100644 --- a/app/Functions/FunctionsImport.php +++ b/app/Functions/FunctionsImport.php @@ -114,7 +114,7 @@ class FunctionsImport // Capitals $date = strtoupper($date); // Temporarily add leading/trailing spaces, to allow efficient matching below - $date = " {$date} "; + $date = ' ' . $date . ' '; // Ensure space digits and letters $date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date); $date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date); diff --git a/app/Http/RequestHandlers/CalendarEvents.php b/app/Http/RequestHandlers/CalendarEvents.php index 550635d49d..0bb80885a0 100644 --- a/app/Http/RequestHandlers/CalendarEvents.php +++ b/app/Http/RequestHandlers/CalendarEvents.php @@ -89,7 +89,7 @@ class CalendarEvents implements RequestHandlerInterface $filterof = $request->getQueryParams()['filterof'] ?? 'all'; $filtersx = $request->getQueryParams()['filtersx'] ?? ''; - $ged_date = new Date("{$cal} {$day} {$month} {$year}"); + $ged_date = new Date($cal . ' ' . $day . ' ' . $month . ' ' . $year); $cal_date = $ged_date->minimumDate(); $today = $cal_date->today(); diff --git a/app/Individual.php b/app/Individual.php index cb91e54606..7c94369e5e 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -966,8 +966,8 @@ class Individual extends GedcomRecord //////////////////////////////////////////////////////////////////////////// $sublevel = 1 + (int) substr($gedcom, 0, 1); - $GIVN = preg_match("/\n{$sublevel} GIVN (.+)/", $gedcom, $match) ? $match[1] : ''; - $SURN = preg_match("/\n{$sublevel} SURN (.+)/", $gedcom, $match) ? $match[1] : ''; + $GIVN = preg_match('/\n' . $sublevel . ' GIVN (.+)/', $gedcom, $match) ? $match[1] : ''; + $SURN = preg_match('/\n' . $sublevel . ' SURN (.+)/', $gedcom, $match) ? $match[1] : ''; // SURN is an comma-separated list of surnames... if ($SURN !== '') { diff --git a/app/Module/LanguageFrench.php b/app/Module/LanguageFrench.php index 8fe706a214..b73f4fd638 100644 --- a/app/Module/LanguageFrench.php +++ b/app/Module/LanguageFrench.php @@ -114,7 +114,7 @@ class LanguageFrench extends AbstractModule implements ModuleLanguageInterface // Functions to coumpound the name that can be indefinitely repeated $degree = static fn (int $n, string $suffix, string $genitive_link): array => - $genitive("$suffix au {$n}<sup>e</sup> degré", $genitive_link); + $genitive($suffix . ' au ' . $n . '<sup>e</sup> degré', $genitive_link); $great = static fn (int $n, string $suffix, string $genitive_link): array => $n <= 1 ? $genitive('arrière-' . $suffix, 'de l’') : $degree($n + 1, $suffix, $genitive_link); |