status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[FIX #4848] ui, i18n: Replace currency indicator with ~ 

Signed-off-by: Goran Jovic <goranjovic@gmail.com>
This commit is contained in:
gnl 2018-07-16 15:23:57 +03:00 committed by Goran Jovic
parent 375515b04f
commit 06bb8c6348
No known key found for this signature in database
GPG Key ID: D429D1A9B2EB8A8E
2 changed files with 81 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/status_im/i18n.cljs
View File

@ -389,11 +389,12 @@
(translation (subs locale 0 2)) (translation (subs locale 0 2))
fallback))) fallback)))
(defn format-currency [value currency-code] (defn format-currency
([value currency-code]
(format-currency value currency-code true))
([value currency-code currency-symbol?]
(.addTier2Support goog.i18n.currency) (.addTier2Support goog.i18n.currency)
(let [currency-code-to-nfs-map {"ZAR" (.-NumberFormatSymbols_af goog.i18n)
(def currency-code-to-nfs-map
{"ZAR" (.-NumberFormatSymbols_af goog.i18n)
"ETB" (.-NumberFormatSymbols_am goog.i18n) "ETB" (.-NumberFormatSymbols_am goog.i18n)
"EGP" (.-NumberFormatSymbols_ar goog.i18n) "EGP" (.-NumberFormatSymbols_ar goog.i18n)
"DZD" (.-NumberFormatSymbols_ar_DZ goog.i18n) "DZD" (.-NumberFormatSymbols_ar_DZ goog.i18n)
@ -453,10 +454,18 @@
"VND" (.-NumberFormatSymbols_vi goog.i18n) "VND" (.-NumberFormatSymbols_vi goog.i18n)
"CNY" (.-NumberFormatSymbols_zh goog.i18n) "CNY" (.-NumberFormatSymbols_zh goog.i18n)
"HKD" (.-NumberFormatSymbols_zh_HK goog.i18n) "HKD" (.-NumberFormatSymbols_zh_HK goog.i18n)
"TWD" (.-NumberFormatSymbols_zh_TW goog.i18n)}) "TWD" (.-NumberFormatSymbols_zh_TW goog.i18n)}
nfs (or (get currency-code-to-nfs-map currency-code)
(def custom-nfs (currency-code-to-nfs-map currency-code)) (.-NumberFormatSymbols_en goog.i18n))]
(set! (.-NumberFormatSymbols goog.i18n) (if custom-nfs custom-nfs (.-NumberFormatSymbols_en goog.i18n))) (set! (.-NumberFormatSymbols goog.i18n)
(if currency-symbol?
nfs
(-> nfs
(js->clj :keywordize-keys true)
;; Remove any currency symbol placeholders in the pattern
(update-in [:CURRENCY_PATTERN] #(string/replace % #"\s*¤\s*" ""))
clj->js)))
(.format (.format
(new goog.i18n.NumberFormat (.-CURRENCY goog.i18n.NumberFormat.Format) currency-code) (new goog.i18n.NumberFormat (.-CURRENCY goog.i18n.NumberFormat.Format) currency-code)
value)) value))))

3
src/status_im/ui/screens/wallet/subs.cljs
View File

@ -68,7 +68,8 @@
(-> balance-total-value (-> balance-total-value
(money/with-precision 2) (money/with-precision 2)
str str
(i18n/format-currency (:code currency)))) (i18n/format-currency (:code currency) false)
(->> (str "~"))))
"..."))) "...")))
(re-frame/reg-sub :prices-loading? (re-frame/reg-sub :prices-loading?