Unverified Commit 328a2042 authored by Andre Heinecke's avatar Andre Heinecke
Browse files

Remove wording "communication" from compliance

This simplifys the usage of the compliance name and avoids
building strings with different localizations.

GnuPG-Bug-Id: T5855
parent 39bbfda2
Pipeline #223010 failed with stage
in 3 minutes and 48 seconds
......@@ -856,15 +856,7 @@ public:
}
DeVSCompliance::decorate(mOkButton, de_vs);
if (de_vs) {
mComplianceLbl->setText(i18nc("%1 is a placeholder for the name of a compliance mode. E.g. NATO RESTRICTED compliant or VS-NfD compliant",
"%1 communication possible.",
DeVSCompliance::name(true)));
} else {
mComplianceLbl->setText(i18nc("%1 is a placeholder for the name of a compliance mode. E.g. NATO RESTRICTED compliant or VS-NfD compliant",
"%1 communication not possible.",
DeVSCompliance::name(true)));
}
mComplianceLbl->setText(DeVSCompliance::name(de_vs));
mComplianceLbl->setVisible(true);
}
......
......@@ -1170,17 +1170,7 @@ QString Formatting::complianceStringForKey(const GpgME::Key &key)
// There will likely be more in the future for other institutions
// for now we only have DE-VS
if (DeVSCompliance::isCompliant()) {
if (uidsHaveFullValidity(key) && isKeyDeVs(key)) {
return i18nc("%1 is a placeholder for the name of a compliance mode. E.g. NATO RESTRICTED compliant or VS-NfD compliant",
"May be used for %1 communication.",
DeVSCompliance::name(true));
} else {
return i18nc(
"VS-NfD-conforming is a German standard for restricted documents. For which special restrictions about algorithms apply. The string describes "
"if a key is compliant to that..",
"May <b>not</b> be used for %1 communication.",
DeVSCompliance::name(true));
}
return DeVSCompliance::name(uidsHaveFullValidity(key) && isKeyDeVs(key));
}
return QString();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment