add translate, modified call method

console/application/cert_verify.py

@@ -85,7 +85,7 @@ def verify(server_cert, crl_path, flag):
 
 
 def get_CRL(path_to_cert):
-    print 'get_CRL'
+    print 'update CRL'
     """ get new CRL (Certificate Revocation List) from all CA """
     # local CRL
     CRL_path = path_to_cert + 'ca/crl/'
@@ -178,7 +178,6 @@ def get_CRL(path_to_cert):
                     fd.write(new_crl)
                     fd.close()
                     print _("CRL add")
-
     find_ca_in_crl (CRL_path, all_ca_certs_list)
 
 def find_ca_in_crl (CRL_path, all_ca_certs_list):

console/application/cl_client.py

@@ -220,6 +220,9 @@ def main():
     if args.update_crl:
         getCRL = threading.Thread(target=get_CRL, args = (path_to_cert, ))
         getCRL.start()
+        getCRL.join()
+        print 'GRL updated'
+        return 0
 
     if args.by_host:
         client_post_request (path_to_cert, args.by_host)

console/application/function.py

@@ -40,9 +40,6 @@ def get_sid (SID_FILE):
         fi.close()
     return sid
 
-def _(s):
-    return s
-
 def clear ():
     """ delete caching suds file """
     try:
@@ -237,13 +234,13 @@ def show_table(table, item):
 def show_error(item):
     FAIL = '\033[31m'
     ENDC = '\033[0m'
-    print FAIL + "ERROR"
+    print FAIL + _("Error")
     print FAIL + item.message
     print ENDC
     
 def show_warning(item):
     WARNING = '\033[91m'
-    print WARNING + "Warning"
+    print WARNING + _("Warning")
     print WARNING + item.message
     ENDC = '\033[0m'
     print ENDC
@@ -401,18 +398,14 @@ def get_Progress(client, sid, pid, id):
     temp_progress = -1
     percent = returnProgr.percent
     while percent <= 100 and percent >= 0 :
-#        print 222222222222222
         if temp_progress != percent:
-#            print 3333333333333
             print_progress(returnProgr)
             if percent == 100:
                 return
             temp_progress = percent
-#        print 4444444444444
         time.sleep(1)
         returnProgr = client.service.get_progress(sid, pid, id)
         percent = returnProgr.percent
-#        print '!!!!!!!percent = ', percent
     if percent < 0:
         print_progress(returnProgr, True)
     else:
@@ -420,7 +413,7 @@ def get_Progress(client, sid, pid, id):
 
 def print_progress(returnProgr, error = False):
     if error:
-        print _("Error task by %d") %(0 - returnProgr.percent)
+        print _("Error task by") %(0 - returnProgr.percent) + ' %d%%'
     elif returnProgr.long_message:
         print '%s %d%%' %(returnProgr.long_message, returnProgr.percent)
     elif returnProgr.short_message:
@@ -455,7 +448,7 @@ def _return_revoked_serials(self, crlfile):
         for revoked in revs:
             serials.append(str(revoked.get_serial()))
         return serials
-    except (ImportError, AttributeError), e:
+    except (ImportError, AttributeError):
         call = '/usr/bin/openssl crl -text -noout -in %s' % crlfile
         call = shlex.split(call)
         serials = []

console/application/methods_func.py

@@ -49,6 +49,8 @@ def get_method_argparser(client, args):
     parser = argparse.ArgumentParser(prog=progr, add_help=False)
 
     for Group in view.groups.GroupField:
+        if not Group.fields:
+            continue
         for field in Group.fields.Field:
             if field.opt:
                 action = None
@@ -120,6 +122,8 @@ def _getattr(obj, attr):
 
 def collect_object(client, param_object, view, args):
     for Group in view.groups.GroupField:
+        if not Group.fields:
+            continue
         for field in Group.fields.Field:
             if field.element in ['check', 'check_tristate'] or \
                             field.element == 'radio' and field.type == 'bool':

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-05-21 16:31+0300\n"
-"PO-Revision-Date: 2012-05-21 16:32+0300\n"
+"POT-Creation-Date: 2012-05-22 14:00+0300\n"
+"PO-Revision-Date: 2012-05-22 14:01+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -63,7 +63,7 @@ msgid "Server get pids error"
 msgstr "Ошибка списка процессов с сервера"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:88
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:148
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:149
 msgid "Error pid"
 msgstr "Ошибка идентификатора процесса"
 
@@ -85,31 +85,31 @@ msgstr "Вы можете запускать:"
 msgid "use key"
 msgstr "используйте ключ"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:137
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:138
 msgid "Execute sessions:"
 msgstr "Запущенные сессии:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:145
 msgid "PID for kill:"
 msgstr "Процесс для завершения: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:155
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:156
 msgid "Killed successfully"
 msgstr "Успешно убит"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:157
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:158
 msgid "Process is completed"
 msgstr "Процесс завершён"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:159
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:160
 msgid "Certificate not found in server database"
 msgstr "Сертификат не найден в БД сервера"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:161
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:162
 msgid "Session doesn't belong to your certificate"
 msgstr "Сессия не соответствует Вашему сертификату"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:163
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:164
 msgid "It was not possible to kill process"
 msgstr "Не удалось завершить процесс"
 
@@ -141,11 +141,11 @@ msgstr "Ошибка при создании директории %s"
 msgid "CRL add"
 msgstr "CRL добавлен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:269
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:268
 msgid "CA certificate delete from user trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из пользовательского списка доверенных сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:288
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:287
 msgid "CA certificate delete from system trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
 
@@ -181,18 +181,21 @@ msgstr "Город: "
 msgid "Country (2 words): [%s]"
 msgstr "Страна (2 символа): [%s]"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:53
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:54
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:270
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:240
 msgid "Error"
 msgstr "Ошибка"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:406
-#, python-format
-msgid "Error task by %d"
-msgstr "Ошибка задачи на %d"
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:246
+msgid "Warning"
+msgstr "Предепреждение"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:419
+msgid "Error task by"
+msgstr "Ошибка задачи на"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:59
 msgid "no connection to server!"
@@ -234,9 +237,9 @@ msgstr "путь к файлам сертификата и ключа"
 msgid "Update the certificate revocation lists"
 msgstr "Обновить список отзыва сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:290
 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:293
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:295
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:296
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:298
 #, python-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"

scripts/cl-console

@@ -14,7 +14,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+
+import sys
 from calculate.console.application.cl_client import main
 
 if __name__=='__main__':
-    main()
+    sys.exit(main())