fix KeyboardInterrupt exceptions

12 years ago · 78f0dfed32
parent 239263d6ed
commit 78f0dfed32
3 changed files with 87 additions and 64 deletions
--- a/console/application/methods_func.py
+++ b/console/application/methods_func.py
@ -118,10 +118,11 @@ def call_method(client, args):
        while True:
            try:
                ask = raw_input('\n' + _('Run process? (yes/no): '))
+                red = '\033[31m * \033[0m'
            except KeyboardInterrupt:
                ask = 'no'
+                red = '\n'+'\033[31m * \033[0m'
            if ask.lower() in ['n', 'no']:
-                red = '\033[31m * \033[0m'
                print red + _('Interrupted by user')
                return None
            if ask.lower() in ['y', 'yes']:
--- a/ru/calculate_console.po
+++ b/ru/calculate_console.po
@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: console_gui_translate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-05 14:33+0300\n"
-"PO-Revision-Date: 2012-06-05 14:33+0300\n"
+"POT-Creation-Date: 2012-06-07 11:36+0300\n"
+"PO-Revision-Date: 2012-06-07 11:36+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@ -170,46 +170,46 @@ msgstr "Страна (2 символа): [%s]"
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша!"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:155
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:181
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:132
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:158
 msgid "yes"
 msgstr "да"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:157
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:183
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:134
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:160
 msgid "no"
 msgstr "нет"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:159
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:185
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:136
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:162
 msgid "auto"
 msgstr "авто"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:204
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:181
 msgid "Not used"
 msgstr "Не используется"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:306
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:283
 msgid "Error"
 msgstr "Ошибка"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:312
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:289
 msgid "Warning"
 msgstr "Предепреждение"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:350
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:327
 msgid "Method not found: "
 msgstr "Метод не найден: "

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:382
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:359
 msgid "server send pid = "
 msgstr "сервер послал идентификатор процесса = "

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:472
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:449
 msgid "Process not exist or not belong to your session"
 msgstr "Процесс не существует или принадлежит не вашей сессии"

-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:524
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:501
 #, python-format
 msgid "Error task by %s"
 msgstr "Ошибка задачи на %s"
@ -286,28 +286,28 @@ msgstr "просмотр списка активных сессий на сер
 msgid "update the certificate revocation lists"
 msgstr "обновить список отзыва сертификатов"

-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:313
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:28
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:286
+#, python-format
+msgid "cannot create directory %s"
+msgstr "Не удалось создать директорию %s"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:320
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:29
 msgid "Failed to connect"
 msgstr "Не удалось подключиться"

-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:340
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:97
-msgid "Password: "
-msgstr "Пароль: "
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:373
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:381
 msgid "Password is invalid"
 msgstr "Неверный пароль"

-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:376
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:393
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:386
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:402
 msgid "Error: "
 msgstr "Ошибка: "

-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:399
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:402
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:404
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:408
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:411
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:413
 #, python-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"
@ -316,10 +316,20 @@ msgstr "Исключение: %s"
 msgid "Run process? (yes/no): "
 msgstr "Запустить процесс? (yes/no): "

-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:125
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:126
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"

+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:199
+#, python-format
+msgid "Password for %s: "
+msgstr "Пароль для %s: "
+
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:200
+#, python-format
+msgid "Repeat password for %s: "
+msgstr "Повтор пароля для %s: "
+
 #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:33
 msgid " New Session"
 msgstr "Новая сессия"
@ -395,138 +405,142 @@ msgstr "Ошибка очистки кэша сессии"
 msgid "Session cache is cleared"
 msgstr "Кэш сессии очищен"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:39
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:40
 msgid "Certificate not found in Server Database!"
 msgstr "Сертификат не найден в БД сервера!"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:40
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:41
 msgid "Add certificate to server Database..."
 msgstr "Добавление сертификата в БД сервера..."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:44
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:45
 #, python-format
 msgid "Your certificate ID = %s"
 msgstr "Номер Вашего сертификата = %s"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:48
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:49
 msgid "Certificate not send!"
 msgstr "Сертификат не отправлен!"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:51
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:52
 #, python-format
 msgid " Your certifitate id = %d"
 msgstr "Номер Вашего сертификата = %d"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:54
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:55
 msgid "expiry date certificate has passed"
 msgstr "Время жизни сертификата истекло"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:57
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:58
 #, python-format
 msgid "shelf life expires after %d days"
 msgstr "Время жизни сертификата истекает через %d дней"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:98
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:104
+msgid "Password: "
+msgstr "Пароль: "
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:106
 msgid "Repeat: "
 msgstr "Повтор: "

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:100
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:114
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:108
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122
 msgid "You have sent a request to sign the certificate."
 msgstr "У Вас уже есть отправленный запрос на подписание сертификата."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:109
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:123
 #, python-format
 msgid "request id = %s"
 msgstr "Номер запроса = %s"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:110
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:124
 msgid "Send new request? y/[n]: "
 msgstr "Отправить навый запрос на подпись сертификата? y/[n]: "

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:115
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:129
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:178
 msgid "connect..."
 msgstr "подключение..."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:171
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:135
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:185
 msgid "Close. Connecting Error."
 msgstr "Ошибка соединения. Закрываюсь."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:136
 #, python-format
 msgid "Error: %s"
 msgstr "Ошибка: %s"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:130
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144
 msgid "secret key and request exists"
 msgstr "секретный ключ и запрос на подпись сертификата созданы"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:131
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:145
 msgid "Create new secret key and request? y/[n]: "
 msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: "

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:146
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:160
 msgid "This server can not sign certificate!"
 msgstr "Сервер не подписал сертификат!"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:151
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:192
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:165
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:206
 #, python-format
 msgid "Your request id = %s"
 msgstr "Номер Вашего запроса = %s"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:156
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:170
 #, python-format
 msgid "request was not sent or deleted file %s"
 msgstr "Запрос не был послан или удалён файл %s"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:176
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:190
 #, python-format
 msgid "Request %s not found on client side"
 msgstr "Запрос %s не найден на стороне клиента"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:188
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:202
 msgid "Request to sign is rejected!"
 msgstr "Запрос на подпись сертификата отвергнут!"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:191
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:205
 msgid "Request for the signing has not yet reviewed."
 msgstr "Запрос на подписание сертификата ещё не рассмотрен."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:195
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:209
 msgid "Request on signature does not match sent earlier."
 msgstr "Запрос или подпись не соответствуют отправленным ранее."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:198
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212
 msgid "Request was sent from another ip."
 msgstr "Запрос был послан с другого адреса."

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:253
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:276
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:166
 msgid "Not found field \"CN\" in certificate!"
 msgstr "Не найдено поле \"CN\" в сертификате!"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:266
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:289
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:176
 msgid "filename = "
 msgstr "Имя файла ="

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:267
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:290
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:177
 msgid "CERTIFICATE ADD"
 msgstr "Сертификат добавлен"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:269
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:292
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:179
 msgid "file with ca certificates exists"
 msgstr "Файл с сертификатом удостоверяющего центра создан"

-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:281
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:304
 msgid "You do not have a certificate. Use key --gen-cert-by HOST for generate new request or key --get-cert-from HOST for get new certificate from server."
 msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертитфикат или ключ --get-cert-from HOST чтобы забрать сертификат с сервера."

--- a/scripts/cl-console
+++ b/scripts/cl-console
@ -20,5 +20,13 @@ from calculate.console.application.cl_client import main
 reload(sys)
 sys.setdefaultencoding("utf-8")

+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('calculate_console',sys.modules[__name__])
+
 if __name__=='__main__':
-    sys.exit(main())
+    try:
+        sys.exit(main())
+    except KeyboardInterrupt:
+        red = '\033[31m * \033[0m'
+        print '\n'+red+_('Interrupted by user')
+        sys.exit(1)