Unverified Commit 7c8fd291 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 d87324c0
Pipeline #223011 passed with stage
in 5 minutes and 7 seconds
......@@ -275,11 +275,7 @@ private:
auto btn = ui.buttonBox.button(QDialogButtonBox::Ok);
DeVSCompliance::decorate(btn, de_vs);
ui.complianceLB.setText(de_vs
? 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))
: 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)));
ui.complianceLB.setText(DeVSCompliance::name(de_vs));
ui.complianceLB.setVisible(true);
}
......
......@@ -449,11 +449,7 @@ private Q_SLOTS:
if (DeVSCompliance::isActive()) {
const bool de_vs = DeVSCompliance::isCompliant() && mWidget->isDeVsAndValid();
DeVSCompliance::decorate(btn, de_vs);
mParent->setLabelText(de_vs
? 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))
: 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)));
mParent->setLabelText(DeVSCompliance::name(de_vs));
}
} else {
mParent->setButtonText(QWizard::CommitButton, i18n("Next"));
......
......@@ -42,7 +42,7 @@ public:
if (m_skipped) {
m_explanation =
xi18nc("@info %1 is a placeholder for the name of a compliance mode. E.g. NATO RESTRICTED compliant or VS-NfD compliant",
"<para><application>GnuPG</application> is not configured for %1 communication.</para>", DeVSCompliance::name(true));
"<para><application>GnuPG</application> is not configured for %1.</para>", DeVSCompliance::name(true));
return;
}
......
......@@ -495,11 +495,7 @@ public:
if (DeVSCompliance::isActive()) {
const bool de_vs = DeVSCompliance::isCompliant() && mSigEncWidget->isDeVsAndValid();
DeVSCompliance::decorate(mCryptBtn, de_vs);
mAdditionalInfoLabel->setText(de_vs
? 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))
: 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)));
mAdditionalInfoLabel->setText(DeVSCompliance::name(de_vs));
mAdditionalInfoLabel->setVisible(true);
if (!DeVSCompliance::isCompliant()) {
mCryptBtn->setEnabled(false);
......
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