Skip to content

Commit 3365785

Browse files
metsmametsma
authored
Fix accessible text and cleanup code (#1092)
IB-7445 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 4c2ec10 commit 3365785

File tree

4 files changed

+65
-112
lines changed

4 files changed

+65
-112
lines changed

‎client/translations/en.ts‎

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.1" language="en">
3+
<TS version="2.1" language="en_US">
44
<context>
55
<name>AccessCert</name>
66
<message>
@@ -2967,12 +2967,28 @@ Additional licenses and components</translation>
29672967
<context>
29682968
<name>SignatureItem</name>
29692969
<message>
2970-
<source>Signature</source>
2971-
<translation>Signature</translation>
2970+
<source>Signature is valid</source>
2971+
<translation>Signature is valid</translation>
29722972
</message>
29732973
<message>
2974-
<source>Timestamp</source>
2975-
<translation>Timestamp</translation>
2974+
<source>Timestamp is valid</source>
2975+
<translation>Timestamp is valid</translation>
2976+
</message>
2977+
<message>
2978+
<source>Signature is not valid</source>
2979+
<translation>Signature is not valid</translation>
2980+
</message>
2981+
<message>
2982+
<source>Timestamp is not valid</source>
2983+
<translation>Timestamp is not valid</translation>
2984+
</message>
2985+
<message>
2986+
<source>Signature is unknown</source>
2987+
<translation>Signature is unknown</translation>
2988+
</message>
2989+
<message>
2990+
<source>Timestamp is unknown</source>
2991+
<translation>Timestamp is unknown</translation>
29762992
</message>
29772993
<message>
29782994
<source>Warnings</source>
@@ -3006,36 +3022,6 @@ Additional licenses and components</translation>
30063022
<source>OK</source>
30073023
<translation>OK</translation>
30083024
</message>
3009-
<message>
3010-
<source>is valid</source>
3011-
<comment>Signature</comment>
3012-
<translation>is valid</translation>
3013-
</message>
3014-
<message>
3015-
<source>is valid</source>
3016-
<comment>Timestamp</comment>
3017-
<translation>is valid</translation>
3018-
</message>
3019-
<message>
3020-
<source>is not valid</source>
3021-
<comment>Signature</comment>
3022-
<translation>is not valid</translation>
3023-
</message>
3024-
<message>
3025-
<source>is not valid</source>
3026-
<comment>Timestamp</comment>
3027-
<translation>is not valid</translation>
3028-
</message>
3029-
<message>
3030-
<source>is unknown</source>
3031-
<comment>Signature</comment>
3032-
<translation>is unknown</translation>
3033-
</message>
3034-
<message>
3035-
<source>is unknown</source>
3036-
<comment>Timestamp</comment>
3037-
<translation>is unknown</translation>
3038-
</message>
30393025
<message>
30403026
<source>Remove signature</source>
30413027
<extracomment>accessible</extracomment>

‎client/translations/et.ts‎

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.1" language="et">
3+
<TS version="2.1" language="et_EE">
44
<context>
55
<name>AccessCert</name>
66
<message>
@@ -2967,12 +2967,28 @@ Täiendavad litsentsid ja komponendid</translation>
29672967
<context>
29682968
<name>SignatureItem</name>
29692969
<message>
2970-
<source>Signature</source>
2971-
<translation>Allkiri</translation>
2970+
<source>Signature is valid</source>
2971+
<translation>Allkiri on kehtiv</translation>
29722972
</message>
29732973
<message>
2974-
<source>Timestamp</source>
2975-
<translation>Ajatempel</translation>
2974+
<source>Timestamp is valid</source>
2975+
<translation>Ajatempel on kehtiv</translation>
2976+
</message>
2977+
<message>
2978+
<source>Signature is not valid</source>
2979+
<translation>Allkiri ei ole kehtiv</translation>
2980+
</message>
2981+
<message>
2982+
<source>Timestamp is not valid</source>
2983+
<translation>Ajatempel ei ole kehtiv</translation>
2984+
</message>
2985+
<message>
2986+
<source>Signature is unknown</source>
2987+
<translation>Allkiri on teadmata</translation>
2988+
</message>
2989+
<message>
2990+
<source>Timestamp is unknown</source>
2991+
<translation>Ajatempel on teadmata</translation>
29762992
</message>
29772993
<message>
29782994
<source>Warnings</source>
@@ -3006,36 +3022,6 @@ Täiendavad litsentsid ja komponendid</translation>
30063022
<source>OK</source>
30073023
<translation>OK</translation>
30083024
</message>
3009-
<message>
3010-
<source>is valid</source>
3011-
<comment>Signature</comment>
3012-
<translation>on kehtiv</translation>
3013-
</message>
3014-
<message>
3015-
<source>is valid</source>
3016-
<comment>Timestamp</comment>
3017-
<translation>on kehtiv</translation>
3018-
</message>
3019-
<message>
3020-
<source>is not valid</source>
3021-
<comment>Signature</comment>
3022-
<translation>ei ole kehtiv</translation>
3023-
</message>
3024-
<message>
3025-
<source>is not valid</source>
3026-
<comment>Timestamp</comment>
3027-
<translation>ei ole kehtiv</translation>
3028-
</message>
3029-
<message>
3030-
<source>is unknown</source>
3031-
<comment>Signature</comment>
3032-
<translation>on teadmata</translation>
3033-
</message>
3034-
<message>
3035-
<source>is unknown</source>
3036-
<comment>Timestamp</comment>
3037-
<translation>on teadmata</translation>
3038-
</message>
30393025
<message>
30403026
<source>Remove signature</source>
30413027
<extracomment>accessible</extracomment>

‎client/translations/ru.ts‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.1" language="ru">
3+
<TS version="2.1" language="ru_RU">
44
<context>
55
<name>AccessCert</name>
66
<message>
@@ -2969,14 +2969,6 @@ Additional licenses and components</source>
29692969
</context>
29702970
<context>
29712971
<name>SignatureItem</name>
2972-
<message>
2973-
<source>Signature</source>
2974-
<translation>Подпись</translation>
2975-
</message>
2976-
<message>
2977-
<source>Timestamp</source>
2978-
<translation>Временной штамп</translation>
2979-
</message>
29802972
<message>
29812973
<source>Warnings</source>
29822974
<translation>Предупреждения</translation>
@@ -2990,34 +2982,28 @@ Additional licenses and components</source>
29902982
<translation>Пробная подпись</translation>
29912983
</message>
29922984
<message>
2993-
<source>is valid</source>
2994-
<comment>Signature</comment>
2995-
<translation>действительна</translation>
2985+
<source>Signature is valid</source>
2986+
<translation>Подпись действительна</translation>
29962987
</message>
29972988
<message>
2998-
<source>is valid</source>
2999-
<comment>Timestamp</comment>
3000-
<translation>действителен</translation>
2989+
<source>Timestamp is valid</source>
2990+
<translation>Временной штамп действителен</translation>
30012991
</message>
30022992
<message>
3003-
<source>is not valid</source>
3004-
<comment>Signature</comment>
3005-
<translation>недействительна</translation>
2993+
<source>Signature is not valid</source>
2994+
<translation>Подпись недействительна</translation>
30062995
</message>
30072996
<message>
3008-
<source>is not valid</source>
3009-
<comment>Timestamp</comment>
3010-
<translation>недействителен</translation>
2997+
<source>Timestamp is not valid</source>
2998+
<translation>Временной штамп недействителен</translation>
30112999
</message>
30123000
<message>
3013-
<source>is unknown</source>
3014-
<comment>Signature</comment>
3015-
<translation>неизвестная</translation>
3001+
<source>Signature is unknown</source>
3002+
<translation>Подпись неизвестная</translation>
30163003
</message>
30173004
<message>
3018-
<source>is unknown</source>
3019-
<comment>Timestamp</comment>
3020-
<translation>неизвестный</translation>
3005+
<source>Timestamp is unknown</source>
3006+
<translation>Временной штамп неизвестный</translation>
30213007
</message>
30223008
<message>
30233009
<source>Signed on</source>

‎client/widgets/SignatureItem.cpp‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,9 @@ void SignatureItem::init()
9191

9292
QTextStream s(&ui->status);
9393
bool isSignature = true;
94-
QString label = tr("Signature");
9594
if(ui->signature.profile() == QStringLiteral("TimeStampToken"))
9695
{
9796
isSignature = false;
98-
label = tr("Timestamp");
9997
ui->icon->load(QStringLiteral(":/images/icon_ajatempel.svg"));
10098
}
10199
else if(cert.type() & SslCertificate::TempelType)
@@ -104,35 +102,32 @@ void SignatureItem::init()
104102
ui->icon->load(QStringLiteral(":/images/icon_Allkiri_small.svg"));
105103
s << "<span style=\"font-weight:normal;\">";
106104
auto isValid = [&isSignature] {
107-
return isSignature ? tr("is valid", "Signature") : tr("is valid", "Timestamp");
105+
return isSignature ? tr("Signature is valid") : tr("Timestamp is valid");
108106
};
109-
auto isNotValid = [&isSignature] {
110-
return isSignature ? tr("is not valid", "Signature") : tr("is not valid", "Timestamp");
111-
};
112-
auto isUnknown = [&isSignature] {
113-
return isSignature ? tr("is unknown", "Signature") : tr("is unknown", "Timestamp");
107+
auto color = [](QLatin1String color, const QString &text) {
108+
return QStringLiteral("<font color=\"%1\">%2</font>").arg(color, text);
114109
};
115110
switch( signatureValidity )
116111
{
117112
case DigiDocSignature::Valid:
118-
s << "<font color=\"green\">" << label << " " << isValid() << "</font>";
113+
s << color(QLatin1String("green"), isValid());
119114
break;
120115
case DigiDocSignature::Warning:
121-
s << "<font color=\"green\">" << label << " " << isValid() << "</font> <font color=\"#996C0B\">(" << tr("Warnings") << ")";
116+
s << color(QLatin1String("green"), isValid()) << " " << color(QLatin1String("#996C0B"), QStringLiteral("(%1)").arg(tr("Warnings")));
122117
break;
123118
case DigiDocSignature::NonQSCD:
124-
s << "<font color=\"green\">" << label << " " << isValid() << "</font> <font color=\"#996C0B\">(" << tr("Restrictions") << ")";
119+
s << color(QLatin1String("green"), isValid()) << " " << color(QLatin1String("#996C0B"), QStringLiteral("(%1)").arg(tr("Restrictions")));
125120
break;
126121
case DigiDocSignature::Test:
127-
s << "<font color=\"green\">" << label << " " << isValid() << "</font> <font>(" << tr("Test signature") << ")";
122+
s << color(QLatin1String("green"), isValid()) << " (" << tr("Test signature") << ")";
128123
break;
129124
case DigiDocSignature::Invalid:
130125
ui->error = isSignature ? ria::qdigidoc4::InvalidSignatureWarning : ria::qdigidoc4::InvalidTimestampWarning;
131-
s << "<font color=\"red\">" << label << " " << isNotValid();
126+
s << color(QLatin1String("red"), isSignature ? tr("Signature is not valid") : tr("Timestamp is not valid"));
132127
break;
133128
case DigiDocSignature::Unknown:
134129
ui->error = isSignature ? ria::qdigidoc4::UnknownSignatureWarning : ria::qdigidoc4::UnknownTimestampWarning;
135-
s << "<font color=\"red\">" << label << " " << isUnknown();
130+
s << color(QLatin1String("red"), isSignature ? tr("Signature is unknown") : tr("Timestamp is unknown"));
136131
break;
137132
}
138133
s << "</span>";
@@ -253,7 +248,7 @@ void SignatureItem::updateNameField()
253248
ui->name->setText(red(ui->nameText + " - ", ui->invalid) + ui->status);
254249
else
255250
ui->name->setText(QStringLiteral("%1<br />%2").arg(red(ui->nameText, ui->invalid), ui->status));
256-
ui->name->setAccessibleName(QStringLiteral("%1. %2 %3").arg(plain, ui->role->text(), ui->idSignTime->text()));
251+
ui->name->setAccessibleName(QStringLiteral("%1. %2. %3 %4").arg(ui->nameText.toLower(), plain, ui->role->text(), ui->idSignTime->text()));
257252
ui->role->setText(ui->role->fontMetrics().elidedText(
258253
ui->roleText, Qt::ElideRight, ui->role->width() - 10, Qt::TextShowMnemonic));
259254
}

0 commit comments

Comments
 (0)