OPENPGP PLUGIN: Show key as expired or revoked in account manager window

- updated template translation file for the plugin. - updated French translation for the plugin as well.
mxlgv · Jun 9, 2024 · e149894 · e149894
1 parent a7c58bc
commit e149894
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 41 deletions.
diff --git a/plugins/openpgp/po/dino-openpgp.pot b/plugins/openpgp/po/dino-openpgp.pot
@@ -1,52 +1,68 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-07 21:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: \n"
+"Project-Id-Version: Dino+\n"
+"POT-Creation-Date: 2024-06-09 22:16+0200\n"
+"PO-Revision-Date: 2024-06-09 22:18+0200\n"
+"Last-Translator: \n"
+"Language-Team: Dino+\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.4.2\n"
+"X-Poedit-Basepath: ../src\n"
+"X-Poedit-KeywordsList: _(\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .\n"
 
-#: plugins/openpgp/src/account_settings_entry.vala:68
-#: plugins/openpgp/src/account_settings_entry.vala:72
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: account_settings_entry.vala:68 account_settings_entry.vala:72
+#: account_settings_entry.vala:113
 msgid "Key publishing disabled"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:68
+#: account_settings_entry.vala:68
 msgid "Error in GnuPG"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:72
-msgid "No keys available. Generate one!"
+#: account_settings_entry.vala:72
+msgid ""
+"No keys available. Generate one or check if your keys aren't expired or "
+"revoked!"
+msgstr ""
+
+#: account_settings_entry.vala:95
+msgid "expired!"
+msgstr ""
+
+#: account_settings_entry.vala:95
+msgid "revoked!"
+msgstr ""
+
+#: account_settings_entry.vala:96
+msgid "Attention required!"
+msgstr ""
+
+#: account_settings_entry.vala:96
+#, c-format
+msgid "Your key %s is %s"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: account_settings_entry.vala:113
 msgid "Select key"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: account_settings_entry.vala:126
 msgid "Loading…"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: account_settings_entry.vala:126
 msgid "Querying GnuPG"
 msgstr ""
 
-#: plugins/openpgp/src/contact_details_provider.vala:28
+#: contact_details_provider.vala:28
 msgid "Key not in keychain"
 msgstr ""
 
-#: plugins/openpgp/src/contact_details_provider.vala:30
+#: contact_details_provider.vala:30
 msgid "Encryption"
 msgstr ""
diff --git a/plugins/openpgp/po/fr.po b/plugins/openpgp/po/fr.po
@@ -5,49 +5,73 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-07 21:31+0100\n"
-"PO-Revision-Date: 2020-11-12 17:21+0000\n"
+"POT-Creation-Date: 2024-06-09 22:16+0200\n"
+"PO-Revision-Date: 2024-06-09 22:22+0200\n"
+"Last-Translator: \n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/plugin-"
 "openpgp/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
+"X-Generator: Poedit 3.4.2\n"
 
-#: plugins/openpgp/src/account_settings_entry.vala:68
-#: plugins/openpgp/src/account_settings_entry.vala:72
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: account_settings_entry.vala:68 account_settings_entry.vala:72
+#: account_settings_entry.vala:113
 msgid "Key publishing disabled"
 msgstr "La publication des clés est désactivée"
 
-#: plugins/openpgp/src/account_settings_entry.vala:68
+#: account_settings_entry.vala:68
 msgid "Error in GnuPG"
 msgstr "Erreur dans GnuPG"
 
-#: plugins/openpgp/src/account_settings_entry.vala:72
-msgid "No keys available. Generate one!"
-msgstr "Aucune clé n’est disponible. Générez-en une !"
+#: account_settings_entry.vala:72
+msgid ""
+"No keys available. Generate one or check if your keys aren't expired or "
+"revoked!"
+msgstr ""
+"Pas de clés disponibles. Générez-en une nouvelle ou vérifier si vos "
+"clés ne seraient pas expirées ou révoquées!"
+
+#: account_settings_entry.vala:95
+msgid "expired!"
+msgstr "expirée!"
+
+#: account_settings_entry.vala:95
+msgid "revoked!"
+msgstr "révoquée!"
 
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: account_settings_entry.vala:96
+msgid "Attention required!"
+msgstr "Attention requise!"
+
+#: account_settings_entry.vala:96
+#, c-format
+msgid "Your key %s is %s"
+msgstr "Votre clé %s est %s"
+
+#: account_settings_entry.vala:113
 msgid "Select key"
 msgstr "Choix d’une clé"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: account_settings_entry.vala:126
 msgid "Loading…"
 msgstr "Chargement…"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: account_settings_entry.vala:126
 msgid "Querying GnuPG"
 msgstr "Interrogation de GnuPG"
 
-#: plugins/openpgp/src/contact_details_provider.vala:28
+#: contact_details_provider.vala:28
 msgid "Key not in keychain"
 msgstr "La clé n’est pas dans le trousseau"
 
-#: plugins/openpgp/src/contact_details_provider.vala:30
+#: contact_details_provider.vala:30
 msgid "Encryption"
 msgstr "Chiffrement"
+
+#~ msgid "No keys available. Generate one!"
+#~ msgstr "Aucune clé n’est disponible. Générez-en une !"
diff --git a/plugins/openpgp/src/account_settings_entry.vala b/plugins/openpgp/src/account_settings_entry.vala
@@ -69,7 +69,7 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
             return;
         }
         if (keys.size == 0) {
-            label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one!")));
+            label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one or check if your keys aren't expired or revoked!")));
             return;
         }
 
@@ -88,6 +88,18 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
         set_label_active(selected);
 
         combobox.changed.connect(key_changed);
+        if (account_key != null){
+            try {
+                GPG.Key key_check = GPGHelper.get_public_key(account_key);
+                if(key_check.expired || key_check.revoked) {
+                    string status_str = key_check.expired ? _("expired!") : _("revoked!");
+                    label.set_markup(build_markup_string(_("Attention required!"), _("Your key %s is %s").printf("<span color='red'><b>"+ key_check.fpr +"</b></span>", status_str) ) );
+                }
+            }
+            catch {
+                debug("Coudn't check GPG key status.");
+            }
+        }
     }
 
     private void populate_list_store() {