diff --git a/src/Lib/Tools/CryptGpgExtended.php b/src/Lib/Tools/CryptGpgExtended.php index 266f6f7..c078516 100644 --- a/src/Lib/Tools/CryptGpgExtended.php +++ b/src/Lib/Tools/CryptGpgExtended.php @@ -107,7 +107,7 @@ class CryptGpgExtended extends \Crypt_GPG $this->engine->reset(); $this->engine->setInput($input); $this->engine->setOutput($output); - $this->engine->setOperation('--import', ['--import-options', 'show-only', '--with-colons']); + $this->engine->setOperation('--import', ['--import-options', 'show-only', '--with-colons', '--no-default-keyring --no-auto-check-trustdb --trust-model pgp']); $this->engine->run(); $keys = []; diff --git a/src/Model/Table/EncryptionKeysTable.php b/src/Model/Table/EncryptionKeysTable.php index d2c6b55..af71401 100644 --- a/src/Model/Table/EncryptionKeysTable.php +++ b/src/Model/Table/EncryptionKeysTable.php @@ -109,10 +109,10 @@ class EncryptionKeysTable extends AppTable if (!$sortedKeys['valid']) { $result[2] = 'The user\'s PGP key does not include a valid subkey that could be used for encryption.'; if ($sortedKeys['expired']) { - $result[2] .= ' ' . __n('Found %s subkey that have expired.', 'Found %s subkeys that have expired.', $sortedKeys['expired'], $sortedKeys['expired']); + $result[2] .= ' ' . __n(__('Found 1 subkey that has expired.'), __('Found {0} subkeys that have expired.', $sortedKeys['expired']), $sortedKeys['expired']); } if ($sortedKeys['noEncrypt']) { - $result[2] .= ' ' . __n('Found %s subkey that is sign only.', 'Found %s subkeys that are sign only.', $sortedKeys['noEncrypt'], $sortedKeys['noEncrypt']); + $result[2] .= ' ' . __n(__('Found 1 subkey that is sign only.'), __('Found {0} subkeys that are sign only.', $sortedKeys['noEncrypt']), $sortedKeys['noEncrypt']); } } else { $result[0] = true;