address some review comments
commit03b0578902a70665b3f524018720a5de3d2f0f89
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateFri 11 Mar 2016, 14:13 (11 years ago)
parent0e5985e
qml/Wizard/Page.qml+1−1
@@ -131,7 +131,7 @@ Item {
131131 name: "no-simcard"
132132 height: parent.height
133133 width: height
134− visible: !(root.simManager0.present || root.simManager1.present)
134+ visible: !(root.simManager0.present || root.simManager1.present) && root.modemManager.modems.length > 0
135135 color: "white"
136136 }
137137
qml/Wizard/Pages/10-welcome.qml+4−2
@@ -158,10 +158,12 @@ LocalComponents.Page {
158158
159159 if (!root.modemManager.available || !root.modemManager.ready || root.modemManager.modems.length === 0 ||
160160 (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||
161− root.seenSIMPage) // go to next page
161+ root.seenSIMPage) { // go to next page
162162 pageStack.next();
163− else
163+ }
164+ else {
164165 pageStack.load(Qt.resolvedUrl("sim.qml")); // show the SIM page
166+ }
165167 }
166168 }
167169 }
qml/Wizard/Pages/30-wifi.qml−1
@@ -18,7 +18,6 @@ import QtQuick 2.4
1818import QtQuick.Layouts 1.1
1919import QMenuModel 0.1 as QMenuModel
2020import Ubuntu.Components 1.3
21−import Ubuntu.Components.ListItems 1.3
2221import Wizard 0.1
2322import Ubuntu.Connectivity 1.0
2423import ".." as LocalComponents
qml/Wizard/Pages/40-location.qml+3−1
@@ -102,7 +102,9 @@ LocalComponents.Page {
102102 fontSize: "small"
103103 lineHeight: 1.2
104104 linkColor: UbuntuColors.orange
105− text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
105+ text: i18n.tr("By selecting this option you agree to the Nokia HERE") + " <a href='#'>" +
106+ // TRANSLATORS: "terms and conditions" is part of the sentence above
107+ i18n.tr("terms and conditions") + "</a>."
106108 Mouse.forwardTo: hereCheckArea // clicking on the link also selects this group
107109 Mouse.priority: Mouse.AfterItem
108110 onLinkActivated: {
qml/Wizard/Pages/passcode-confirm.qml+1−1
@@ -42,7 +42,7 @@ LocalComponents.Page {
4242
4343 infoText: i18n.tr("Confirm passcode")
4444
45− errorText: i18n.tr("Incorrect passcode.") + "\n" + i18n.tr("Please re-enter.")
45+ errorText: i18n.tr("Incorrect passcode.") + "\n" + i18n.ctr("Enter the passcode again", "Please re-enter.")
4646
4747 foregroundColor: textColor
4848