From fbbf1f6cbb22af97f3c1f800833986fd8cead05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BF=D0=B8=D1=80=D0=B8=D0=B4=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=94=D0=B5=D0=BD=D0=B8=D1=81?= Date: Thu, 5 Jul 2012 15:53:42 +0400 Subject: [PATCH] added additional information --- console/application/cert_func.py | 22 +++-- ru/calculate_console.po | 143 ++++++++++++++++--------------- 2 files changed, 89 insertions(+), 76 deletions(-) diff --git a/console/application/cert_func.py b/console/application/cert_func.py index 139511f..d034983 100644 --- a/console/application/cert_func.py +++ b/console/application/cert_func.py @@ -161,7 +161,9 @@ def client_post_request (cert_path, args): fc = open(os.path.join(cert_path, 'req_id'), 'w') fc.write(res) fc.close() - _print (_("Your request ID = %s") %res) + _print (_("Your request ID = %s") %res, + _("To sign the certificate in the server use command") + \ + '\n'+'cl-core --sign-client ID_CLIENT_REQUEST') return 0 def client_get_cert(cert_path, args): @@ -203,7 +205,9 @@ def client_get_cert(cert_path, args): return 1 elif cert == '2': print _("Signature request not reviewed yet.") - print _("Your request ID = %s") %req_id + print _("Your request ID = %s") %req_id, \ + _("To sign the certificate in the server use command") + \ + '\n'+'cl-core --sign-client ID_CLIENT_REQUEST' return 1 elif cert == '3': print _("Signature request does not match earlier data.") @@ -219,7 +223,7 @@ def client_get_cert(cert_path, args): os.unlink(cert_path + 'req_id') except OSError, e: _print (e.message) - print 'OK. Certificate save. Your certificate id - %s' %req_id + print _('Certificate save. Your certificate id - %s') %req_id user_name = pwd.getpwuid(os.getuid()).pw_name try: pwdObj = pwd.getpwnam(user_name) @@ -228,7 +232,7 @@ def client_get_cert(cert_path, args): return None os.chown(cert_file, pwdObj.pw_uid, pwdObj.pw_gid) os.chmod(cert_file, 0600) - + if ca_root: clVars = DataVarsCore() clVars.importCore() @@ -237,23 +241,23 @@ def client_get_cert(cert_path, args): if os.path.exists(system_ca_db): if ca_root in open(system_ca_db, 'r').read(): return 0 - + cl_client_cert_dir = clVars.Get('cl_client_cert_dir') homePath = clVars.Get('ur_home_path') - + cl_client_cert_dir = cl_client_cert_dir.replace("~",homePath) root_cert_md5 = os.path.join(cl_client_cert_dir, "ca/cert_list") - + md5 = hashlib.md5() md5.update(ca_root) md5sum = md5.hexdigest() print "\n=================================================" print "md5sum = ", md5sum - + if not os.path.exists(root_cert_md5): fc = open(root_cert_md5,"w") fc.close() - + filename = None with open(root_cert_md5) as fd: t = fd.read() diff --git a/ru/calculate_console.po b/ru/calculate_console.po index 7bd4a81..aad4382 100644 --- a/ru/calculate_console.po +++ b/ru/calculate_console.po @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: console_gui_translate\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-02 12:06+0300\n" -"PO-Revision-Date: 2012-07-02 12:06+0300\n" -"Last-Translator: Denis \n" +"POT-Creation-Date: 2012-07-05 14:24+0300\n" +"PO-Revision-Date: 2012-07-05 14:24+0300\n" +"Last-Translator: Denis Spiridonov \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -221,135 +221,140 @@ msgstr "Не найден метод для %s" msgid "Process terminated" msgstr "Процесс завершён" -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:377 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:461 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:376 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:472 msgid "Invalid password" msgstr "Неверный пароль" -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:383 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:394 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:468 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:484 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:382 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:393 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:479 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:495 msgid "Error: " msgstr "Ошибка: " -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:407 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:397 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:417 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:438 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:499 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:520 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:175 +msgid "Interrupted by the user" +msgstr "Прервано пользователем" + #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:410 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:412 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:498 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:501 -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:503 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:413 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:419 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:513 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:516 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:522 #, python-format msgid "Exception: %s" msgstr "Исключение: %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:426 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:105 +#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:433 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:106 msgid "Failed to connect" msgstr "Не удалось подключиться" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:39 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:40 msgid "show this help message and exit" msgstr "просмотр данной справки и выход" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:41 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:42 msgid "call method" msgstr "вызов метода" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:44 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:45 msgid "language for translation" msgstr "язык для перевода" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:47 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:48 msgid "port number" msgstr "номер порта" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:50 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:51 msgid "destination host" msgstr "хост назначения" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:54 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:55 msgid "post a request on the server for the certificate to be signed" msgstr "послать запрос подписания сертификата на сервер" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:57 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:58 msgid "get the signed certificate from the server" msgstr "забрать подписанный сертификат с сервера" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:60 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:61 msgid "path to the cert and key files" msgstr "путь к файлам сертификата и ключа" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:63 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:64 msgid "view the list of running processes" msgstr "просмотр списка запущенных процессов" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:66 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:67 msgid "dump (to be used with --list-pid)" msgstr "дамп (используйте с ключом --list-pid)" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:69 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:70 msgid "view the result of the process" msgstr "просмотр результата работы процесса" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:72 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:73 msgid "kill the selected process" msgstr "завершить выбранный процесс" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:75 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:76 msgid "clear the session cache" msgstr "очистить кэш сессии" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:78 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:79 msgid "view the session information" msgstr "просмотр информации о сессии" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:82 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:83 msgid "view information about session = SID" msgstr "Просмотр информации о сессии с номером SID" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:86 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:87 msgid "view the active session list on the server" msgstr "просмотр списка активных сессий на сервере" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:89 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:90 msgid "update the revocation list" msgstr "обновить список отзыва сертификатов" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:92 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:93 msgid "stop cl-consoled" msgstr "остановить cl-consoled" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:95 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:96 msgid "do not display progress bar" msgstr "не отображать прогрессбар" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:98 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:99 msgid "no questions during the process" msgstr "не задавать вопросы во время процесса" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:128 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:129 msgid "Unknown parameter" msgstr "Неизвестный параметр" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:139 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:182 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:140 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:183 msgid "Method not available" msgstr "Метод не доступен" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:150 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:192 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:151 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:193 msgid "Wrong option " msgstr "Ошибка в параметре " -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:168 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:169 msgid "Run the process? (yes/no): " msgstr "Запустить процесс? (yes/no): " -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:174 -msgid "Interrupted by the user" -msgstr "Прервано пользователем" - #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:44 msgid "No access to the file!" msgstr "Нет доступа к файлу!" @@ -466,12 +471,12 @@ msgid "Send a new request? y/[n]: " msgstr "Отправить навый запрос на подпись сертификата? y/[n]: " #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:127 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:177 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:179 msgid "connecting..." msgstr "подключение..." #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:133 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:184 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:186 msgid "Closing. Connection error." msgstr "Ошибка соединения. Закрываюсь." @@ -493,62 +498,72 @@ msgid "This server has not signed the certificate!" msgstr "Сервер не подписал сертификат!" #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:206 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:208 #, python-format msgid "Your request ID = %s" msgstr "Номер Вашего запроса = %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:169 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:165 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:209 +msgid "To sign the certificate in the server use command" +msgstr "Для подписания сертификата на сервере используется команда" + +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:171 #, python-format msgid "Request not sent or file %s deleted" msgstr "Запрос не был послан или удалён файл %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:190 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:192 #, python-format msgid "Request %s not found on the client's side" msgstr "Запрос %s не найден на стороне клиента" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:202 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:204 msgid "Request to sign is rejected!" msgstr "Запрос на подпись сертификата отвергнут!" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:205 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:207 msgid "Signature request not reviewed yet." msgstr "Запрос на подписание сертификата ещё не рассмотрен." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:209 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:213 msgid "Signature request does not match earlier data." msgstr "Запрос или подпись не соответствуют отправленным ранее." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:216 msgid "The request was sent from another IP." msgstr "Запрос был послан с другого адреса." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:279 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:226 +#, python-format +msgid "Certificate save. Your certificate id - %s" +msgstr "Сертификат сохранён. Номер вашего сертификата - %s" + +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:283 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:170 msgid "Field \"CN\" not found in the certificate!" msgstr "Не найдено поле \"CN\" в сертификате!" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:292 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:296 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:180 msgid "filename = " msgstr "Имя файла =" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:293 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:297 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:181 msgid "Certificate added" msgstr "Сертификат добавлен" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:295 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:299 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:183 msgid "A file with CA certificates now exists" msgstr "Файл с сертификатом удостоверяющего центра создан" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:307 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:311 msgid "You do not have a certificate. Use --gen-cert-by HOST to generate new request or --get-cert-from HOST to get a new certificate from the server." msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертитфикат или ключ --get-cert-from HOST чтобы забрать сертификат с сервера." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:379 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:383 msgid "Password: " msgstr "Пароль: " @@ -782,9 +797,6 @@ msgstr "Сервер не является доверенным" #~ msgid "Certificate number - %s" #~ msgstr "Номер сертификата - %s" -#~ msgid "Date issue of certificate - %s" -#~ msgstr "Дата подписания сертификата - %s" - #~ msgid "Active session on server: " #~ msgstr "Активные сессии на сервере:" @@ -948,9 +960,6 @@ msgstr "Сервер не является доверенным" #~ msgid "Certificate not found in the server database!" #~ msgstr "Сертификат не найден в БД сервера!" -#~ msgid "Adding the certificate to the server database..." -#~ msgstr "Добавление сертификата в БД сервера..." - #~ msgid "CERTIFICATE ADDED" #~ msgstr "Сертификат добавлен"