diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-07-03 11:45:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-07-03 11:45:25 +0200 |
| commit | e9b6c510f4bf552e946ae55ef12e081b99882eb3 (patch) | |
| tree | 61a41abbb7dcc9008f0df6274f88cc85caa7db8c | |
| parent | 5d789417127e6abef5a50468a3120f1ced50ec01 (diff) | |
| parent | 92c0e00b1246ca4d56b1296cb6c7738819802aac (diff) | |
| download | monzero-gui-e9b6c510f4bf552e946ae55ef12e081b99882eb3.tar.gz monzero-gui-e9b6c510f4bf552e946ae55ef12e081b99882eb3.tar.xz monzero-gui-e9b6c510f4bf552e946ae55ef12e081b99882eb3.zip | |
Merge pull request #775
92c0e00 Add missing strings for ListElement property workaround (Guillaume LE VAILLANT)
| -rw-r--r-- | components/StandardDropdown.qml | 4 | ||||
| -rw-r--r-- | pages/Transfer.qml | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml index 34d63f87..50b60fe0 100644 --- a/components/StandardDropdown.qml +++ b/components/StandardDropdown.qml @@ -197,6 +197,10 @@ Item { property string stringLow: qsTr("Low (x1 fee)") + translationManager.emptyString property string stringMedium: qsTr("Medium (x20 fee)") + translationManager.emptyString property string stringHigh: qsTr("High (x166 fee)") + translationManager.emptyString + property string stringSlow: qsTr("Slow (x0.25 fee)") + translationManager.emptyString + property string stringDefault: qsTr("Default (x1 fee)") + translationManager.emptyString + property string stringFast: qsTr("Fast (x5 fee)") + translationManager.emptyString + property string stringFastest: qsTr("Fastest (x41.5 fee)") + translationManager.emptyString property string stringAll: qsTr("All") + translationManager.emptyString property string stringSent: qsTr("Sent") + translationManager.emptyString property string stringReceived: qsTr("Received") + translationManager.emptyString diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 7a3202ff..6dbe21f4 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -183,12 +183,16 @@ Rectangle { } + // Note: workaround for translations in listElements + // ListElement: cannot use script for property value, so + // code like this wont work: + // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low } + // For translations to work, the strings need to be listed in + // the file components/StandardDropdown.qml too. + // Priorities before v5 ListModel { id: priorityModel - // ListElement: cannot use script for property value, so - // code like this wont work: - // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low } ListElement { column1: qsTr("Low (x1 fee)") ; column2: ""; priority: PendingTransaction.Priority_Low } ListElement { column1: qsTr("Medium (x20 fee)") ; column2: ""; priority: PendingTransaction.Priority_Medium } |