Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: (markets) rework active orders section #26

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set -e
#!/usr/bin/env bash

pushd client/webserver/site
rm -rf dist
npm clean-install
npm run build
popd
Expand Down
19 changes: 10 additions & 9 deletions client/webserver/jsintl.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package webserver
import "decred.org/dcrdex/client/intl"

const (
limitOrderBuySellOutTotalPreview = "LIMIT_ORDER_BUY_SELL_IN_TOTAL_PREVIEW"
limitOrderBuySellInTotalPreview = "LIMIT_ORDER_BUY_SELL_OUT_TOTAL_PREVIEW"
noQuantityExceedsMax = "NO_QUANTITY_EXCEEDS_MAX"
noPassErrMsgID = "NO_PASS_ERROR_MSG"
noAppPassErrMsgID = "NO_APP_PASS_ERROR_MSG"
setButtonBuyID = "SET_BUTTON_BUY"
Expand All @@ -20,7 +23,6 @@ const (
notSupportedID = "NOT_SUPPORTED"
versionNotSupportedID = "VERSION_NOT_SUPPORTED"
connectionFailedID = "CONNECTION_FAILED"
orderPreviewID = "ORDER_PREVIEW"
calculatingID = "CALCULATING"
estimateUnavailableID = "ESTIMATE_UNAVAILABLE"
noZeroRateID = "NO_ZERO_RATE"
Expand Down Expand Up @@ -155,6 +157,7 @@ const (
orderBttnSellBalErrID = "ORDER_BUTTON_SELL_BALANCE_ERROR"
orderBttnQtyErrID = "ORDER_BUTTON_QTY_ERROR"
orderBttnQtyRateErrID = "ORDER_BUTTON_QTY_RATE_ERROR"
enableAssetWalletMsgID = "ENABLE_ASSET_WALLET_MSG"
createAssetWalletMsgID = "CREATE_ASSET_WALLET_MSG"
noWalletMsgID = "NO_WALLET_MSG"
tradingTierUpdateddID = "TRADING_TIER_UPDATED"
Expand Down Expand Up @@ -222,11 +225,14 @@ const (
)

var enUS = map[string]*intl.Translation{
limitOrderBuySellOutTotalPreview: {T: "+{{ total }} {{ asset }}"},
limitOrderBuySellInTotalPreview: {T: "-{{ total }} {{ asset }}"},
noQuantityExceedsMax: {T: "not enough funds"},
noPassErrMsgID: {T: "password cannot be empty"},
noAppPassErrMsgID: {T: "app password cannot be empty"},
passwordNotMatchID: {T: "passwords do not match"},
setButtonBuyID: {T: "Place order to buy {{ asset }}"},
setButtonSellID: {T: "Place order to sell {{ asset }}"},
setButtonBuyID: {T: "Buy {{ asset }}"},
setButtonSellID: {T: "Sell {{ asset }}"},
orderBttnBuyBalErrID: {T: "Insufficient balance to buy."},
orderBttnSellBalErrID: {T: "Insufficient balance to sell."},
orderBttnQtyErrID: {T: "Order quantity must be specified."},
Expand All @@ -243,7 +249,6 @@ var enUS = map[string]*intl.Translation{
notSupportedID: {T: "{{ asset }} is not supported"},
versionNotSupportedID: {T: "{{ asset }} (v{{version}}) is not supported"},
connectionFailedID: {T: "Connection to dex server failed. You can close bisonw and try again later or wait for it to reconnect."},
orderPreviewID: {T: "Total: {{ total }} {{ asset }}"},
calculatingID: {T: "calculating..."},
estimateUnavailableID: {T: "estimate unavailable"},
noZeroRateID: {T: "zero rate not allowed"},
Expand Down Expand Up @@ -372,6 +377,7 @@ var enUS = map[string]*intl.Translation{
browserNtfnMatchesID: {T: "Matches"},
browserNtfnBondsID: {T: "Bonds"},
browserNtfnConnectionsID: {T: "Server connections"},
enableAssetWalletMsgID: {T: "Enable / Activate a {{ asset }} wallet to trade"},
createAssetWalletMsgID: {T: "Create a {{ asset }} wallet to trade"},
noWalletMsgID: {T: "Create {{ asset1 }} and {{ asset2 }} wallet to trade"},
tradingTierUpdateddID: {T: "Trading Tier Updated"},
Expand Down Expand Up @@ -456,7 +462,6 @@ var ptBR = map[string]*intl.Translation{
sellID: {T: "Vender"},
notSupportedID: {T: "{{ asset }} não tem suporte"},
connectionFailedID: {T: "Conexão ao server dex falhou. Pode fechar bisonw e tentar novamente depois ou esperar para tentar se reconectar."},
orderPreviewID: {T: "Total: {{ total }} {{ asset }}"},
calculatingID: {T: "calculando..."},
estimateUnavailableID: {T: "estimativa indisponível"},
noZeroRateID: {T: "taxa não pode ser zero"},
Expand Down Expand Up @@ -510,7 +515,6 @@ var zhCN = map[string]*intl.Translation{
sellID: {T: "卖出"},
notSupportedID: {T: "{{ asset }}不受支持"},
connectionFailedID: {T: "连接到服务器 dex 失败。您可以关闭 bisonw 并稍后重试或等待尝试重新连接。"},
orderPreviewID: {T: "总计: {{ total }} {{ asset }}"},
calculatingID: {T: "计算中..."},
estimateUnavailableID: {T: "估计不可用"},
noZeroRateID: {T: "汇率不能为零"},
Expand Down Expand Up @@ -553,7 +557,6 @@ var plPL = map[string]*intl.Translation{
sellID: {T: "Sprzedaj"},
notSupportedID: {T: "{{ asset }} nie jest wspierany"},
connectionFailedID: {T: "Połączenie z serwerem dex nie powiodło się. Możesz zamknąć bisonw i spróbować ponownie później, lub poczekać na wznowienie połączenia."},
orderPreviewID: {T: "W sumie: {{ total }} {{ asset }}"},
calculatingID: {T: "obliczanie..."},
estimateUnavailableID: {T: "brak szacunkowego wyliczenia"},
noZeroRateID: {T: "zero nie może być ceną"},
Expand Down Expand Up @@ -737,7 +740,6 @@ var deDE = map[string]*intl.Translation{
sellID: {T: "Verkaufen"},
notSupportedID: {T: "{{ asset }} wird nicht unterstützt"},
connectionFailedID: {T: "Die Verbindung zum Dex-Server fehlgeschlagen. Du kannst bisonw schließen und es später erneut versuchen oder warten bis die Verbindung wiederhergestellt ist."},
orderPreviewID: {T: "Insgesamt: {{ total }} {{ asset }}"},
calculatingID: {T: "kalkuliere..."},
estimateUnavailableID: {T: "Schätzung nicht verfügbar"},
noZeroRateID: {T: "Null-Satz nicht erlaubt"},
Expand Down Expand Up @@ -794,7 +796,6 @@ var ar = map[string]*intl.Translation{
sellID: {T: "بيع"},
notSupportedID: {T: "{{ asset }} غير مدعوم"},
connectionFailedID: {T: "فشل الاتصال بخادم dex. يمكنك إغلاق dexc والمحاولة مرة أخرى لاحقًا أو انتظار إعادة الاتصال."},
orderPreviewID: {T: "إجمالي: {{ total }} {{ asset }}"},
calculatingID: {T: "جاري الحساب ..."},
estimateUnavailableID: {T: "التقديرات غير متاحة"},
noZeroRateID: {T: "معدل الصفر غير مسموح به"},
Expand Down
Loading
Loading