on xenial help sign in
cleanup strings and debug print as per review
8a35824Michael Zanetti
qml/Notifications/NotificationMenuItemFactory.qml+1−1
@@ -117,7 +117,7 @@ Loader {
117 right: parent.right
117 right: parent.right
118 }
118 }
119 height: menuFactory.maxHeight
119 height: menuFactory.maxHeight
120− infoText: i18n.tr("Please enter SIM PIN")
120+ infoText: i18n.tr("Enter SIM PIN")
121 errorText: i18n.tr("Sorry, incorrect PIN")
121 errorText: i18n.tr("Sorry, incorrect PIN")
122 minPinLength: 4
122 minPinLength: 4
123 maxPinLength: 8
123 maxPinLength: 8
qml/Shell.qml+1−3
@@ -267,7 +267,7 @@ Item {
267 i18n.tr("passphrase") : i18n.tr("passcode")
267 i18n.tr("passphrase") : i18n.tr("passcode")
268 }
268 }
269 lockscreen.infoText = i18n.tr("Enter your %1").arg(promptText)
269 lockscreen.infoText = i18n.tr("Enter your %1").arg(promptText)
270− lockscreen.errorText = i18n.tr("Incorrect %1").arg(promptText)
270+ lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(promptText)
271 lockscreen.show();
271 lockscreen.show();
272 }
272 }
273 }
273 }
@@ -289,7 +289,6 @@ Item {
289 // prompted for a password. We do this below after the promptless
289 // prompted for a password. We do this below after the promptless
290 // early exit.
290 // early exit.
291
291
292− print("huppppa")
293 if (LightDM.Greeter.promptless) {
292 if (LightDM.Greeter.promptless) {
294 return;
293 return;
295 }
294 }
@@ -299,7 +298,6 @@ Item {
299 greeter.login();
298 greeter.login();
300 } else {
299 } else {
301 AccountsService.failedLogins++
300 AccountsService.failedLogins++
302− print("auth failed. failed logins", AccountsService.failedLogins, "max", maxFailedLogins)
303 if (maxFailedLogins >= 2) { // require at least a warning
301 if (maxFailedLogins >= 2) { // require at least a warning
304 if (AccountsService.failedLogins === maxFailedLogins - 1) {
302 if (AccountsService.failedLogins === maxFailedLogins - 1) {
305 var title = lockscreen.alphaNumeric ?
303 var title = lockscreen.alphaNumeric ?