git.iko.soy/unity8
on xenial help sign in
make it better translatable
6be9c8dMichael Zanetti
qml/Shell.qml+11−5
compare with xenial
unifiedsplit
@@ -261,13 +261,19 @@ Item {
261
261
262 onShowPrompt: {
262 onShowPrompt: {
263 if (greeter.narrowMode) {
263 if (greeter.narrowMode) {
264− var promptText = text.toLowerCase()
265 if (isDefaultPrompt) {
264 if (isDefaultPrompt) {
266− promptText = lockscreen.alphaNumeric ?
265+ if (lockscreen.alphaNumeric) {
267− i18n.tr("passphrase") : i18n.tr("passcode")
266+ lockscreen.infoText = i18n.tr("Enter your passphrase")
267+ lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase")
268+ } else {
269+ lockscreen.infoText = i18n.tr("Enter your passcode")
270+ lockscreen.errorText = i18n.tr("Sorry, incorrect passcode")
271+ }
272+ } else {
273+ lockscreen.infoText = i18n.tr("Enter your %1").arg(text.toLowerCase())
274+ lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(text.toLowerCase())
268 }
275 }
269− lockscreen.infoText = i18n.tr("Enter your %1").arg(promptText)
276+
270− lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(promptText)
271 lockscreen.show();
277 lockscreen.show();
272 }
278 }
273 }
279 }