From 5d5796b8fbe29aad601fca8a31f2cd1aa1f16ea2 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 29 Oct 2020 22:29:31 +0100
Subject: [PATCH] add missing country

---
 Localization/Defaults/localization.sqlite | Bin 24178688 -> 24178688 bytes
 Localization/Money.php                    |  10 +++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Localization/Defaults/localization.sqlite b/Localization/Defaults/localization.sqlite
index 93a5623cb7c3689668b0489d0321b3f9aae03118..555daaee8083ad28a2a7a52cae1dec7657466835 100644
GIT binary patch
delta 1501
zcmYk&^?%m|6oqj<FnYjXG^0j0Y%pMS$AAGNMn80pp(rXAQ;(piU$6@mvAbp?DvI6R
zI9u#)z2`UYeLe3#;A}a#zxI}BM~h_7&a6?%o-#xtDvK&2O;i=tM0HU^)D*QuZILeO
zh`OSl$Po2K1Cc2jibkTbXd;@5W}>-hA+khE(Mq%yZA4p<E!v6pqJ!utI*HDri|8u4
ziSD9@=qY-M-lC7l5xJtT=qK_-e=$G|6!~J17%YZ}p<<XAE=GuvVw4yy#)z?EoER@A
zh>4;=OcImD6j3OqifLlHC=xToOfgH$7R6$Ym@DRq`C@@sC>Dv>XR%l!mWpL!xmY1q
zidAB@SR>Yob)rP97o}o@I7}QaHi{#}kz$iLN*pbY5u3%a;y7`<I6<5!wumxuk~mqM
zA|y@~Tg5hUnmAo-7iWkw#aSXHc8HzgY;le_SDYu#7Z->N#YN&`af!H8>=KuW%f%I9
zx42U55m$+;#Wmtuah<qc+#qfgH;J3YE#g*jo48%vA?_4+l~Z1pO8(edkt&bwj_!%>
zjqZ!?j~<8~jP^zkMf;+Mqer4gqy5oi(c{s9=!xjb=&9)G=$Yu*=(*_m=!NLT=%wi8
z=#}Wz=(Xte=#A*j=&k7O=$+`@=)LIu=!58B^kGyHeH48heG+{deHMKleGz>b9g4n+
zzK*_$zKy<%zK?#0evE#KevW>LevN*MeviD%pV42@-_bwOzuPNPNh&gxO%;=7s+wx1
zx~XAmnp&o|NjG&&T~p6wnEIxH$utd3Bh%P4F-=V~)7-Q$S*E3FWm=myrme{~?M!>q
z!E`j8OlQ-@bT!>fchkf4G`&o3)5qkPT+`R|GkK=J8DIvQd^5-lHbcx%Gt3M(Bg{xM
z%8WK+%vdwdj5ia^L{nfUnaO5~DKt~fG&9{4nHgrLnPq01Vl&6gHS^4Tv%oAgiwtJ5
zSz?x&WoEfqVOE+|X0=&k)+YNZQtOiJ4ax9bRZEhx%4xgzZYxRB({eH@{qM5NHdn9I
ztbS%@r-IUrrJG8N3*vJJ<W49mY?Iq3FRw>VesMwSKw3!>tT&~}z5{6+lKeye0q{J?
A%>V!Z

delta 1479
zcmWmARbbWy9EIWi$HstBW7L4rH99sLMt67f(m9yjx~WG{)DP@Ju)75lQPJ6o-HNlt
z?$+PAc%O@NdCCs%&n}C$HBEMHZ#E*?RgOqRx~L*DM5d@JvP3meUDOcSqNb=NYKuCe
zuE-JfM6ReW8i<CXk!URPL=(|eG!yxvxo9C;idLevXd~K+cA~xLAUcWy(Mfa`T|`&W
zO>`GML{HI6^cIDpNc0hXML*GB3=jjwATd}B5yfJt7$$~`5n`kmB}R)eVyqY^#)}DJ
zqL?Hmiz#BNm?ox+8DgfGC1#5`Vy>7c=8FYlp;#mqizOodSt^!^<zj_cDOQQqVvSfU
z)`|6EgD4Rj#U@cI4ikrqBgB#7C~>qnMjR`S6UU1a#EIf0ak4l?l!<b2syI!YE+ozn
zo5dD!rZ`J%6=#cc#JM6Rwu$ZHJaN9bKwKy;5*Le0#HHdgak;oc>=0Lqonn``N?a|j
z5!Z_A#P#9^aih3N+$?Spw~E`u?cxq`r?^YpE$$Kb?q+v+D*0n`Womb{C%P}XKYAc~
zFnTC@INBRM677o~jUJ00kM>7TL{CN)(NodW(KFGr(R0!B(F@Uw(M!>R=;i2@=+)@8
z==JE0=*{S@=<Vp8=-ueO=>6z}=)>q>^ifn9eH?ufeHwiheI9)geHncf9g4n=zKOn#
zzKgz(eu#dIeu{pMeu;jKev5vO{K=ouU(w&uKheL@e_Jb4Nh&hwri#fhnWn1AGSy6V
zQ^RDNnx>YiZR(i1Cdbq>xu(8pU>cf6rm@L0O-xhM%;cNqriE!~TA9|SjcIGznf9iG
z>1YZ}C)3$<F<nhJ)7|tiJxwpu+Z382)5r8R{Y-x|zzj5l%wRLb6q})Dm>F(Hn2~0b
z8EwXxv1XhZZzh<DW|Em~rkJT_nwf59n3-mlnQi8nxn`c3Zx)z^W|3KJmKe-Zv&<|v
zE6hr>%B(hP%v!U~tWWk;rZyz4OOxUqnI%bidgh+JTS}6e8CgYX`8m0{1v?L9lqC7J
fYo(>76{h8RnZL9oRS{#b(QHcgRb-SV0}lNUFvG*q

diff --git a/Localization/Money.php b/Localization/Money.php
index a6be947f2..7f57b762a 100644
--- a/Localization/Money.php
+++ b/Localization/Money.php
@@ -178,7 +178,7 @@ final class Money implements \Serializable
      */
     public function getCurrency(int $decimals = 2) : string
     {
-        return ($this->position === 0 ? $this->symbol . ' ' : '') . $this->getAmount($decimals) . ($this->position === 1 ? ' ' . $this->symbol : '');
+        return ($this->position === 0 && !empty($this->symbol) ? $this->symbol . ' ' : '') . $this->getAmount($decimals) . ($this->position === 1 ? ' ' . $this->symbol : '');
     }
 
     /**
@@ -194,7 +194,9 @@ final class Money implements \Serializable
      */
     public function getAmount(int $decimals = 2) : string
     {
-        $value = (string) \round($this->value, -self::MAX_DECIMALS + $decimals);
+        $value = $this->value === 0
+            ? \str_repeat('0', self::MAX_DECIMALS)
+            : (string) \round($this->value, -self::MAX_DECIMALS + $decimals);
 
         $left = \substr($value, 0, -self::MAX_DECIMALS);
 
@@ -206,7 +208,9 @@ final class Money implements \Serializable
             throw new \Exception(); // @codeCoverageIgnore
         }
 
-        return ($decimals > 0) ? \number_format((float) $left, 0, $this->decimal, $this->thousands) . $this->decimal . \substr($right, 0, $decimals) : \str_pad($left, 1, '0');
+        return $decimals > 0
+            ? \number_format((float) $left, 0, $this->decimal, $this->thousands) . $this->decimal . \substr($right, 0, $decimals)
+            : \str_pad($left, 1, '0');
     }
 
     /**