Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Conversation

eerielili
Copy link

A small update concerning the openpgp plugin: with this, the key can be shown either as expired or revoked in the account manager windows concerning an account.
image

@mxlgv
Copy link
Owner

mxlgv commented Jun 9, 2024

@giantplaceholder do we need this change?

@giantplaceholder
Copy link
Collaborator

@giantplaceholder do we need this change?

Sure.

And yes, strings' translation for Russian, English and German are must

@eerielili eerielili force-pushed the openpgp-plugin-accountmanager-dontshowexpiredrevokedkeys branch from 890882c to e149894 Compare June 9, 2024 20:29
@eerielili
Copy link
Author

@giantplaceholder Thanks a lot for the review. I updated the translation template plugins/openpgp/po/dino-openpgp.pot just now, also added some translations for my language as well.

@mxlgv
Copy link
Owner

mxlgv commented Jun 9, 2024

@eerielili please rebase CI for Windows has been fixed.

@eerielili eerielili force-pushed the openpgp-plugin-accountmanager-dontshowexpiredrevokedkeys branch 2 times, most recently from bcbc77f to f26ccfd Compare June 9, 2024 22:36
@eerielili
Copy link
Author

@mxlgv done

plugins/openpgp/src/account_settings_entry.vala Outdated Show resolved Hide resolved
msgid "Encryption"
msgstr "Шифрование"

#~ msgid "No keys available. Generate one!"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove completely if the code is not used

plugins/openpgp/po/fr.po Show resolved Hide resolved
msgid "Encryption"
msgstr "Chiffrement"

#~ msgid "No keys available. Generate one!"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove completely if the code is not used

plugins/openpgp/po/ru.po Show resolved Hide resolved
plugins/openpgp/po/de.po Show resolved Hide resolved

#: account_settings_entry.vala:95
msgid "revoked!"
msgstr ""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add this translation:

"widerrufen!"


#: account_settings_entry.vala:95
msgid "expired!"
msgstr ""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add this translation:

"abgelaufen!"

msgid "Encryption"
msgstr "Verschlüsselung"

#~ msgid "No keys available. Generate one!"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove completely if the code is not used

#: account_settings_entry.vala:96
#, c-format
msgid "Your key %s is %s"
msgstr ""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add this translation:

"Ihr Schlüssel %s ist %s"

@eerielili eerielili force-pushed the openpgp-plugin-accountmanager-dontshowexpiredrevokedkeys branch from f26ccfd to 1094f0e Compare June 14, 2024 17:10
@eerielili
Copy link
Author

eerielili commented Jun 14, 2024

Thanks. Wait a minute, I must pust a russian translation i deleted by mistake.
There, reverted to this:

#: plugins/openpgp/src/account_settings_entry.vala:72
msgid ""
"No keys available. Generate one or check if your keys aren't expired or "
"revoked!"
msgstr "Нет доступных ключей. Создайте как минимум один, либо проверьте что уже существующие (ранее созданные) ключи не были отозваны или срок их действия не закончился!"

@eerielili eerielili force-pushed the openpgp-plugin-accountmanager-dontshowexpiredrevokedkeys branch from 1094f0e to a8b2df7 Compare June 14, 2024 17:29
@mxlgv mxlgv self-requested a review June 14, 2024 17:36

#: account_settings_entry.vala:95
msgid "expired!"
msgstr ""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?


#: account_settings_entry.vala:95
msgid "revoked!"
msgstr ""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

#: account_settings_entry.vala:96
#, c-format
msgid "Your key %s is %s"
msgstr ""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

@eerielili eerielili force-pushed the openpgp-plugin-accountmanager-dontshowexpiredrevokedkeys branch from a8b2df7 to 22d5e58 Compare June 14, 2024 17:44
@eerielili eerielili requested a review from mxlgv June 14, 2024 17:52
	- updated template translation file for the plugin.
	- updated French translation for the plugin as well.
        - Update German and Russian .po files skeletal as well.
@eerielili eerielili force-pushed the openpgp-plugin-accountmanager-dontshowexpiredrevokedkeys branch from 22d5e58 to 58f4f11 Compare June 14, 2024 17:58
@mxlgv
Copy link
Owner

mxlgv commented Jun 14, 2024

@eerielili Thank you for your contribution to the project. After the merger I will correct the translation. Don't worry about translation)

Copy link
Author

@eerielili eerielili left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

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 <span color='red'><b>"+ key_check.fpr +"</b></span> is " + status_str)));
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll use the _("stuff is %s").printf( thestuffs_var ) here to ease adding to the .pot, will force push change a little change in my branch in a few minutes.

plugins/openpgp/po/ru.po Show resolved Hide resolved
plugins/openpgp/src/account_settings_entry.vala Outdated Show resolved Hide resolved

#: account_settings_entry.vala:95
msgid "expired!"
msgstr ""
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mxlgv oh right, I didn't see the parent comment until now, sorry! will update very shortly.
By the way, what do you think will fit well for "Attention required" in Russian?
thanks you very much for your patience

@mxlgv mxlgv merged commit d2d4af1 into mxlgv:master Jun 14, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants