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.

Sign up for GitHub

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

Confirm modal translations #2132

Merged
merged 8 commits into from
Dec 4, 2022
Merged

Confirm modal translations #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1df723
fix translation display bug for Turkish and Russian
smk762 Nov 30, 2022
fe90716
update a known Turkish translation
smk762 Nov 30, 2022
2c66ad9
update Spanish fees translation; fix warning overflow
smk762 Nov 30, 2022
e9d3675
add Turkish translation for warning
smk762 Dec 1, 2022
be3d894
update translations
smk762 Dec 2, 2022
8098f23
Update Russian translations
smk762 Dec 2, 2022
30d4c27
Add some fr translations
Dec 2, 2022
4cbf9ff
Fix fr translation
Dec 2, 2022
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
3 changes: 0 additions & 3 deletions atomic_defi_design/Dex/Components/DexCheckBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ CheckBox
{
id: _content
Layout.alignment: Qt.AlignVCenter
Layout.preferredWidth: labelWidth
height: _label.height
spacing: 0

Expand All @@ -63,8 +62,6 @@ CheckBox
text: control.text
font: control.font
color: control.textColor
Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true
verticalAlignment: Text.AlignVCenter
leftPadding: control.indicator.width + control.spacing
wrapMode: Label.Wrap
Expand Down
14 changes: 4 additions & 10 deletions atomic_defi_design/Dex/Constants/General.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,16 +374,10 @@ QtObject {
}

function getFeesDetailText(feetype, amount, ticker) {
return qsTr("%1 %2 %3 (%4)"
).arg(
feetype
).arg(
formatDouble(amount, 8, false)
).arg(
ticker
).arg(
General.getFiatText(amount, ticker, false)
)
if ([feetype, amount, ticker].includes(undefined)) return ""
let fiat_text = General.getFiatText(amount, ticker, false)
amount = formatDouble(amount, 8, false).toString()
return feetype + " " + amount + " " + ticker + " (" + fiat_text + ")"
}

function arrayExclude(arr, excl) {
Expand Down
16 changes: 7 additions & 9 deletions atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ MultipageModal
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter

// Large margin Warning
// Large margin warning
FloatingBackground
{
Layout.alignment: Qt.AlignCenter
width: 425
height: 30
width: childrenRect.width
height: childrenRect.height
color: Style.colorRed2
visible: Math.abs(parseFloat(API.app.trading_pg.cex_price_diff)) >= 50

Expand All @@ -94,14 +94,12 @@ MultipageModal
textColor: Style.colorWhite0
visible: Math.abs(parseFloat(API.app.trading_pg.cex_price_diff)) >= 50
spacing: 2
boxWidth: 20
boxHeight: 20
labelWidth: 400
boxWidth: 16
boxHeight: 16
label.wrapMode: Label.NoWrap
text: qsTr("Trade price is more than 50% different to CEX! Confirm?")
font: DexTypo.caption
}

Item { width: 3 }
}
}

Expand Down Expand Up @@ -184,7 +182,7 @@ MultipageModal

Repeater
{
model: root.fees.hasOwnProperty('base_transaction_fees_ticker') ? root.fees.total_fees : []
model: root.fees.hasOwnProperty('base_transaction_fees_ticker') && !API.app.trading_pg.preimage_rpc_busy ? root.fees.total_fees : []
delegate: DefaultText
{
text: General.getFeesDetailText(
Expand Down
230 changes: 105 additions & 125 deletions atomic_defi_design/assets/languages/atomic_defi_de.ts
View file
Open in desktop

Large diffs are not rendered by default.

226 changes: 103 additions & 123 deletions atomic_defi_design/assets/languages/atomic_defi_en.ts
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 109 additions & 129 deletions atomic_defi_design/assets/languages/atomic_defi_es.ts
View file
Open in desktop

Large diffs are not rendered by default.

248 changes: 114 additions & 134 deletions atomic_defi_design/assets/languages/atomic_defi_fr.ts
View file
Open in desktop

Large diffs are not rendered by default.

236 changes: 108 additions & 128 deletions atomic_defi_design/assets/languages/atomic_defi_ru.ts
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 109 additions & 129 deletions atomic_defi_design/assets/languages/atomic_defi_tr.ts
View file
Open in desktop

Large diffs are not rendered by default.