kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Simplify method.

Browse Source
This commit is contained in:
James Cole
2020-03-16 19:45:23 +01:00
parent a7fffa5868
commit 46382b0d21
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Support/Amount.php
View File

@@ -314,28 +314,30 @@ class Amount
*/ */
public function getLocaleInfo(): array public function getLocaleInfo(): array
{ {
$locale = explode(',', (string)trans('config.locale')); $locale = explode(',', (string) trans('config.locale'));
$locale = array_map('trim', $locale); $locale = array_map('trim', $locale);
setlocale(LC_MONETARY, $locale); setlocale(LC_MONETARY, $locale);
$info = localeconv(); $info = localeconv();
// correct variables // correct variables
$info['n_cs_precedes'] = (is_bool($info['n_cs_precedes']) && true === $info['n_cs_precedes']) $info['n_cs_precedes'] = $this->getLocaleField($info, 'n_cs_precedes');
|| (is_int($info['n_cs_precedes']) && 1 === $info['n_cs_precedes']); $info['p_cs_precedes'] = $this->getLocaleField($info, 'p_cs_precedes');
$info['p_cs_precedes'] = (is_bool($info['p_cs_precedes']) && true === $info['p_cs_precedes']) $info['n_sep_by_space'] = $this->getLocaleField($info, 'n_sep_by_space');
|| (is_int($info['p_cs_precedes']) && 1 === $info['p_cs_precedes']); $info['p_sep_by_space'] = $this->getLocaleField($info, 'p_sep_by_space');
$info['n_sep_by_space'] = (is_bool($info['n_sep_by_space']) && true === $info['n_sep_by_space'])
|| (is_int($info['n_sep_by_space']) && 1 === $info['n_sep_by_space']);
$info['p_sep_by_space'] = (is_bool($info['p_sep_by_space']) && true === $info['p_sep_by_space'])
|| (is_int($info['p_sep_by_space']) && 1 === $info['p_sep_by_space']);
// n_sep_by_space
// p_sep_by_space
return $info; return $info;
}
/**
* @param array $info
* @param string $field
*
* @return bool
*/
private function getLocaleField(array $info, string $field): bool
{
return (is_bool($info[$field]) && true === $info[$field])
|| (is_int($info[$field]) && 1 === $info[$field]);
} }
/** /**