Apply translation for "normal" mode

This commit is contained in:
Ilya Kitaev 2016-07-19 23:45:12 +03:00
parent a9339838ac
commit 39b88daf32
10 changed files with 122 additions and 134 deletions

View file

@ -100,7 +100,7 @@ Rectangle {
spacing: 6
Label {
text: qsTr("Balance")
text: qsTr("Balance") + translationManager.emptyString
anchors.left: parent.left
anchors.leftMargin: 50
tipText: qsTr("Test tip 1<br/><br/>line 2")

View file

@ -125,8 +125,16 @@ ApplicationWindow {
function initialize() {
console.log("initializing..")
// setup language
var locale = persistentSettings.locale
if (locale !== "") {
translationManager.setLanguage(locale.split("_")[0]);
}
middlePanel.paymentClicked.connect(handlePayment);
if (typeof wizard.settings['wallet'] !== 'undefined') {
wallet = wizard.settings['wallet'];
} else {
@ -262,6 +270,7 @@ ApplicationWindow {
Settings {
id: persistentSettings
property string language
property string locale
property string account_name
property string wallet_path
property bool auto_donations_enabled : true

View file

@ -582,7 +582,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardMain.qml" line="308"/>
<location filename="../wizard/WizardMain.qml" line="309"/>
<source>USE MONERO</source>
<translation type="unfinished"></translation>
</message>
@ -666,13 +666,12 @@
<context>
<name>WizardWelcome</name>
<message>
<location filename="../wizard/WizardWelcome.qml" line="49"/>
<location filename="../wizard/WizardWelcome.qml" line="73"/>
<location filename="../wizard/WizardWelcome.qml" line="69"/>
<source>Welcome</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardWelcome.qml" line="86"/>
<location filename="../wizard/WizardWelcome.qml" line="82"/>
<source>Please choose a language and regional format.</source>
<translation type="unfinished"></translation>
</message>
@ -680,75 +679,75 @@
<context>
<name>main</name>
<message>
<location filename="../main.qml" line="140"/>
<location filename="../main.qml" line="195"/>
<location filename="../main.qml" line="224"/>
<location filename="../main.qml" line="148"/>
<location filename="../main.qml" line="203"/>
<location filename="../main.qml" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="141"/>
<location filename="../main.qml" line="149"/>
<source>Couldn&apos;t open wallet: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="196"/>
<location filename="../main.qml" line="204"/>
<source>Can&apos;t create transaction: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="208"/>
<location filename="../main.qml" line="216"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="209"/>
<location filename="../main.qml" line="217"/>
<source>Please confirm transaction:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="210"/>
<location filename="../main.qml" line="218"/>
<source>
Address: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="211"/>
<location filename="../main.qml" line="219"/>
<source>
Payment ID: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="212"/>
<location filename="../main.qml" line="220"/>
<source>
Amount: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="213"/>
<location filename="../main.qml" line="221"/>
<source>
Fee: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="225"/>
<location filename="../main.qml" line="233"/>
<source>Couldn&apos;t send the money: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="228"/>
<location filename="../main.qml" line="236"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="229"/>
<location filename="../main.qml" line="237"/>
<source>Money sent successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="300"/>
<location filename="../main.qml" line="309"/>
<source>Initializing Wallet...</source>
<translation type="unfinished"></translation>
</message>

View file

@ -582,7 +582,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardMain.qml" line="308"/>
<location filename="../wizard/WizardMain.qml" line="309"/>
<source>USE MONERO</source>
<translation type="unfinished"></translation>
</message>
@ -666,13 +666,12 @@
<context>
<name>WizardWelcome</name>
<message>
<location filename="../wizard/WizardWelcome.qml" line="49"/>
<location filename="../wizard/WizardWelcome.qml" line="73"/>
<location filename="../wizard/WizardWelcome.qml" line="69"/>
<source>Welcome</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardWelcome.qml" line="86"/>
<location filename="../wizard/WizardWelcome.qml" line="82"/>
<source>Please choose a language and regional format.</source>
<translation type="unfinished"></translation>
</message>
@ -680,75 +679,75 @@
<context>
<name>main</name>
<message>
<location filename="../main.qml" line="140"/>
<location filename="../main.qml" line="195"/>
<location filename="../main.qml" line="224"/>
<location filename="../main.qml" line="148"/>
<location filename="../main.qml" line="203"/>
<location filename="../main.qml" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="141"/>
<location filename="../main.qml" line="149"/>
<source>Couldn&apos;t open wallet: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="196"/>
<location filename="../main.qml" line="204"/>
<source>Can&apos;t create transaction: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="208"/>
<location filename="../main.qml" line="216"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="209"/>
<location filename="../main.qml" line="217"/>
<source>Please confirm transaction:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="210"/>
<location filename="../main.qml" line="218"/>
<source>
Address: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="211"/>
<location filename="../main.qml" line="219"/>
<source>
Payment ID: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="212"/>
<location filename="../main.qml" line="220"/>
<source>
Amount: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="213"/>
<location filename="../main.qml" line="221"/>
<source>
Fee: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="225"/>
<location filename="../main.qml" line="233"/>
<source>Couldn&apos;t send the money: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="228"/>
<location filename="../main.qml" line="236"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="229"/>
<location filename="../main.qml" line="237"/>
<source>Money sent successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="300"/>
<location filename="../main.qml" line="309"/>
<source>Initializing Wallet...</source>
<translation type="unfinished"></translation>
</message>

View file

@ -582,7 +582,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardMain.qml" line="308"/>
<location filename="../wizard/WizardMain.qml" line="309"/>
<source>USE MONERO</source>
<translation type="unfinished"></translation>
</message>
@ -666,13 +666,12 @@
<context>
<name>WizardWelcome</name>
<message>
<location filename="../wizard/WizardWelcome.qml" line="49"/>
<location filename="../wizard/WizardWelcome.qml" line="73"/>
<location filename="../wizard/WizardWelcome.qml" line="69"/>
<source>Welcome</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardWelcome.qml" line="86"/>
<location filename="../wizard/WizardWelcome.qml" line="82"/>
<source>Please choose a language and regional format.</source>
<translation type="unfinished"></translation>
</message>
@ -680,75 +679,75 @@
<context>
<name>main</name>
<message>
<location filename="../main.qml" line="140"/>
<location filename="../main.qml" line="195"/>
<location filename="../main.qml" line="224"/>
<location filename="../main.qml" line="148"/>
<location filename="../main.qml" line="203"/>
<location filename="../main.qml" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="141"/>
<location filename="../main.qml" line="149"/>
<source>Couldn&apos;t open wallet: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="196"/>
<location filename="../main.qml" line="204"/>
<source>Can&apos;t create transaction: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="208"/>
<location filename="../main.qml" line="216"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="209"/>
<location filename="../main.qml" line="217"/>
<source>Please confirm transaction:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="210"/>
<location filename="../main.qml" line="218"/>
<source>
Address: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="211"/>
<location filename="../main.qml" line="219"/>
<source>
Payment ID: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="212"/>
<location filename="../main.qml" line="220"/>
<source>
Amount: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="213"/>
<location filename="../main.qml" line="221"/>
<source>
Fee: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="225"/>
<location filename="../main.qml" line="233"/>
<source>Couldn&apos;t send the money: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="228"/>
<location filename="../main.qml" line="236"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="229"/>
<location filename="../main.qml" line="237"/>
<source>Money sent successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="300"/>
<location filename="../main.qml" line="309"/>
<source>Initializing Wallet...</source>
<translation type="unfinished"></translation>
</message>

View file

@ -582,7 +582,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardMain.qml" line="308"/>
<location filename="../wizard/WizardMain.qml" line="309"/>
<source>USE MONERO</source>
<translation type="unfinished"></translation>
</message>
@ -666,13 +666,12 @@
<context>
<name>WizardWelcome</name>
<message>
<location filename="../wizard/WizardWelcome.qml" line="49"/>
<location filename="../wizard/WizardWelcome.qml" line="73"/>
<location filename="../wizard/WizardWelcome.qml" line="69"/>
<source>Welcome</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardWelcome.qml" line="86"/>
<location filename="../wizard/WizardWelcome.qml" line="82"/>
<source>Please choose a language and regional format.</source>
<translation type="unfinished"></translation>
</message>
@ -680,75 +679,75 @@
<context>
<name>main</name>
<message>
<location filename="../main.qml" line="140"/>
<location filename="../main.qml" line="195"/>
<location filename="../main.qml" line="224"/>
<location filename="../main.qml" line="148"/>
<location filename="../main.qml" line="203"/>
<location filename="../main.qml" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="141"/>
<location filename="../main.qml" line="149"/>
<source>Couldn&apos;t open wallet: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="196"/>
<location filename="../main.qml" line="204"/>
<source>Can&apos;t create transaction: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="208"/>
<location filename="../main.qml" line="216"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="209"/>
<location filename="../main.qml" line="217"/>
<source>Please confirm transaction:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="210"/>
<location filename="../main.qml" line="218"/>
<source>
Address: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="211"/>
<location filename="../main.qml" line="219"/>
<source>
Payment ID: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="212"/>
<location filename="../main.qml" line="220"/>
<source>
Amount: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="213"/>
<location filename="../main.qml" line="221"/>
<source>
Fee: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="225"/>
<location filename="../main.qml" line="233"/>
<source>Couldn&apos;t send the money: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="228"/>
<location filename="../main.qml" line="236"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="229"/>
<location filename="../main.qml" line="237"/>
<source>Money sent successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="300"/>
<location filename="../main.qml" line="309"/>
<source>Initializing Wallet...</source>
<translation type="unfinished"></translation>
</message>

View file

@ -138,7 +138,7 @@
<message>
<location filename="../components/DashboardTable.qml" line="172"/>
<source>Balance</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Баланс</translation>
</message>
<message>
<location filename="../components/DashboardTable.qml" line="193"/>
@ -240,7 +240,7 @@
<message>
<location filename="../components/HistoryTable.qml" line="202"/>
<source>Balance</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Баланс</translation>
</message>
<message>
<location filename="../components/HistoryTable.qml" line="223"/>
@ -253,7 +253,7 @@
<message>
<location filename="../LeftPanel.qml" line="103"/>
<source>Balance</source>
<translation type="unfinished"></translation>
<translation>Баланс</translation>
</message>
<message>
<location filename="../LeftPanel.qml" line="106"/>
@ -582,7 +582,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardMain.qml" line="308"/>
<location filename="../wizard/WizardMain.qml" line="309"/>
<source>USE MONERO</source>
<translation type="unfinished"></translation>
</message>
@ -666,13 +666,12 @@
<context>
<name>WizardWelcome</name>
<message>
<location filename="../wizard/WizardWelcome.qml" line="49"/>
<location filename="../wizard/WizardWelcome.qml" line="73"/>
<location filename="../wizard/WizardWelcome.qml" line="69"/>
<source>Welcome</source>
<translation>Добро пожаловать</translation>
</message>
<message>
<location filename="../wizard/WizardWelcome.qml" line="86"/>
<location filename="../wizard/WizardWelcome.qml" line="82"/>
<source>Please choose a language and regional format.</source>
<translation>Пожалуйста выберите язык и региональный формат.</translation>
</message>
@ -680,75 +679,75 @@
<context>
<name>main</name>
<message>
<location filename="../main.qml" line="140"/>
<location filename="../main.qml" line="195"/>
<location filename="../main.qml" line="224"/>
<location filename="../main.qml" line="148"/>
<location filename="../main.qml" line="203"/>
<location filename="../main.qml" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="141"/>
<location filename="../main.qml" line="149"/>
<source>Couldn&apos;t open wallet: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="196"/>
<location filename="../main.qml" line="204"/>
<source>Can&apos;t create transaction: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="208"/>
<location filename="../main.qml" line="216"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="209"/>
<location filename="../main.qml" line="217"/>
<source>Please confirm transaction:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="210"/>
<location filename="../main.qml" line="218"/>
<source>
Address: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="211"/>
<location filename="../main.qml" line="219"/>
<source>
Payment ID: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="212"/>
<location filename="../main.qml" line="220"/>
<source>
Amount: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="213"/>
<location filename="../main.qml" line="221"/>
<source>
Fee: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="225"/>
<location filename="../main.qml" line="233"/>
<source>Couldn&apos;t send the money: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="228"/>
<location filename="../main.qml" line="236"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="229"/>
<location filename="../main.qml" line="237"/>
<source>Money sent successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="300"/>
<location filename="../main.qml" line="309"/>
<source>Initializing Wallet...</source>
<translation type="unfinished"></translation>
</message>

View file

@ -582,7 +582,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardMain.qml" line="308"/>
<location filename="../wizard/WizardMain.qml" line="309"/>
<source>USE MONERO</source>
<translation type="unfinished"></translation>
</message>
@ -666,13 +666,12 @@
<context>
<name>WizardWelcome</name>
<message>
<location filename="../wizard/WizardWelcome.qml" line="49"/>
<location filename="../wizard/WizardWelcome.qml" line="73"/>
<location filename="../wizard/WizardWelcome.qml" line="69"/>
<source>Welcome</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizard/WizardWelcome.qml" line="86"/>
<location filename="../wizard/WizardWelcome.qml" line="82"/>
<source>Please choose a language and regional format.</source>
<translation type="unfinished"></translation>
</message>
@ -680,75 +679,75 @@
<context>
<name>main</name>
<message>
<location filename="../main.qml" line="140"/>
<location filename="../main.qml" line="195"/>
<location filename="../main.qml" line="224"/>
<location filename="../main.qml" line="148"/>
<location filename="../main.qml" line="203"/>
<location filename="../main.qml" line="232"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="141"/>
<location filename="../main.qml" line="149"/>
<source>Couldn&apos;t open wallet: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="196"/>
<location filename="../main.qml" line="204"/>
<source>Can&apos;t create transaction: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="208"/>
<location filename="../main.qml" line="216"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="209"/>
<location filename="../main.qml" line="217"/>
<source>Please confirm transaction:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="210"/>
<location filename="../main.qml" line="218"/>
<source>
Address: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="211"/>
<location filename="../main.qml" line="219"/>
<source>
Payment ID: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="212"/>
<location filename="../main.qml" line="220"/>
<source>
Amount: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="213"/>
<location filename="../main.qml" line="221"/>
<source>
Fee: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="225"/>
<location filename="../main.qml" line="233"/>
<source>Couldn&apos;t send the money: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="228"/>
<location filename="../main.qml" line="236"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="229"/>
<location filename="../main.qml" line="237"/>
<source>Money sent successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="300"/>
<location filename="../main.qml" line="309"/>
<source>Initializing Wallet...</source>
<translation type="unfinished"></translation>
</message>

View file

@ -147,6 +147,7 @@ Rectangle {
// persist settings
appWindow.persistentSettings.language = settings.language
appWindow.persistentSettings.locale = settings.locale
appWindow.persistentSettings.account_name = settings.account_name
appWindow.persistentSettings.wallet_path = settings.wallet_path
appWindow.persistentSettings.allow_background_mining = settings.allow_background_mining

View file

@ -45,19 +45,6 @@ Item {
}
// function retranslateUi() {
// welcomeText.text = qsTr("Welcome")
// }
// Connections {
// target: translationManager
// onEmptyStringChanged: {
// console.log("languageChanged")
// retranslateUi()
// }
// }
Column {
id: headerColumn
anchors.left: parent.left
@ -132,9 +119,6 @@ Item {
width: gridView.cellWidth
height: gridView.cellHeight
Rectangle {
id: flagRect
width: 60; height: 60