From 1c5f525b5807c9b0225f3eea2f36b16cd3907503 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Fri, 10 Feb 2017 16:42:40 -0500 Subject: [PATCH 01/25] Update doc index to say Django 1.8+ required, instead of 1.7+ --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 483d5d84..e2fab98a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -70,6 +70,6 @@ Dependencies ------------ 1. Python 2.7+ (or 3.3+) -2. Django (1.7 or newer) +2. Django (1.8 or newer) 3. An existing **working** Django project with database etc. If you cannot log into the Admin, you won't get this product working! This means you **must** run `syncdb` **before** you add ``helpdesk`` to your ``INSTALLED_APPS``. From ea30d1845e69c3982dd16e65669c4e5d204dc0c1 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Fri, 10 Feb 2017 23:20:59 -0500 Subject: [PATCH 02/25] Moved contributing.rst to CONTRIBUTING in the top-level directory, added language on required tests for new pull requests, for #449 --- docs/contributing.rst => CONTRIBUTING | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) rename docs/contributing.rst => CONTRIBUTING (57%) diff --git a/docs/contributing.rst b/CONTRIBUTING similarity index 57% rename from docs/contributing.rst rename to CONTRIBUTING index e4cff162..d5201216 100644 --- a/docs/contributing.rst +++ b/CONTRIBUTING @@ -6,15 +6,13 @@ django-helpdesk is an open-source project and as such contributions from the com Licensing --------- -All contributions to django-helpdesk must be under the BSD license documented in our :doc:`license` page. All code submitted (in any way: via e-mail, via GitHub forks, attachments, etc) are assumed to be open-source and licensed under the BSD license. +All contributions to django-helpdesk must be under the BSD license documented in the LICENSE file in the top-level directory of this project. By submitting a contribution to this project (in any way: via e-mail, via GitHub forks, attachments, etc), you acknowledge that your contribution is open-source and licensed under the BSD license. If you or your organisation does not accept these license terms then we cannot accept your contribution. Please reconsider! Translations ------------ -.. image:: http://www.transifex.net/projects/p/django-helpdesk/resource/core/chart/image_png - Although django-helpdesk has originally been written for the English language, there are already multiple translations to Spanish, Polish, and German and more translations are welcomed. Translations are handled using the excellent Transifex service which is much easier for most users than manually editing .po files. It also allows collaborative translation. If you want to help translate django-helpdesk into languages other than English, we encourage you to make use of our Transifex project: @@ -26,22 +24,35 @@ Once you have translated content via Transifex, please raise an issue on the pro Code changes ------------ -Please fork the project on GitHub, make your changes, and log a pull request to get the changes pulled back into my repository. +Please fork the project on GitHub, make your changes, and log a pull request to get the changes pulled back into the +master branch of the django-helpdesk repository. Wherever possible please break git commits up into small chunks that are specific to a single bit of functionality. For example, a commit should not contain both new functionality *and* a bugfix; the new function and the bugfix should be separate commits wherever possible. Commit messages should also explain *what*, precisely, has been changed. -If you have any questions, please start a discussion on the GitHub issue tracker at https://github.com/django-helpdesk/django-helpdesk/issues +All commits should include appropriate new or updated tests; see the Tests section below for more details. + +If you have any questions, please start a discussion on the GitHub issue tracker at + +https://github.com/django-helpdesk/django-helpdesk/issues Tests ----- -Currently, test coverage is very low. We're working on increasing this, and to make life easier we are using `Travis CI`_ for continuous integration. This means that the test suite is run every time a code change is made, so we can try and make sure we avoid basic bugs and other regressions. +Currently, test coverage is very low. We're working on increasing this, and to make life easier we are using `Travis CI` (http://travis-ci.org/) for continuous integration. This means that the test suite is run every time a code change is made, so we can try and make sure we avoid basic bugs and other regressions. + +As a general policy, we will only accept new feature commits if they are accompanied by appropriate unit/functional tests (that is, tests for the functionality you just added). Bugfixes should also include new unit tests to ensure the bug has been fixed. + +More significant code refactoring must also include proper integration or validation tests, to be committed BEFORE the refactoring patches. This is to ensure that the refactored code produces the same results as the previous code base. + +Any further integration or validation tests (tests for the entire django-helpdesk application) are not required but greatly appreciated until we can improve our overall test coverage. Please include tests in the ``tests/`` folder when committing code changes. -.. _Travis CI: http://travis-ci.org/ +If you have any questions about creating or maintaining proper tests, please start a discussion on the GitHub issue tracker at + +https://github.com/django-helpdesk/django-helpdesk/issues Database schema changes ----------------------- @@ -50,6 +61,6 @@ As well as making your normal code changes to ``models.py``, please generate a D ./manage.py migrate helpdesk --auto [migration_name] -Make sure that ``migration_name`` is a sensible single-string explanation of what this migration does, such as *add_priority_options* or *add_basket_table* +Make sure that ``migration_name`` is a sensible single-string explanation of what this migration does, such as *add_priority_options* or *add_basket_table*. This will add a file to the ``migrations/`` folder, which must be committed to git with your other code changes. From 6fec1015c39ee7447dc2e9f7705b2c1c66cb08d5 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Feb 2017 18:51:20 -0500 Subject: [PATCH 03/25] Work in progress on unicode chars --- .travis.yml | 3 ++- helpdesk/management/commands/get_email.py | 23 +++++++++------- helpdesk/tests/test_get_email.py | 33 +++++++++++++++++++---- 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62879e4d..37e94b6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "2.7" - 3.4.4 - "3.5" + - "3.6" env: - DJANGO=1.8.17 @@ -18,7 +19,7 @@ install: before_script: - "pep8 --exclude=migrations --ignore=E501 helpdesk" -script: +script: - coverage run --source='.' quicktest.py helpdesk after_success: diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 97b5b8cc..68e74ecb 100644 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -10,6 +10,7 @@ scripts/get_email.py - Designed to be run from cron, this script checks the helpdesk, creating tickets from the new messages (or adding to existing tickets if needed) """ +from __future__ import unicode_literals from datetime import timedelta import email @@ -158,7 +159,7 @@ def process_queue(q, logger): msgNum = msg.split(" ")[0] logger.info("Processing message %s" % msgNum) - full_message = "\n".join(server.retr(msgNum)[1]) + full_message = encoding.force_text("\n".join(server.retr(msgNum)[1]), errors='ignore') ticket = ticket_from_message(message=full_message, queue=q, logger=logger) if ticket: @@ -198,7 +199,8 @@ def process_queue(q, logger): for num in msgnums: logger.info("Processing message %s" % num) status, data = server.fetch(num, '(RFC822)') - ticket = ticket_from_message(message=encoding.smart_text(data[0][1], errors='replace'), queue=q, logger=logger) + full_message = encoding.force_text(data[0][1], errors='ignore') + ticket = ticket_from_message(message=full_message, queue=q, logger=logger) if ticket: server.store(num, '+FLAGS', '\\Deleted') logger.info("Successfully processed message %s, deleted from IMAP server" % num) @@ -218,7 +220,8 @@ def process_queue(q, logger): for i, m in enumerate(mail, 1): logger.info("Processing message %d" % i) with open(m, 'r') as f: - ticket = ticket_from_message(message=f.read(), queue=q, logger=logger) + full_message = encoding.force_text(f.read(), errors='ignore') + ticket = ticket_from_message(message=full_message, queue=q, logger=logger) if ticket: logger.info("Successfully processed message %d, ticket/comment created." % i) try: @@ -243,10 +246,10 @@ def decodeUnknown(charset, string): if type(string) is not str: if not charset: try: - return str(string, encoding='utf-8', errors='replace') + return str(string, encoding='utf-8', errors='ignore') except: - return str(string, encoding='iso8859-1', errors='replace') - return str(string, encoding=charset, errors='replace') + return str(string, encoding='iso8859-1', errors='ignore') + return str(string, encoding=charset, errors='ignore') return string @@ -255,7 +258,7 @@ def decode_mail_headers(string): if six.PY2: return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded]) elif six.PY3: - return u' '.join([str(msg, encoding=charset, errors='replace') if charset else str(msg) for msg, charset in decoded]) + return u' '.join([str(msg, encoding=charset, errors='ignore') if charset else str(msg) for msg, charset in decoded]) def ticket_from_message(message, queue, logger): @@ -302,9 +305,9 @@ def ticket_from_message(message, queue, logger): if part.get_content_maintype() == 'text' and name is None: if part.get_content_subtype() == 'plain': - body = EmailReplyParser.parse_reply( - decodeUnknown(part.get_content_charset(), part.get_payload(decode=True)) - ) + body = encoding.force_text(EmailReplyParser.parse_reply( + decodeUnknown(part.get_content_charset(), encoding.force_text(part.get_payload(decode=True))) + )) logger.debug("Discovered plain text MIME part") else: files.append( diff --git a/helpdesk/tests/test_get_email.py b/helpdesk/tests/test_get_email.py index 3a296514..87eddffd 100644 --- a/helpdesk/tests/test_get_email.py +++ b/helpdesk/tests/test_get_email.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from helpdesk.models import Queue, Ticket from django.test import TestCase from django.core.management import call_command @@ -40,7 +42,7 @@ class GetEmailCommonTests(TestCase): class GetEmailParametricTemplate(object): - """TestCase that checks email functionality accross methods and socks configs.""" + """TestCase that checks email functionality across methods and socks configs.""" def setUp(self): @@ -52,7 +54,8 @@ class GetEmailParametricTemplate(object): "allow_email_submission": True, "email_box_type": self.method, "logging_dir": self.temp_logdir, - "logging_type": 'none'} + "logging_type": 'none' + } if self.method == 'local': kwargs["email_box_local_dir"] = '/var/lib/mail/helpdesk/' @@ -74,10 +77,13 @@ class GetEmailParametricTemplate(object): def test_read_email(self): """Tests reading emails from a queue and creating tickets. For each email source supported, we mock the backend to provide - authenticly formatted responses containing our test data.""" + authentically formatted responses containing our test data.""" test_email = "To: update.public@example.com\nFrom: comment@example.com\nSubject: Some Comment\n\nThis is the helpdesk comment via email." test_mail_len = len(test_email) + test_unicode_email = "To: update.public@example.com\nFrom: comment@example.com\nSubject: Some Unicode Comment\n\nThis is the helpdesk comment via email with unicode chars \u2013 inserted for testing purposes." + test_unicode_email_len = len(test_unicode_email) + if self.socks: from socks import ProxyConnectionError with self.assertRaisesRegexp(ProxyConnectionError, '%s:%s' % (unrouted_socks_server, unused_port)): @@ -98,13 +104,25 @@ class GetEmailParametricTemplate(object): mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename1') mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename2') + with mock.patch('helpdesk.management.commands.get_email.listdir') as mocked_listdir, \ + mock.patch('helpdesk.management.commands.get_email.isfile') as mocked_isfile, \ + mock.patch('builtins.open' if six.PY3 else '__builtin__.open', mock.mock_open(read_data=test_unicode_email)): + mocked_isfile.return_value = True + mocked_listdir.return_value = ['filename3'] + + call_command('get_email') + + mocked_listdir.assert_called_with('/var/lib/mail/helpdesk/') + mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename3') + elif self.method == 'pop3': # mock poplib.POP3's list and retr methods to provide responses as per RFC 1939 pop3_emails = { '1': ("+OK", test_email.split('\n')), '2': ("+OK", test_email.split('\n')), + '3': ("+OK", test_unicode_email.split('\n')), } - pop3_mail_list = ("+OK 2 messages", ("1 %d" % test_mail_len, "2 %d" % test_mail_len)) + pop3_mail_list = ("+OK 3 messages", ("1 %d" % test_mail_len, "2 %d" % test_mail_len, "3 %d" % test_unicode_email_len)) mocked_poplib_server = mock.Mock() mocked_poplib_server.list = mock.Mock(return_value=pop3_mail_list) mocked_poplib_server.retr = mock.Mock(side_effect=lambda x: pop3_emails[x]) @@ -117,8 +135,9 @@ class GetEmailParametricTemplate(object): imap_emails = { "1": ("OK", (("1", test_email),)), "2": ("OK", (("2", test_email),)), + "3": ("OK", (("3", test_unicode_email),)), } - imap_mail_list = ("OK", ("1 2",)) + imap_mail_list = ("OK", ("1 2 3",)) mocked_imaplib_server = mock.Mock() mocked_imaplib_server.search = mock.Mock(return_value=imap_mail_list) @@ -136,6 +155,10 @@ class GetEmailParametricTemplate(object): self.assertEqual(ticket2.ticket_for_url, "QQ-%s" % ticket2.id) self.assertEqual(ticket2.description, "This is the helpdesk comment via email.") + ticket3 = get_object_or_404(Ticket, pk=3) + self.assertEqual(ticket3.ticket_for_url, "QQ-%s" % ticket3.id) + self.assertEqual(ticket3.description, "This is the helpdesk comment via email with unicode chars \u2013 inserted for testing purposes.") + # build matrix of test cases case_methods = [c[0] for c in Queue._meta.get_field('email_box_type').choices] From 9dd558d71fb54b301b2e56ebb645ea9d7011be6f Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Feb 2017 18:51:55 -0500 Subject: [PATCH 04/25] Update gitignore to ignore KDE .directory files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7f84b87d..3a412d80 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ docs/doctrees/* .coverage .project .pydevproject +.directory From d5e3432483f6d914320b79d8a9c1b056c93d486c Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Feb 2017 19:59:59 -0500 Subject: [PATCH 05/25] Apply word wrap to CONTRIBUTING to make it easier for viewing in text editor --- CONTRIBUTING | 71 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index d5201216..063c6284 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -1,66 +1,101 @@ Contributing ============ -django-helpdesk is an open-source project and as such contributions from the community are welcomed and encouraged. +django-helpdesk is an open-source project and as such contributions from the +community are welcomed and encouraged. Licensing --------- -All contributions to django-helpdesk must be under the BSD license documented in the LICENSE file in the top-level directory of this project. By submitting a contribution to this project (in any way: via e-mail, via GitHub forks, attachments, etc), you acknowledge that your contribution is open-source and licensed under the BSD license. +All contributions to django-helpdesk must be under the BSD license documented in +the LICENSE file in the top-level directory of this project. By submitting a +contribution to this project (in any way: via e-mail, via GitHub forks, +attachments, etc), you acknowledge that your contribution is open-source and +licensed under the BSD license. -If you or your organisation does not accept these license terms then we cannot accept your contribution. Please reconsider! +If you or your organisation does not accept these license terms then we cannot +accept your contribution. Please reconsider! Translations ------------ -Although django-helpdesk has originally been written for the English language, there are already multiple translations to Spanish, Polish, and German and more translations are welcomed. +Although django-helpdesk has originally been written for the English language, +there are already multiple translations to Spanish, Polish, and German and more +translations are welcomed. -Translations are handled using the excellent Transifex service which is much easier for most users than manually editing .po files. It also allows collaborative translation. If you want to help translate django-helpdesk into languages other than English, we encourage you to make use of our Transifex project: +Translations are handled using the excellent Transifex service which is much +easier for most users than manually editing .po files. It also allows +collaborative translation. If you want to help translate django-helpdesk into +languages other than English, we encourage you to make use of our Transifex +project: http://www.transifex.net/projects/p/django-helpdesk/resource/core/ -Once you have translated content via Transifex, please raise an issue on the project Github page to let us know it's ready to import. +Once you have translated content via Transifex, please raise an issue on the +project Github page to let us know it's ready to import. Code changes ------------ -Please fork the project on GitHub, make your changes, and log a pull request to get the changes pulled back into the +Please fork the project on GitHub, make your changes, and log a pull request to +get the changes pulled back into the master branch of the django-helpdesk repository. -Wherever possible please break git commits up into small chunks that are specific to a single bit of functionality. For example, a commit should not contain both new functionality *and* a bugfix; the new function and the bugfix should be separate commits wherever possible. +Wherever possible please break git commits up into small chunks that are +specific to a single bit of functionality. For example, a commit should not +contain both new functionality *and* a bugfix; the new function and the bugfix +should be separate commits wherever possible. Commit messages should also explain *what*, precisely, has been changed. -All commits should include appropriate new or updated tests; see the Tests section below for more details. +All commits should include appropriate new or updated tests; see the Tests +section below for more details. -If you have any questions, please start a discussion on the GitHub issue tracker at +If you have any questions, please start a discussion on the GitHub issue tracker +at https://github.com/django-helpdesk/django-helpdesk/issues Tests ----- -Currently, test coverage is very low. We're working on increasing this, and to make life easier we are using `Travis CI` (http://travis-ci.org/) for continuous integration. This means that the test suite is run every time a code change is made, so we can try and make sure we avoid basic bugs and other regressions. +Currently, test coverage is very low. We're working on increasing this, and to +make life easier we are using `Travis CI` (http://travis-ci.org/) for continuous +integration. This means that the test suite is run every time a code change is +made, so we can try and make sure we avoid basic bugs and other regressions. -As a general policy, we will only accept new feature commits if they are accompanied by appropriate unit/functional tests (that is, tests for the functionality you just added). Bugfixes should also include new unit tests to ensure the bug has been fixed. +As a general policy, we will only accept new feature commits if they are +accompanied by appropriate unit/functional tests (that is, tests for the +functionality you just added). Bugfixes should also include new unit tests to +ensure the bug has been fixed. -More significant code refactoring must also include proper integration or validation tests, to be committed BEFORE the refactoring patches. This is to ensure that the refactored code produces the same results as the previous code base. +More significant code refactoring must also include proper integration or +validation tests, to be committed BEFORE the refactoring patches. This is to +ensure that the refactored code produces the same results as the previous code +base. -Any further integration or validation tests (tests for the entire django-helpdesk application) are not required but greatly appreciated until we can improve our overall test coverage. +Any further integration or validation tests (tests for the entire +django-helpdesk application) are not required but greatly appreciated until we +can improve our overall test coverage. Please include tests in the ``tests/`` folder when committing code changes. -If you have any questions about creating or maintaining proper tests, please start a discussion on the GitHub issue tracker at +If you have any questions about creating or maintaining proper tests, please +start a discussion on the GitHub issue tracker at https://github.com/django-helpdesk/django-helpdesk/issues Database schema changes ----------------------- -As well as making your normal code changes to ``models.py``, please generate a Django migration file and commit it with your code. You will want to use a command similar to the following:: +As well as making your normal code changes to ``models.py``, please generate a +Django migration file and commit it with your code. You will want to use a +command similar to the following:: ./manage.py migrate helpdesk --auto [migration_name] -Make sure that ``migration_name`` is a sensible single-string explanation of what this migration does, such as *add_priority_options* or *add_basket_table*. +Make sure that ``migration_name`` is a sensible single-string explanation of +what this migration does, such as *add_priority_options* or *add_basket_table*. -This will add a file to the ``migrations/`` folder, which must be committed to git with your other code changes. +This will add a file to the ``migrations/`` folder, which must be committed to +git with your other code changes. From ec38150d1fd3a543c9670c15cbb1e92e897631f7 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Feb 2017 20:00:40 -0500 Subject: [PATCH 06/25] Ignore KDE .desktop files in .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7f84b87d..90452818 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ docs/doctrees/* .coverage .project .pydevproject +.desktop From 492e25c77bb16ada3f2fa5ee0d6f9f8775c1a417 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Feb 2017 20:03:08 -0500 Subject: [PATCH 07/25] Update docs to say Python 3.4+ since that's what we current do testing against --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index e2fab98a..ae9e3ead 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -69,7 +69,7 @@ django-helpdesk is released under the BSD license, however it packages 3rd party Dependencies ------------ -1. Python 2.7+ (or 3.3+) +1. Python 2.7+ (or 3.4+) 2. Django (1.8 or newer) 3. An existing **working** Django project with database etc. If you cannot log into the Admin, you won't get this product working! This means you **must** run `syncdb` **before** you add ``helpdesk`` to your ``INSTALLED_APPS``. From 7bd7b42788c07eafe5a539e955b8a2c7489b018a Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Feb 2017 20:04:32 -0500 Subject: [PATCH 08/25] Ignore KDE .directory files in .gitignore; totally used the wrong name (.desktop) last time, oops --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 90452818..3a412d80 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ docs/doctrees/* .coverage .project .pydevproject -.desktop +.directory From 18557aad3871e595744ec86aea29987d50e8ceb3 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Sat, 25 Feb 2017 04:07:20 -0500 Subject: [PATCH 09/25] Add Python 3.6 to Travis CI configuration --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62879e4d..37e94b6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "2.7" - 3.4.4 - "3.5" + - "3.6" env: - DJANGO=1.8.17 @@ -18,7 +19,7 @@ install: before_script: - "pep8 --exclude=migrations --ignore=E501 helpdesk" -script: +script: - coverage run --source='.' quicktest.py helpdesk after_success: From dfdb12e354182acd8695cf769bc9d38e23b6e37a Mon Sep 17 00:00:00 2001 From: "Yuego [Home]" Date: Wed, 8 Mar 2017 23:01:31 +0400 Subject: [PATCH 10/25] Fix link translation --- helpdesk/templates/helpdesk/kb_category.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/helpdesk/templates/helpdesk/kb_category.html b/helpdesk/templates/helpdesk/kb_category.html index f508aecd..e3859c90 100644 --- a/helpdesk/templates/helpdesk/kb_category.html +++ b/helpdesk/templates/helpdesk/kb_category.html @@ -22,7 +22,9 @@

{{ item.question }}

-

{% blocktrans %}View Answer {% endblocktrans %}

+

+ {% blocktrans with item.get_absolute_url as url %}View Answer {% endblocktrans %} +

{% trans 'Rating' %}: {{ item.score }}

{% trans 'Last Update' %}: {{ item.last_updated|naturaltime }}

From d8ff278697e55ced790cc85a16941f9027d1d83e Mon Sep 17 00:00:00 2001 From: "Yuego [Home]" Date: Wed, 8 Mar 2017 23:03:03 +0400 Subject: [PATCH 11/25] Russian translation update --- helpdesk/locale/ru/LC_MESSAGES/django.mo | Bin 63883 -> 63036 bytes helpdesk/locale/ru/LC_MESSAGES/django.po | 2359 +++++++++++++--------- 2 files changed, 1420 insertions(+), 939 deletions(-) diff --git a/helpdesk/locale/ru/LC_MESSAGES/django.mo b/helpdesk/locale/ru/LC_MESSAGES/django.mo index 9fc44af5860390c6997517114399136b1c3efea6..2134f135c596e424776fecdd1522976478e49927 100644 GIT binary patch delta 14098 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 ADgXcg diff --git a/helpdesk/locale/ru/LC_MESSAGES/django.po b/helpdesk/locale/ru/LC_MESSAGES/django.po index bf2a6761..c1d484a1 100644 --- a/helpdesk/locale/ru/LC_MESSAGES/django.po +++ b/helpdesk/locale/ru/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # django-helpdesk English language translation # Copyright (C) 2011 Ross Poulton # This file is distributed under the same license as the django-helpdesk package. -# +# # Translators: # Translators: # Антон Комолов , 2011 @@ -13,186 +13,240 @@ msgid "" msgstr "" "Project-Id-Version: django-helpdesk\n" "Report-Msgid-Bugs-To: http://github.com/RossP/django-helpdesk/issues\n" -"POT-Creation-Date: 2014-07-26 14:14+0200\n" +"POT-Creation-Date: 2017-03-08 21:58+0300\n" "PO-Revision-Date: 2016-07-25 22:09+0000\n" "Last-Translator: Dmitry Sharavyov \n" -"Language-Team: Russian (http://www.transifex.com/rossp/django-helpdesk/language/ru/)\n" +"Language-Team: Russian (http://www.transifex.com/rossp/django-helpdesk/" +"language/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" -#: forms.py:128 forms.py:328 models.py:190 models.py:267 -#: templates/helpdesk/dashboard.html:15 templates/helpdesk/dashboard.html:58 -#: templates/helpdesk/dashboard.html:78 templates/helpdesk/dashboard.html:100 -#: templates/helpdesk/dashboard.html:124 templates/helpdesk/rss_list.html:24 -#: templates/helpdesk/ticket_list.html:69 -#: templates/helpdesk/ticket_list.html:88 -#: templates/helpdesk/ticket_list.html:225 views/staff.py:1032 -#: views/staff.py:1038 views/staff.py:1044 views/staff.py:1050 +#: admin.py:29 models.py:404 templates/helpdesk/public_view_ticket.html:19 +#: templates/helpdesk/ticket_desc_table.html:52 +msgid "Submitter E-Mail" +msgstr "Электронный адрес отправителя" + +#: forms.py:139 models.py:269 models.py:388 +#: templates/helpdesk/include/tickets.html:18 +#: templates/helpdesk/include/unassigned.html:18 +#: templates/helpdesk/report_index.html:39 templates/helpdesk/rss_list.html:34 +#: templates/helpdesk/ticket_list.html:62 +#: templates/helpdesk/ticket_list.html:81 +#: templates/helpdesk/ticket_list.html:222 views/staff.py:1178 +#: views/staff.py:1184 views/staff.py:1190 views/staff.py:1196 msgid "Queue" msgstr "Очередь" -#: forms.py:137 +#: forms.py:148 msgid "Summary of the problem" msgstr "Краткое описание проблемы" -#: forms.py:142 -msgid "Submitter E-Mail Address" -msgstr "Адрес электронной почты отправителя" +#: forms.py:153 +msgid "Description of your issue" +msgstr "Описание вашей проблемы." -#: forms.py:144 -msgid "" -"This e-mail address will receive copies of all public updates to this " -"ticket." -msgstr "На этот адрес электронной почты будут посылаться копии всех публичных обновлений этого тикета" +#: forms.py:155 +msgid "Please be as descriptive as possible and include all details" +msgstr "" +"Пожалуйста, будьте максимально информативным, нам пригодятся любые " +"подробности касающиеся вашего запроса." -#: forms.py:150 -msgid "Description of Issue" -msgstr "Описание проблемы" - -#: forms.py:157 -msgid "Case owner" -msgstr "Владелец" - -#: forms.py:158 -msgid "" -"If you select an owner other than yourself, they'll be e-mailed details of " -"this ticket immediately." -msgstr "Если вы выберете отличного от себя владельца, ему будут высланы детали этого тикета немедленно." - -#: forms.py:166 models.py:327 management/commands/escalate_tickets.py:154 -#: templates/helpdesk/public_view_ticket.html:23 -#: templates/helpdesk/ticket.html:184 -#: templates/helpdesk/ticket_desc_table.html:47 -#: templates/helpdesk/ticket_list.html:94 views/staff.py:429 +#: forms.py:163 management/commands/escalate_tickets.py:156 models.py:447 +#: templates/helpdesk/public_view_ticket.html:24 +#: templates/helpdesk/ticket.html:211 +#: templates/helpdesk/ticket_desc_table.html:57 +#: templates/helpdesk/ticket_list.html:87 views/staff.py:496 msgid "Priority" msgstr "Приоритет" -#: forms.py:167 +#: forms.py:164 msgid "Please select a priority carefully. If unsure, leave it as '3'." -msgstr "Пожалуйста, выбирайте приоритет внимательно. Если не уверены, оставьте 3, как есть." +msgstr "" +"Пожалуйста, выбирайте приоритет внимательно. Если не уверены, оставьте 3, " +"как есть." -#: forms.py:174 forms.py:365 models.py:335 templates/helpdesk/ticket.html:186 -#: views/staff.py:439 +#: forms.py:170 models.py:455 templates/helpdesk/ticket.html:213 +#: views/staff.py:506 msgid "Due on" msgstr "Выполнить до" -#: forms.py:186 forms.py:370 +#: forms.py:175 msgid "Attach File" msgstr "Прикрепить файл" -#: forms.py:187 forms.py:371 +#: forms.py:176 msgid "You can attach a file such as a document or screenshot to this ticket." msgstr "Вы можете прикрепить файл, например, документ или скриншот, к тикету." -#: forms.py:240 -msgid "Ticket Opened" -msgstr "Тикет открыт" +#: forms.py:299 +msgid "Submitter E-Mail Address" +msgstr "Адрес электронной почты отправителя" -#: forms.py:247 +#: forms.py:301 +msgid "" +"This e-mail address will receive copies of all public updates to this ticket." +msgstr "" +"На этот адрес электронной почты будут посылаться копии всех публичных " +"обновлений этого тикета" + +#: forms.py:309 +msgid "Case owner" +msgstr "Владелец" + +#: forms.py:310 +msgid "" +"If you select an owner other than yourself, they'll be e-mailed details of " +"this ticket immediately." +msgstr "" +"Если вы выберете отличного от себя владельца, ему будут высланы детали этого " +"тикета немедленно." + +#: forms.py:338 #, python-format msgid "Ticket Opened & Assigned to %(name)s" msgstr "Тикет открыт и назначен %(name)s" -#: forms.py:337 -msgid "Summary of your query" -msgstr "Краткое описание вашего запроса" +#: forms.py:339 +msgid "" +msgstr "" #: forms.py:342 +msgid "Ticket Opened" +msgstr "Тикет открыт" + +#: forms.py:362 msgid "Your E-Mail Address" msgstr "Ваш адрес электронной почты" -#: forms.py:343 +#: forms.py:363 msgid "We will e-mail you when your ticket is updated." msgstr "Мы известим вас по электронной почте, когда тикет обновится." -#: forms.py:348 -msgid "Description of your issue" -msgstr "Описание вашей проблемы." - -#: forms.py:350 -msgid "" -"Please be as descriptive as possible, including any details we may need to " -"address your query." -msgstr "Пожалуйста, будьте максимально информативным, нам пригодятся любые подробности касающиеся вашего запроса." - -#: forms.py:358 -msgid "Urgency" -msgstr "Срочность" - -#: forms.py:359 -msgid "Please select a priority carefully." -msgstr "Пожалуйста, тщательно выберите приоритеты." - -#: forms.py:419 +#: forms.py:384 msgid "Ticket Opened Via Web" msgstr "Тикет открыт через Web" -#: forms.py:486 +#: forms.py:397 msgid "Show Ticket List on Login?" msgstr "Показывать список тикетов после входа?" -#: forms.py:487 +#: forms.py:398 msgid "Display the ticket list upon login? Otherwise, the dashboard is shown." msgstr "Показывать список тикетов после входа? Иначе будет показана панель." -#: forms.py:492 +#: forms.py:403 msgid "E-mail me on ticket change?" msgstr "Уведомлять меня по электронной почте о изменениях тикета?" -#: forms.py:493 +#: forms.py:404 msgid "" -"If you're the ticket owner and the ticket is changed via the web by somebody" -" else, do you want to receive an e-mail?" -msgstr "Если вы владелец тикета и тикет меняется через web кем-то еще, вы хотите получить уведомление по электронной почте?" +"If you're the ticket owner and the ticket is changed via the web by somebody " +"else, do you want to receive an e-mail?" +msgstr "" +"Если вы владелец тикета и тикет меняется через web кем-то еще, вы хотите " +"получить уведомление по электронной почте?" -#: forms.py:498 +#: forms.py:409 msgid "E-mail me when assigned a ticket?" msgstr "Уведомить меня по электронной почте о назначенных мне тикетах?" -#: forms.py:499 +#: forms.py:410 msgid "" "If you are assigned a ticket via the web, do you want to receive an e-mail?" -msgstr "Хотите ли получать уведомления по электронной почте если кто-то назначил вам тикет через web?" +msgstr "" +"Хотите ли получать уведомления по электронной почте если кто-то назначил вам " +"тикет через web?" -#: forms.py:504 -msgid "E-mail me when a ticket is changed via the API?" -msgstr "Уведомить меня когда тикет изменён через API?" - -#: forms.py:505 -msgid "If a ticket is altered by the API, do you want to receive an e-mail?" -msgstr "Хотите ли вы получать электронное уведомление если тикет был изменён через API" - -#: forms.py:510 +#: forms.py:415 msgid "Number of tickets to show per page" msgstr "Количество тикетов на страницу" -#: forms.py:511 +#: forms.py:416 msgid "How many tickets do you want to see on the Ticket List page?" msgstr "Как много тикетов вы хотите видеть на странице?" -#: forms.py:518 +#: forms.py:422 msgid "Use my e-mail address when submitting tickets?" msgstr "Использовать мой адрес электронной почты при отправке тикета?" -#: forms.py:519 +#: forms.py:423 msgid "" "When you submit a ticket, do you want to automatically use your e-mail " "address as the submitter address? You can type a different e-mail address " "when entering the ticket if needed, this option only changes the default." -msgstr "Когда вы отправляете тикет, вы хотите, чтобы автоматически использовался ваш адрес электронной почты в качестве отправителя? Вы можете ввести другой адрес электронной почты при создании тикета в случае необходимости. Этот вариант только изменит значение по умолчанию." +msgstr "" +"Когда вы отправляете тикет, вы хотите, чтобы автоматически использовался ваш " +"адрес электронной почты в качестве отправителя? Вы можете ввести другой " +"адрес электронной почты при создании тикета в случае необходимости. Этот " +"вариант только изменит значение по умолчанию." -#: models.py:35 models.py:261 models.py:503 models.py:817 models.py:853 -#: templates/helpdesk/dashboard.html:58 templates/helpdesk/dashboard.html:78 -#: templates/helpdesk/dashboard.html:100 templates/helpdesk/dashboard.html:124 -#: templates/helpdesk/ticket.html:178 templates/helpdesk/ticket_list.html:85 -#: templates/helpdesk/ticket_list.html:225 views/staff.py:419 +#: management/commands/create_queue_permissions.py:69 +#: migrations/0009_migrate_queuemembership.py:30 models.py:322 +msgid "Permission for queue: " +msgstr "Право на очередь:" + +#: management/commands/create_usersettings.py:24 +msgid "" +"Check for user without django-helpdesk UserSettings and create settings if " +"required. Uses settings.DEFAULT_USER_SETTINGS which can be overridden to " +"suit your situation." +msgstr "" +"Проверить пользователя без django-helpdesk UserSettings и создать настройки, " +"если требуется. Используйте settings.DEFAULT_USER_SETTINGS в файле " +"настройки, который может быть изменен в зависимости от ситуации." + +#: management/commands/escalate_tickets.py:150 +#, python-format +msgid "Ticket escalated after %s days" +msgstr "Тикет поднят после %s дней" + +#: management/commands/get_email.py:264 +msgid "Created from e-mail" +msgstr "Создан из электронной почты" + +#: management/commands/get_email.py:270 +msgid "Unknown Sender" +msgstr "Неизвестный отправитель" + +#: management/commands/get_email.py:311 +msgid "email_html_body.html" +msgstr "email_html_body.html" + +#: management/commands/get_email.py:324 +#| msgid "" +#| "No plain-text email body available. Please see attachment email_html_body." +#| "html." +msgid "" +"No plain-text email body available. Please see attachment \"email_html_body." +"html\"." +msgstr "" +"Тело email-сообщения недоступно. Пожалуйста, посмотрите email_html_body.html." + +#: management/commands/get_email.py:358 +#, python-format +msgid "E-Mail Received from %(sender_email)s" +msgstr "Электронное сообщение получено от %(sender_email)s" + +#: management/commands/get_email.py:366 +#, python-format +msgid "Ticket Re-Opened by E-Mail Received from %(sender_email)s" +msgstr "" +"Тикет заново открыт полученным от %(sender_email)s электронным сообщением" + +#: models.py:33 models.py:382 models.py:636 models.py:942 models.py:979 +#: templates/helpdesk/include/tickets.html:17 +#: templates/helpdesk/include/unassigned.html:17 +#: templates/helpdesk/ticket.html:205 templates/helpdesk/ticket_list.html:78 +#: templates/helpdesk/ticket_list.html:221 views/staff.py:468 msgid "Title" msgstr "Заголовок" -#: models.py:40 models.py:822 models.py:1206 +#: models.py:38 models.py:947 models.py:1334 msgid "Slug" msgstr "ЧПУ" @@ -200,21 +254,26 @@ msgstr "ЧПУ" msgid "" "This slug is used when building ticket ID's. Once set, try not to change it " "or e-mailing may get messy." -msgstr "Эта строка используется для конструирования идентификатора тикета. Однажды установив, старайтесь не менять его, или электронная почта может перепутаться." +msgstr "" +"Эта строка используется для конструирования идентификатора тикета. Однажды " +"установив, старайтесь не менять его, или электронная почта может " +"перепутаться." -#: models.py:46 models.py:1054 models.py:1129 models.py:1203 -#: templates/helpdesk/email_ignore_list.html:13 -#: templates/helpdesk/ticket_cc_list.html:15 +#: models.py:46 models.py:1180 models.py:1251 models.py:1331 +#: templates/helpdesk/email_ignore_list.html:25 msgid "E-Mail Address" msgstr "Адрес электронной почты" #: models.py:49 msgid "" -"All outgoing e-mails for this queue will use this e-mail address. If you use" -" IMAP or POP3, this should be the e-mail address for that mailbox." -msgstr "Все исходящие электронные письма этой очереди будут использовать этот электронный адрес. Если вы используете IMAP или POP3 это и есть этот электронный адрес." +"All outgoing e-mails for this queue will use this e-mail address. If you use " +"IMAP or POP3, this should be the e-mail address for that mailbox." +msgstr "" +"Все исходящие электронные письма этой очереди будут использовать этот " +"электронный адрес. Если вы используете IMAP или POP3 это и есть этот " +"электронный адрес." -#: models.py:55 models.py:794 +#: models.py:55 models.py:918 msgid "Locale" msgstr "Локаль" @@ -224,11 +283,11 @@ msgid "" "language." msgstr "Локаль этой очереди. Вся переписка в этой очереди будет на этом языке." -#: models.py:63 +#: models.py:64 msgid "Allow Public Submission?" msgstr "Разрешить общедоступное размещение тикетов?" -#: models.py:66 +#: models.py:67 msgid "Should this queue be listed on the public submission form?" msgstr "Должна ли эта очередь быть доступна в публичной форме заявки?" @@ -238,7 +297,9 @@ msgstr "Разрешить размещение тикета через элек #: models.py:74 msgid "Do you want to poll the e-mail box below for new tickets?" -msgstr "Хотите ли вы опрашивать ниже указанный электронный адрес на наличие новых тикетов?" +msgstr "" +"Хотите ли вы опрашивать ниже указанный электронный адрес на наличие новых " +"тикетов?" #: models.py:79 msgid "Escalation Days" @@ -248,7 +309,9 @@ msgstr "Дни поднятия" msgid "" "For tickets which are not held, how often do you wish to increase their " "priority? Set to 0 for no escalation." -msgstr "Как часто вы желаете увеличивать их приоритет для тикетов которые не на удержании? 0 для отключения подъёма." +msgstr "" +"Как часто вы желаете увеличивать их приоритет для тикетов которые не на " +"удержании? 0 для отключения подъёма." #: models.py:87 msgid "New Ticket CC Address" @@ -257,9 +320,12 @@ msgstr "Поле \"Копия\" нового тикета" #: models.py:91 msgid "" "If an e-mail address is entered here, then it will receive notification of " -"all new tickets created for this queue. Enter a comma between multiple " -"e-mail addresses." -msgstr "Если здесь ввести адрес электронной почты, то он будет получать уведомления обо всех новых тикетах, созданных в этой очереди. Введите запятую между несколькими адресами электронной почты." +"all new tickets created for this queue. Enter a comma between multiple e-" +"mail addresses." +msgstr "" +"Если здесь ввести адрес электронной почты, то он будет получать уведомления " +"обо всех новых тикетах, созданных в этой очереди. Введите запятую между " +"несколькими адресами электронной почты." #: models.py:97 msgid "Updated Ticket CC Address" @@ -270,7 +336,10 @@ msgid "" "If an e-mail address is entered here, then it will receive notification of " "all activity (new tickets, closed tickets, updates, reassignments, etc) for " "this queue. Separate multiple addresses with a comma." -msgstr "Если ввести здесь адрес электронной почты, то он будет получать уведомления о всей деятельности (новые тикеты, закрытие тикета, обновления, назначений и т.д.) в данной очереди. Разделяйте адреса запятыми." +msgstr "" +"Если ввести здесь адрес электронной почты, то он будет получать уведомления " +"о всей деятельности (новые тикеты, закрытие тикета, обновления, назначений и " +"т.д.) в данной очереди. Разделяйте адреса запятыми." #: models.py:108 msgid "E-Mail Box Type" @@ -284,873 +353,957 @@ msgstr "POP3" msgid "IMAP" msgstr "IMAP" +#: models.py:110 +msgid "Local Directory" +msgstr "" + #: models.py:113 msgid "" "E-Mail server type for creating tickets automatically from a mailbox - both " -"POP3 and IMAP are supported." -msgstr "Тип ящика электронной почты, из которого будут создаваться автоматические тикета - оба POP3 и IMAP поддерживаются." +"POP3 and IMAP are supported, as well as reading from a local directory." +msgstr "" +"Тип ящика электронной почты, из которого будут создаваться автоматические " +"тикеты. Поддерживаются POP3 и IMAP." -#: models.py:118 +#: models.py:119 msgid "E-Mail Hostname" -msgstr "Имя сервера электронной почты" +msgstr "Имя хоста сервера электронной почты" -#: models.py:122 +#: models.py:123 msgid "" "Your e-mail server address - either the domain name or IP address. May be " "\"localhost\"." -msgstr "Адрес вашего сервера электронной почты - может быть имя, или IP адрес. Или даже \"localhost\"." +msgstr "" +"Адрес вашего сервера электронной почты - может быть имя, или IP адрес. Или " +"даже \"localhost\"." -#: models.py:127 +#: models.py:128 msgid "E-Mail Port" msgstr "Порт электронный почты" -#: models.py:130 +#: models.py:131 msgid "" "Port number to use for accessing e-mail. Default for POP3 is \"110\", and " "for IMAP is \"143\". This may differ on some servers. Leave it blank to use " "the defaults." -msgstr "Номер порта для доступа к электронному ящику. По умолчанию \"110\" для POP3, и \"143\" для IMAP. Настройки могут отличатся на разных серверах. Оставьте пустым для использования значения по умолчанию." +msgstr "" +"Номер порта для доступа к электронному ящику. По умолчанию \"110\" для POP3, " +"и \"143\" для IMAP. Настройки могут отличатся на разных серверах. Оставьте " +"пустым для использования значения по умолчанию." -#: models.py:136 +#: models.py:137 msgid "Use SSL for E-Mail?" msgstr "Использовать SSL для электронной почты?" -#: models.py:139 +#: models.py:140 msgid "" "Whether to use SSL for IMAP or POP3 - the default ports when using SSL are " "993 for IMAP and 995 for POP3." -msgstr "Использовать SSL для IMAP или POP3 - порты по умолчанию для SSL 993 для IMAP и 995 для POP3." +msgstr "" +"Использовать SSL для IMAP или POP3 - порты по умолчанию для SSL 993 для IMAP " +"и 995 для POP3." -#: models.py:144 +#: models.py:145 msgid "E-Mail Username" msgstr "Имя пользователя электронной почты" -#: models.py:148 +#: models.py:149 msgid "Username for accessing this mailbox." msgstr "Имя пользователя для доступа к этому электронному ящику." -#: models.py:152 +#: models.py:153 msgid "E-Mail Password" msgstr "Пароль электронной почты" -#: models.py:156 +#: models.py:157 msgid "Password for the above username" msgstr "Пароль для выше указанного имени пользователя" -#: models.py:160 +#: models.py:161 msgid "IMAP Folder" msgstr "Папка IMAP" -#: models.py:164 +#: models.py:165 msgid "" "If using IMAP, what folder do you wish to fetch messages from? This allows " "you to use one IMAP account for multiple queues, by filtering messages on " "your IMAP server into separate folders. Default: INBOX." -msgstr "Если используется IMAP, из какой папки вы желаете скачивать сообщения? Фильтрация сообщений на сервере позволяет вам использовать один IMAP аккаунт для множества очередей. По умолчанию: INBOX." +msgstr "" +"Если используется IMAP, из какой папки вы желаете скачивать сообщения? " +"Фильтрация сообщений на сервере позволяет вам использовать один IMAP аккаунт " +"для множества очередей. По умолчанию: INBOX." -#: models.py:171 +#: models.py:172 +#, fuzzy +#| msgid "E-Mail Port" +msgid "E-Mail Local Directory" +msgstr "Порт электронный почты" + +#: models.py:176 +msgid "" +"If using a local directory, what directory path do you wish to poll for new " +"email? Example: /var/lib/mail/helpdesk/" +msgstr "" + +#: models.py:182 +msgid "Django auth permission name" +msgstr "Наименование права доступа Django" + +#: models.py:187 +msgid "Name used in the django.contrib.auth permission system" +msgstr "Имя, используемое в django.contrib.auth" + +#: models.py:191 msgid "E-Mail Check Interval" msgstr "Интервал проверки электронной почты" -#: models.py:172 +#: models.py:192 msgid "How often do you wish to check this mailbox? (in Minutes)" msgstr "Как часто вы хотите проверять этот ящик? (в минутах)" -#: models.py:191 templates/helpdesk/email_ignore_list.html:13 +#: models.py:206 +msgid "Socks Proxy Type" +msgstr "Тип Socks-прокси" + +#: models.py:208 +msgid "SOCKS4" +msgstr "" + +#: models.py:208 +msgid "SOCKS5" +msgstr "" + +#: models.py:211 +msgid "" +"SOCKS4 or SOCKS5 allows you to proxy your connections through a SOCKS server." +msgstr "" + +#: models.py:215 +msgid "Socks Proxy Host" +msgstr "Хост Socks-прокси" + +#: models.py:218 +msgid "Socks proxy IP address. Default: 127.0.0.1" +msgstr "IP-адрес Socks-прокси. По-умолчанию: 127.0.0.1" + +#: models.py:222 +msgid "Socks Proxy Port" +msgstr "Порт Socks-прокси" + +#: models.py:225 +msgid "Socks proxy port number. Default: 9150 (default TOR port)" +msgstr "Номер порта Socks-прокси. По-умолчанию: 9150 (порт TOR по-умолчанию)" + +#: models.py:229 +msgid "Logging Type" +msgstr "Тип журналирования" + +#: models.py:232 templates/helpdesk/ticket_list.html:247 +msgid "None" +msgstr "Ничего" + +#: models.py:233 +msgid "Debug" +msgstr "Отладка" + +#: models.py:234 +msgid "Information" +msgstr "Информация" + +#: models.py:235 +msgid "Warning" +msgstr "Внимание" + +#: models.py:236 +msgid "Error" +msgstr "Ошибка" + +#: models.py:237 +msgid "Critical" +msgstr "Критичный" + +#: models.py:241 +msgid "" +"Set the default logging level. All messages at that level or above will be " +"logged to the directory set below. If no level is set, logging will be " +"disabled." +msgstr "" + +#: models.py:247 +msgid "Logging Directory" +msgstr "" + +#: models.py:251 +msgid "" +"If logging is enabled, what directory should we use to store log files for " +"this queue? If no directory is set, default to /var/log/helpdesk/" +msgstr "" + +#: models.py:261 +msgid "Default owner" +msgstr "Владелец по-умолчанию" + +#: models.py:270 templates/helpdesk/email_ignore_list.html:27 msgid "Queues" msgstr "Очереди" -#: models.py:245 templates/helpdesk/dashboard.html:15 -#: templates/helpdesk/ticket.html:138 +#: models.py:366 templates/helpdesk/report_index.html:40 +#: templates/helpdesk/ticket.html:156 msgid "Open" msgstr "Открытый" -#: models.py:246 templates/helpdesk/ticket.html:144 -#: templates/helpdesk/ticket.html.py:150 templates/helpdesk/ticket.html:155 -#: templates/helpdesk/ticket.html.py:159 +#: models.py:367 templates/helpdesk/ticket.html:164 +#: templates/helpdesk/ticket.html:172 templates/helpdesk/ticket.html:178 +#: templates/helpdesk/ticket.html:183 msgid "Reopened" msgstr "Переоткрытый" -#: models.py:247 templates/helpdesk/dashboard.html:15 -#: templates/helpdesk/ticket.html:139 templates/helpdesk/ticket.html.py:145 -#: templates/helpdesk/ticket.html:151 +#: models.py:368 templates/helpdesk/report_index.html:41 +#: templates/helpdesk/ticket.html:157 templates/helpdesk/ticket.html:165 +#: templates/helpdesk/ticket.html:173 msgid "Resolved" msgstr "Решённый" -#: models.py:248 templates/helpdesk/dashboard.html:15 -#: templates/helpdesk/ticket.html:140 templates/helpdesk/ticket.html.py:146 -#: templates/helpdesk/ticket.html:152 templates/helpdesk/ticket.html.py:156 +#: models.py:369 templates/helpdesk/report_index.html:42 +#: templates/helpdesk/ticket.html:158 templates/helpdesk/ticket.html:166 +#: templates/helpdesk/ticket.html:174 templates/helpdesk/ticket.html:179 msgid "Closed" msgstr "Закрытый" -#: models.py:249 templates/helpdesk/ticket.html:141 -#: templates/helpdesk/ticket.html.py:147 templates/helpdesk/ticket.html:160 +#: models.py:370 templates/helpdesk/ticket.html:159 +#: templates/helpdesk/ticket.html:167 templates/helpdesk/ticket.html:184 msgid "Duplicate" msgstr "Дубликат" -#: models.py:253 +#: models.py:374 msgid "1. Critical" msgstr "1. Критичный" -#: models.py:254 +#: models.py:375 msgid "2. High" msgstr "2. Высокий" -#: models.py:255 +#: models.py:376 msgid "3. Normal" msgstr "3. Нормальный" -#: models.py:256 +#: models.py:377 msgid "4. Low" msgstr "4. Низкий" -#: models.py:257 +#: models.py:378 msgid "5. Very Low" msgstr "5. Очень низкий" -#: models.py:271 templates/helpdesk/dashboard.html:100 -#: templates/helpdesk/ticket_list.html:82 -#: templates/helpdesk/ticket_list.html:225 +#: models.py:392 templates/helpdesk/include/unassigned.html:19 +#: templates/helpdesk/ticket_list.html:75 +#: templates/helpdesk/ticket_list.html:224 msgid "Created" msgstr "Создан" -#: models.py:273 +#: models.py:394 msgid "Date this ticket was first created" -msgstr "Дата создания этого талона" +msgstr "Дата создания этого тикета" -#: models.py:277 +#: models.py:398 msgid "Modified" msgstr "Изменённый" -#: models.py:279 +#: models.py:400 msgid "Date this ticket was most recently changed." msgstr "Дата когда тикет был последний раз изменён." -#: models.py:283 templates/helpdesk/public_view_ticket.html:18 -#: templates/helpdesk/ticket_desc_table.html:42 -msgid "Submitter E-Mail" -msgstr "Электронный адрес отправителя" - -#: models.py:286 +#: models.py:407 msgid "" "The submitter will receive an email for all public follow-ups left for this " "task." -msgstr "Отправитель будет получать электронные сообщения обо всех публичных дополнениях к этой задаче." +msgstr "" +"Отправитель будет получать электронные сообщения обо всех публичных " +"дополнениях к этой задаче." -#: models.py:295 +#: models.py:416 msgid "Assigned to" msgstr "Связан с" -#: models.py:299 templates/helpdesk/dashboard.html:58 -#: templates/helpdesk/dashboard.html:78 templates/helpdesk/dashboard.html:124 -#: templates/helpdesk/ticket_list.html:70 -#: templates/helpdesk/ticket_list.html:91 -#: templates/helpdesk/ticket_list.html:225 +#: models.py:420 templates/helpdesk/include/tickets.html:19 +#: templates/helpdesk/ticket_list.html:63 +#: templates/helpdesk/ticket_list.html:84 +#: templates/helpdesk/ticket_list.html:223 views/staff.py:478 msgid "Status" msgstr "Статус" -#: models.py:305 +#: models.py:426 msgid "On Hold" msgstr "Удерживаемый" -#: models.py:308 +#: models.py:429 msgid "If a ticket is on hold, it will not automatically be escalated." msgstr "Если тикет на удержании он не будет автоматически поднят." -#: models.py:313 models.py:826 templates/helpdesk/public_view_ticket.html:41 -#: templates/helpdesk/ticket_desc_table.html:19 +#: models.py:433 models.py:951 templates/helpdesk/public_view_ticket.html:42 +#: templates/helpdesk/ticket_desc_table.html:29 msgid "Description" msgstr "Описание" -#: models.py:316 +#: models.py:436 msgid "The content of the customers query." msgstr "Содержимое запроса клиента." -#: models.py:320 templates/helpdesk/public_view_ticket.html:48 -#: templates/helpdesk/ticket_desc_table.html:26 +#: models.py:440 templates/helpdesk/public_view_ticket.html:49 +#: templates/helpdesk/ticket_desc_table.html:36 msgid "Resolution" msgstr "Решение" -#: models.py:323 +#: models.py:443 msgid "The resolution provided to the customer by our staff." msgstr "Решение предоставлено клиенту нашими сотрудниками." -#: models.py:331 +#: models.py:451 msgid "1 = Highest Priority, 5 = Low Priority" msgstr "1 = Наивысший Приоритет, 5 = Низший Приоритет" -#: models.py:344 +#: models.py:464 msgid "" "The date this ticket was last escalated - updated automatically by " "management/commands/escalate_tickets.py." -msgstr "Дата когда тикет последний раз поднят, автоматически обновляется вызовом management/commands/escalate_tickets.py." +msgstr "" +"Дата когда тикет последний раз поднят, автоматически обновляется вызовом " +"management/commands/escalate_tickets.py." -#: models.py:353 templates/helpdesk/ticket_desc_table.html:38 -#: views/feeds.py:95 views/feeds.py:121 views/feeds.py:173 views/staff.py:376 +#: models.py:473 templates/helpdesk/ticket_desc_table.html:48 views/feeds.py:93 +#: views/feeds.py:118 views/feeds.py:170 views/staff.py:440 msgid "Unassigned" msgstr "Неназначенный" -#: models.py:392 +#: models.py:513 msgid " - On Hold" msgstr " - На Удержании" -#: models.py:394 +#: models.py:516 msgid " - Open dependencies" -msgstr "" +msgstr " - Открыты зависимости" -#: models.py:448 models.py:494 models.py:1117 models.py:1280 models.py:1309 -#: templates/helpdesk/public_homepage.html:78 +#: models.py:571 models.py:627 models.py:1239 models.py:1413 models.py:1446 +#: templates/helpdesk/public_homepage.html:79 #: templates/helpdesk/public_view_form.html:12 msgid "Ticket" -msgstr "Талон" +msgstr "Тикет" -#: models.py:449 templates/helpdesk/navigation.html:17 -#: templates/helpdesk/ticket_list.html:2 -#: templates/helpdesk/ticket_list.html:224 +#: models.py:572 templates/helpdesk/navigation.html:23 +#: templates/helpdesk/ticket_list.html:4 msgid "Tickets" msgstr "Тикеты" -#: models.py:498 models.py:738 models.py:1047 models.py:1200 +#: models.py:631 models.py:862 models.py:1173 models.py:1328 msgid "Date" msgstr "Дата" -#: models.py:510 views/staff.py:390 +#: models.py:643 views/staff.py:457 msgid "Comment" msgstr "Комментарий" -#: models.py:516 +#: models.py:649 msgid "Public" msgstr "Публичный" -#: models.py:519 +#: models.py:652 msgid "" "Public tickets are viewable by the submitter and all staff, but non-public " "tickets can only be seen by staff." -msgstr "Публичные талоны видны отправителям и коллективу, а не публичные только коллективу." +msgstr "" +"Публичные тикеты видны отправителям и коллективу, а не публичные только " +"коллективу." -#: models.py:527 models.py:922 models.py:1125 views/staff.py:1008 -#: views/staff.py:1014 views/staff.py:1020 views/staff.py:1026 +#: models.py:660 models.py:1048 models.py:1247 +#: templates/helpdesk/ticket_cc_add.html:20 views/staff.py:1153 +#: views/staff.py:1159 views/staff.py:1166 views/staff.py:1172 msgid "User" msgstr "Пользователь" -#: models.py:531 templates/helpdesk/ticket.html:135 +#: models.py:664 templates/helpdesk/ticket.html:152 msgid "New Status" msgstr "Новый статус" -#: models.py:535 +#: models.py:668 msgid "If the status was changed, what was it changed to?" msgstr "Если статус был изменён, на что он был изменён?" -#: models.py:542 models.py:566 models.py:628 +#: models.py:675 models.py:700 models.py:762 msgid "Follow-up" msgstr "Наблюдение" -#: models.py:543 +#: models.py:676 msgid "Follow-ups" msgstr "" -#: models.py:570 models.py:1285 +#: models.py:704 models.py:1418 msgid "Field" msgstr "Поле" -#: models.py:575 +#: models.py:709 msgid "Old Value" msgstr "Старое значение" -#: models.py:581 +#: models.py:715 msgid "New Value" msgstr "Новое значение" -#: models.py:589 +#: models.py:723 msgid "removed" msgstr "удалённый" -#: models.py:591 +#: models.py:725 #, python-format msgid "set to %s" msgstr "установлен в %s" -#: models.py:593 +#: models.py:727 #, python-format msgid "changed from \"%(old_value)s\" to \"%(new_value)s\"" msgstr "изменён с \"%(old_value)s\" на \"%(new_value)s\"" -#: models.py:600 +#: models.py:734 msgid "Ticket change" -msgstr "" +msgstr "Изменение тикета" -#: models.py:601 +#: models.py:735 msgid "Ticket changes" -msgstr "" +msgstr "Изменения тикета" -#: models.py:632 +#: models.py:766 msgid "File" msgstr "Файл" -#: models.py:637 +#: models.py:772 msgid "Filename" msgstr "Имя файла" -#: models.py:642 +#: models.py:777 msgid "MIME Type" msgstr "MIME тип" -#: models.py:647 +#: models.py:782 msgid "Size" msgstr "Размер" -#: models.py:648 +#: models.py:783 msgid "Size of this file in bytes" msgstr "Размер этого файла в байтах" -#: models.py:665 +#: models.py:791 msgid "Attachment" -msgstr "" +msgstr "Вложение" -#: models.py:666 +#: models.py:792 msgid "Attachments" -msgstr "" +msgstr "Вложения" -#: models.py:685 -msgid "" -"Leave blank to allow this reply to be used for all queues, or select those " -"queues you wish to limit this reply to." -msgstr "Оставьте пустым что бы позволить всем очередям использовать этот ответ, или выберете каким очередям можно использовать этот ответ." - -#: models.py:690 models.py:733 models.py:1042 -#: templates/helpdesk/email_ignore_list.html:13 -msgid "Name" -msgstr "Имя" - -#: models.py:692 -msgid "" -"Only used to assist users with selecting a reply - not shown to the user." -msgstr "Используется пользователям только что бы помочь им выбрать ответ - пользователю не показывается." - -#: models.py:697 -msgid "Body" -msgstr "Тело" - -#: models.py:698 -msgid "" -"Context available: {{ ticket }} - ticket object (eg {{ ticket.title }}); {{ " -"queue }} - The queue; and {{ user }} - the current user." -msgstr "Доступный контекст: {{ ticket }} - тикет (например {{ ticket.title }}); {{ queue }} - очередь; и {{ user }} - текущий пользователь." - -#: models.py:705 +#: models.py:809 msgid "Pre-set reply" msgstr "" -#: models.py:706 +#: models.py:810 msgid "Pre-set replies" msgstr "" -#: models.py:727 +#: models.py:815 +msgid "" +"Leave blank to allow this reply to be used for all queues, or select those " +"queues you wish to limit this reply to." +msgstr "" +"Оставьте пустым что бы позволить всем очередям использовать этот ответ, или " +"выберете каким очередям можно использовать этот ответ." + +#: models.py:820 models.py:857 models.py:1168 +#: templates/helpdesk/email_ignore_list.html:24 +msgid "Name" +msgstr "Имя" + +#: models.py:822 +msgid "" +"Only used to assist users with selecting a reply - not shown to the user." +msgstr "" +"Используется пользователям только что бы помочь им выбрать ответ - " +"пользователю не показывается." + +#: models.py:827 +msgid "Body" +msgstr "Тело" + +#: models.py:828 +msgid "" +"Context available: {{ ticket }} - ticket object (eg {{ ticket.title }}); " +"{{ queue }} - The queue; and {{ user }} - the current user." +msgstr "" +"Доступный контекст: {{ ticket }} - тикет (например {{ ticket.title }}); " +"{{ queue }} - очередь; и {{ user }} - текущий пользователь." + +#: models.py:852 msgid "" "Leave blank for this exclusion to be applied to all queues, or select those " "queues you wish to exclude with this entry." -msgstr "Оставьте пустым что бы это исключение применялось ко всем очередям, или выберите очереди для который применять исключение." +msgstr "" +"Оставьте пустым что бы это исключение применялось ко всем очередям, или " +"выберите очереди для который применять исключение." -#: models.py:739 +#: models.py:863 msgid "Date on which escalation should not happen" msgstr "Дата когда новые тикеты не должны подниматься." -#: models.py:746 +#: models.py:870 msgid "Escalation exclusion" msgstr "" -#: models.py:747 +#: models.py:871 msgid "Escalation exclusions" msgstr "" -#: models.py:760 +#: models.py:885 msgid "Template Name" msgstr "Имя шаблона" -#: models.py:765 +#: models.py:890 msgid "Subject" msgstr "Тема" -#: models.py:767 +#: models.py:892 msgid "" "This will be prefixed with \"[ticket.ticket] ticket.title\". We recommend " -"something simple such as \"(Updated\") or \"(Closed)\" - the same context is" -" available as in plain_text, below." -msgstr "Добавится приставка \"[ticket.ticket] ticket.title\". Мы рекомендуем что нибудь простое например \"(Updated\") или \"(Closed)\" - тот же контекст доступен ниже в plain_text." +"something simple such as \"(Updated\") or \"(Closed)\" - the same context is " +"available as in plain_text, below." +msgstr "" +"Добавится приставка \"[ticket.ticket] ticket.title\". Мы рекомендуем что " +"нибудь простое например \"(Updated\") или \"(Closed)\" - тот же контекст " +"доступен ниже в plain_text." -#: models.py:773 +#: models.py:898 msgid "Heading" msgstr "Заголовок" -#: models.py:775 +#: models.py:900 msgid "" -"In HTML e-mails, this will be the heading at the top of the email - the same" -" context is available as in plain_text, below." -msgstr "В HTML электронных письмах, это будет в заголовке - тот же контекст доступен в виде plain_text ниже." +"In HTML e-mails, this will be the heading at the top of the email - the same " +"context is available as in plain_text, below." +msgstr "" +"В HTML электронных письмах, это будет в заголовке - тот же контекст доступен " +"в виде plain_text ниже." -#: models.py:781 +#: models.py:906 msgid "Plain Text" msgstr "Чистый текст" -#: models.py:782 +#: models.py:907 msgid "" "The context available to you includes {{ ticket }}, {{ queue }}, and " "depending on the time of the call: {{ resolution }} or {{ comment }}." -msgstr "Доступный контекст для включения {{ ticket }}, {{ queue }}, и в зависимости от времени вызова: {{ resolution }} или {{ comment }}." +msgstr "" +"Доступный контекст для включения {{ ticket }}, {{ queue }}, и в зависимости " +"от времени вызова: {{ resolution }} или {{ comment }}." -#: models.py:788 +#: models.py:913 msgid "HTML" msgstr "HTML" -#: models.py:789 +#: models.py:914 msgid "The same context is available here as in plain_text, above." msgstr "Тот же самый контекст доступен здесь как в plain_text выше." -#: models.py:798 +#: models.py:922 msgid "Locale of this template." msgstr "Локаль этого шаблона." -#: models.py:806 +#: models.py:930 msgid "e-mail template" -msgstr "" +msgstr "шаблон e-mail" -#: models.py:807 +#: models.py:931 msgid "e-mail templates" -msgstr "" +msgstr "шаблоны e-mail" -#: models.py:834 +#: models.py:959 msgid "Knowledge base category" msgstr "категорию Базы Знаний" -#: models.py:835 +#: models.py:960 msgid "Knowledge base categories" msgstr "Категории Базы Знаний" -#: models.py:849 templates/helpdesk/kb_index.html:11 -#: templates/helpdesk/public_homepage.html:11 +#: models.py:975 templates/helpdesk/public_homepage.html:12 msgid "Category" msgstr "Категория" -#: models.py:858 +#: models.py:984 msgid "Question" msgstr "Вопрос" -#: models.py:862 +#: models.py:988 msgid "Answer" msgstr "Ответ" -#: models.py:866 +#: models.py:992 msgid "Votes" msgstr "Голоса" -#: models.py:867 +#: models.py:993 msgid "Total number of votes cast for this item" msgstr "Общее количество отданных голосов" -#: models.py:872 +#: models.py:998 msgid "Positive Votes" msgstr "Положительные голоса" -#: models.py:873 +#: models.py:999 msgid "Number of votes for this item which were POSITIVE." msgstr "Количество положительно проголосовавших." -#: models.py:878 +#: models.py:1004 msgid "Last Updated" msgstr "Последний раз обновлялось" -#: models.py:879 +#: models.py:1005 msgid "The date on which this question was most recently changed." msgstr "Дата когда этот вопрос был последний раз изменён." -#: models.py:893 +#: models.py:1018 msgid "Unrated" msgstr "Неоценённый" -#: models.py:901 +#: models.py:1026 msgid "Knowledge base item" -msgstr "" +msgstr "Запись базы знаний" -#: models.py:902 +#: models.py:1027 msgid "Knowledge base items" -msgstr "" +msgstr "Записи базы знаний" -#: models.py:926 templates/helpdesk/ticket_list.html:170 +#: models.py:1052 templates/helpdesk/ticket_list.html:159 msgid "Query Name" msgstr "Имя запроса" -#: models.py:928 +#: models.py:1054 msgid "User-provided name for this query" msgstr "Имя запроса определённое пользователем" -#: models.py:932 +#: models.py:1058 msgid "Shared With Other Users?" msgstr "Доступен остальным пользователям?" -#: models.py:935 +#: models.py:1061 msgid "Should other users see this query?" msgstr "Виден ли этот запрос другим пользователям?" -#: models.py:939 +#: models.py:1065 msgid "Search Query" msgstr "Поисковый запрос" -#: models.py:940 +#: models.py:1066 msgid "Pickled query object. Be wary changing this." msgstr "Pickle-упакованные объекты запросов. Не изменяйте их." -#: models.py:950 +#: models.py:1076 msgid "Saved search" -msgstr "" +msgstr "Сохранённый поиск" -#: models.py:951 +#: models.py:1077 msgid "Saved searches" -msgstr "" +msgstr "Сохранённые поиски" -#: models.py:966 +#: models.py:1095 msgid "Settings Dictionary" msgstr "Словарь настроек" -#: models.py:967 +#: models.py:1096 msgid "" "This is a base64-encoded representation of a pickled Python dictionary. Do " "not change this field via the admin." -msgstr "Это base64-кодированное представление pickle-упакованного Python словаря. Не изменяйте его через административный интерфейс." - -#: models.py:993 -msgid "User Setting" msgstr "" +"Это base64-кодированное представление pickle-упакованного Python словаря. Не " +"изменяйте его через административный интерфейс." -#: models.py:994 templates/helpdesk/navigation.html:37 +#: models.py:1129 +msgid "User Setting" +msgstr "Пользовательская настройка" + +#: models.py:1130 templates/helpdesk/navigation.html:71 #: templates/helpdesk/user_settings.html:6 msgid "User Settings" msgstr "Настройки пользователя" -#: models.py:1036 +#: models.py:1157 +msgid "Ignored e-mail address" +msgstr "Игнорируемый e-mail-адрес" + +#: models.py:1158 +msgid "Ignored e-mail addresses" +msgstr "Игнорируемые e-mail-адреса" + +#: models.py:1163 msgid "" "Leave blank for this e-mail to be ignored on all queues, or select those " "queues you wish to ignore this e-mail for." -msgstr "Оставьте пустым, чтобы этот адрес электронной почты был проигнорирован во всех очередях, или выберите те очереди, для которых он будет проигнорирован." +msgstr "" +"Оставьте пустым, чтобы этот адрес электронной почты был проигнорирован во " +"всех очередях, или выберите те очереди, для которых он будет проигнорирован." -#: models.py:1048 +#: models.py:1174 msgid "Date on which this e-mail address was added" msgstr "Дата добавления этого адреса электронной почты" -#: models.py:1056 +#: models.py:1182 msgid "" "Enter a full e-mail address, or portions with wildcards, eg *@domain.com or " "postmaster@*." -msgstr "Введите электронный адрес почты - полный или шаблон с подстановочными знаками, например, *@domain.com или postmaster@*." +msgstr "" +"Введите электронный адрес почты - полный или шаблон с подстановочными " +"знаками, например, *@domain.com или postmaster@*." -#: models.py:1061 +#: models.py:1187 msgid "Save Emails in Mailbox?" msgstr "Сохранять сообщения в почтовом ящике?" -#: models.py:1064 +#: models.py:1190 msgid "" "Do you want to save emails from this address in the mailbox? If this is " "unticked, emails from this address will be deleted." -msgstr "Хотите ли вы сохранить сообщения с этого адреса в почтовом ящике? Если убрать данную опцию, сообщения электронной почты с этого адреса будут удалены." - -#: models.py:1101 -msgid "Ignored e-mail address" msgstr "" +"Хотите ли вы сохранить сообщения с этого адреса в почтовом ящике? Если " +"убрать данную опцию, сообщения электронной почты с этого адреса будут " +"удалены." -#: models.py:1102 -msgid "Ignored e-mail addresses" -msgstr "" - -#: models.py:1124 +#: models.py:1246 msgid "User who wishes to receive updates for this ticket." msgstr "Пользователи желающие получать обновления для этого тикета" -#: models.py:1132 +#: models.py:1254 msgid "For non-user followers, enter their e-mail address" -msgstr "Для незарегистрированных пользователей введите их электронные адреса почты" +msgstr "" +"Для незарегистрированных пользователей введите их электронные адреса почты" -#: models.py:1136 +#: models.py:1258 msgid "Can View Ticket?" msgstr "Может посмотреть тикет?" -#: models.py:1138 +#: models.py:1261 msgid "Can this CC login to view the ticket details?" msgstr "Может ли этот адрес из поля \"Копия\" войти, чтобы просмотреть тикет? " -#: models.py:1142 +#: models.py:1265 msgid "Can Update Ticket?" msgstr "Может изменить тикет?" -#: models.py:1144 +#: models.py:1268 msgid "Can this CC login and update the ticket?" msgstr "Может ли этот адрес из поля \"Копия\" войти и изменить тикет?" -#: models.py:1175 +#: models.py:1302 msgid "Field Name" msgstr "Название Поля" -#: models.py:1176 +#: models.py:1303 msgid "" -"As used in the database and behind the scenes. Must be unique and consist of" -" only lowercase letters with no punctuation." -msgstr "При использовании в базе данных и за кулисами. Должно быть уникальным и состоять только из строчных латинских букв, без знаков препинания." +"As used in the database and behind the scenes. Must be unique and consist of " +"only lowercase letters with no punctuation." +msgstr "" +"При использовании в базе данных и за кулисами. Должно быть уникальным и " +"состоять только из строчных латинских букв, без знаков препинания." -#: models.py:1181 +#: models.py:1309 msgid "Label" msgstr "Метка" -#: models.py:1183 +#: models.py:1311 msgid "The display label for this field" msgstr "Отображаемое название для этого поля" -#: models.py:1187 +#: models.py:1315 msgid "Help Text" msgstr "Текст подсказки" -#: models.py:1188 +#: models.py:1316 msgid "Shown to the user when editing the ticket" msgstr "Виден пользователю при редактировании тикета" -#: models.py:1194 +#: models.py:1322 msgid "Character (single line)" msgstr "Символьный (одна строчка)" -#: models.py:1195 +#: models.py:1323 msgid "Text (multi-line)" msgstr "Текстовый (много строк)" -#: models.py:1196 +#: models.py:1324 msgid "Integer" msgstr "Целочисленный" -#: models.py:1197 +#: models.py:1325 msgid "Decimal" msgstr "Вещественный" -#: models.py:1198 +#: models.py:1326 msgid "List" msgstr "Список" -#: models.py:1199 +#: models.py:1327 msgid "Boolean (checkbox yes/no)" msgstr "Boolean (флажок да / нет)" -#: models.py:1201 +#: models.py:1329 msgid "Time" msgstr "Время" -#: models.py:1202 +#: models.py:1330 msgid "Date & Time" msgstr "Дата и время" -#: models.py:1204 +#: models.py:1332 msgid "URL" msgstr "Ссылка" -#: models.py:1205 +#: models.py:1333 msgid "IP Address" msgstr "IP адрес" -#: models.py:1210 +#: models.py:1338 msgid "Data Type" msgstr "Тип данных" -#: models.py:1212 +#: models.py:1340 msgid "Allows you to restrict the data entered into this field" msgstr "Позволяет ограничить данные, введенные в это поле" -#: models.py:1217 +#: models.py:1345 msgid "Maximum Length (characters)" msgstr "Максимальная длина (символьный)" -#: models.py:1223 +#: models.py:1351 msgid "Decimal Places" msgstr "Число знаков после запятой" -#: models.py:1224 +#: models.py:1352 msgid "Only used for decimal fields" msgstr "Используется только для вещественных полей" -#: models.py:1230 +#: models.py:1358 msgid "Add empty first choice to List?" msgstr "Добавить пустое значение первым в список выбора?" -#: models.py:1232 +#: models.py:1360 msgid "" -"Only for List: adds an empty first entry to the choices list, which enforces" -" that the user makes an active choice." -msgstr "Только для списка: Добавляет пустое значение первой записью в список выбора, который гарантирует, что пользователь точно сделает выбор." +"Only for List: adds an empty first entry to the choices list, which enforces " +"that the user makes an active choice." +msgstr "" +"Только для списка: Добавляет пустое значение первой записью в список выбора, " +"который гарантирует, что пользователь точно сделает выбор." -#: models.py:1236 +#: models.py:1365 msgid "List Values" msgstr "Значения списка" -#: models.py:1237 +#: models.py:1366 msgid "For list fields only. Enter one option per line." msgstr "Только для полей списка. Вводите по одному значению на строку" -#: models.py:1243 +#: models.py:1372 msgid "Ordering" msgstr "Сортировка" -#: models.py:1244 +#: models.py:1373 msgid "Lower numbers are displayed first; higher numbers are listed later" -msgstr "Более низкие числа отображаются сначала; более высокие значения перечислены позже" +msgstr "" +"Более низкие числа отображаются сначала; более высокие значения перечислены " +"позже" -#: models.py:1258 +#: models.py:1387 msgid "Required?" msgstr "Обязателен?" -#: models.py:1259 +#: models.py:1388 msgid "Does the user have to enter a value for this field?" msgstr "Обязательно ли вводить значение этого поля?" -#: models.py:1263 +#: models.py:1393 msgid "Staff Only?" msgstr "Только для персонала?" -#: models.py:1264 +#: models.py:1394 msgid "" "If this is ticked, then the public submission form will NOT show this field" -msgstr "Если это отметить, то общедоступная форма представления не покажет этого поля" +msgstr "" +"Если это отметить, то общедоступная форма представления не покажет этого поля" -#: models.py:1273 +#: models.py:1405 msgid "Custom field" msgstr "настраиваемое поле" -#: models.py:1274 +#: models.py:1406 msgid "Custom fields" msgstr "Настраиваемые поля" -#: models.py:1297 +#: models.py:1428 msgid "Ticket custom field value" -msgstr "" +msgstr "Значение пользовательского поля тикета" -#: models.py:1298 +#: models.py:1429 msgid "Ticket custom field values" -msgstr "" +msgstr "Значения текстового поля тикета" -#: models.py:1315 -msgid "Depends On Ticket" -msgstr "Зависит от талона" - -#: models.py:1324 +#: models.py:1441 msgid "Ticket dependency" -msgstr "" +msgstr "Зависимость тикета" -#: models.py:1325 +#: models.py:1442 msgid "Ticket dependencies" -msgstr "" +msgstr "Зависимости тикетов" -#: management/commands/create_usersettings.py:25 -msgid "" -"Check for user without django-helpdesk UserSettings and create settings if " -"required. Uses settings.DEFAULT_USER_SETTINGS which can be overridden to " -"suit your situation." -msgstr "Проверить пользователя без django-helpdesk UserSettings и создать настройки, если требуется. Используйте settings.DEFAULT_USER_SETTINGS в файле настройки, который может быть изменен в зависимости от ситуации." - -#: management/commands/escalate_tickets.py:148 -#, python-format -msgid "Ticket escalated after %s days" -msgstr "Тикет поднят после %s дней" - -#: management/commands/get_email.py:158 -msgid "Created from e-mail" -msgstr "Создан из электронной почты" - -#: management/commands/get_email.py:162 -msgid "Unknown Sender" -msgstr "Неизвестный отправитель" - -#: management/commands/get_email.py:216 -msgid "" -"No plain-text email body available. Please see attachment " -"email_html_body.html." -msgstr "Доступно не текстовое тело электронного сообщения. Пожалуйста, посмотрите email_html_body.html." - -#: management/commands/get_email.py:220 -msgid "email_html_body.html" -msgstr "email_html_body.html" - -#: management/commands/get_email.py:263 -#, python-format -msgid "E-Mail Received from %(sender_email)s" -msgstr "Электронное сообщение полученное от %(sender_email)s" - -#: management/commands/get_email.py:271 -#, python-format -msgid "Ticket Re-Opened by E-Mail Received from %(sender_email)s" -msgstr "Тикет заново открыт полученным от %(sender_email)s электронным сообщением" - -#: management/commands/get_email.py:329 -msgid " (Reopened)" -msgstr " (Возобновлено)" - -#: management/commands/get_email.py:331 -msgid " (Updated)" -msgstr "(Обновлено)" +#: models.py:1452 +msgid "Depends On Ticket" +msgstr "Зависит от тикета" #: templates/helpdesk/attribution.html:2 msgid "" -"django-helpdesk." +"django-" +"helpdesk." msgstr "" -#: templates/helpdesk/base.html:10 +#: templates/helpdesk/base.html:18 msgid "Powered by django-helpdesk" msgstr "Работает на django-helpdesk" -#: templates/helpdesk/base.html:20 templates/helpdesk/rss_list.html:9 -#: templates/helpdesk/rss_list.html:24 templates/helpdesk/rss_list.html:31 +#: templates/helpdesk/base.html:77 templates/helpdesk/rss_list.html:10 +#: templates/helpdesk/rss_list.html:36 msgid "My Open Tickets" msgstr "Мои открытые тикеты" -#: templates/helpdesk/base.html:21 +#: templates/helpdesk/base.html:78 msgid "All Recent Activity" msgstr "Вся последняя активность" -#: templates/helpdesk/base.html:22 templates/helpdesk/dashboard.html:99 -#: templates/helpdesk/rss_list.html:15 +#: templates/helpdesk/base.html:79 templates/helpdesk/include/unassigned.html:7 +#: templates/helpdesk/rss_list.html:16 msgid "Unassigned Tickets" msgstr "Неназначенные тикеты" -#: templates/helpdesk/base.html:52 templates/helpdesk/public_base.html:6 -#: templates/helpdesk/public_base.html:18 +#: templates/helpdesk/base.html:119 templates/helpdesk/navigation.html:12 +#: templates/helpdesk/public_base.html:16 +#: templates/helpdesk/public_base.html:50 msgid "Helpdesk" msgstr "Помощь и поддержка" -#: templates/helpdesk/base.html:62 templates/helpdesk/rss_list.html:9 -#: templates/helpdesk/rss_list.html:12 templates/helpdesk/rss_list.html:15 -#: templates/helpdesk/rss_list.html:30 templates/helpdesk/rss_list.html:31 -msgid "RSS Icon" -msgstr "Иконка RSS" - -#: templates/helpdesk/base.html:62 templates/helpdesk/rss_list.html:2 -#: templates/helpdesk/rss_list.html.py:4 -msgid "RSS Feeds" -msgstr "RSS ленты новостей" - -#: templates/helpdesk/base.html:63 -msgid "API" -msgstr "API" - -#: templates/helpdesk/base.html:64 templates/helpdesk/system_settings.html:6 -msgid "System Settings" -msgstr "Системные настройки" - #: templates/helpdesk/confirm_delete_saved_query.html:3 -#: templates/helpdesk/ticket_list.html:146 +#: templates/helpdesk/ticket_list.html:139 msgid "Delete Saved Query" msgstr "Удалить сохранный запрос" #: templates/helpdesk/confirm_delete_saved_query.html:6 msgid "Delete Query" -msgstr "" +msgstr "Удалить запрос" #: templates/helpdesk/confirm_delete_saved_query.html:8 #, python-format msgid "" -"Are you sure you want to delete this saved filter " -"(%(query_title)s)? To re-create it, you will need to manually re-" -"filter your ticket listing." +"Are you sure you want to delete this saved filter (%(query_title)s)? To re-create it, you will need to manually re-filter your ticket " +"listing." msgstr "" #: templates/helpdesk/confirm_delete_saved_query.html:11 @@ -1159,39 +1312,44 @@ msgid "" "it, they will have to manually create their own query." msgstr "" -#: templates/helpdesk/confirm_delete_saved_query.html:14 +#: templates/helpdesk/confirm_delete_saved_query.html:15 #: templates/helpdesk/delete_ticket.html:10 msgid "No, Don't Delete It" -msgstr "Нет, не удалять" +msgstr "Нет, не удалять" -#: templates/helpdesk/confirm_delete_saved_query.html:16 -#: templates/helpdesk/delete_ticket.html:12 -msgid "Yes - Delete It" -msgstr "Удалить" +#: templates/helpdesk/confirm_delete_saved_query.html:18 +#: templates/helpdesk/delete_ticket.html:13 +msgid "Yes I Understand - Delete It Anyway" +msgstr "Да, Я Понимаю - Всё Равно Удалить" #: templates/helpdesk/create_ticket.html:3 msgid "Create Ticket" msgstr "Создать тикет" -#: templates/helpdesk/create_ticket.html:10 -#: templates/helpdesk/navigation.html:65 templates/helpdesk/navigation.html:68 -#: templates/helpdesk/public_homepage.html:27 +#: templates/helpdesk/create_ticket.html:27 +#: templates/helpdesk/navigation.html:95 templates/helpdesk/navigation.html:98 +#: templates/helpdesk/public_homepage.html:28 msgid "Submit a Ticket" -msgstr "Отправить талон" +msgstr "Создать тикет" -#: templates/helpdesk/create_ticket.html:11 +#: templates/helpdesk/create_ticket.html:31 #: templates/helpdesk/edit_ticket.html:11 msgid "Unless otherwise stated, all fields are required." msgstr "" -#: templates/helpdesk/create_ticket.html:11 +#: templates/helpdesk/create_ticket.html:31 #: templates/helpdesk/edit_ticket.html:11 -#: templates/helpdesk/public_homepage.html:28 +#: templates/helpdesk/public_homepage.html:29 msgid "Please provide as descriptive a title and description as possible." msgstr "" -#: templates/helpdesk/create_ticket.html:30 -#: templates/helpdesk/public_homepage.html:55 +#: templates/helpdesk/create_ticket.html:41 templates/helpdesk/ticket.html:143 +#: templates/helpdesk/ticket.html:192 +msgid "(Optional)" +msgstr "(Опционально)" + +#: templates/helpdesk/create_ticket.html:50 +#: templates/helpdesk/public_homepage.html:56 msgid "Submit Ticket" msgstr "Отправить тикет" @@ -1199,97 +1357,28 @@ msgstr "Отправить тикет" msgid "Helpdesk Dashboard" msgstr "Панель управления Helpdesk" -#: templates/helpdesk/dashboard.html:9 +#: templates/helpdesk/dashboard.html:12 msgid "" "Welcome to your Helpdesk Dashboard! From here you can quickly see tickets " -"submitted by you, tickets you are working on, and those tickets that have no" -" owner." -msgstr "Добро пожаловать на вашу панель Helpdesk! Отсюда вы можете быстро увидеть ваши собственные тикеты, а также те, которые еще не имеют владельца." - -#: templates/helpdesk/dashboard.html:14 -msgid "Helpdesk Summary" -msgstr "Сводка по Helpdesk" - -#: templates/helpdesk/dashboard.html:36 -msgid "Current Ticket Stats" +"submitted by you, tickets you are working on, and those tickets that have no " +"owner." msgstr "" +"Добро пожаловать на вашу панель Helpdesk! Отсюда вы можете быстро увидеть " +"ваши собственные тикеты, а также те, которые еще не имеют владельца." -#: templates/helpdesk/dashboard.html:37 -msgid "Average number of days until ticket is closed (all tickets): " -msgstr "Среднее число дней до закрытия тикета (все тикеты)" - -#: templates/helpdesk/dashboard.html:38 -msgid "" -"Average number of days until ticket is closed (tickets opened in last 60 " -"days): " -msgstr "Среднее число дней до закрытия тикета (за последние 60 дней)" - -#: templates/helpdesk/dashboard.html:39 -msgid "Click" -msgstr "Щелкните" - -#: templates/helpdesk/dashboard.html:39 -msgid "for detailed average by month." -msgstr "для детального отчета за месяц." - -#: templates/helpdesk/dashboard.html:40 -msgid "Distribution of open tickets, grouped by time period:" -msgstr "" - -#: templates/helpdesk/dashboard.html:41 -msgid "Days since opened" -msgstr "Дней с момента открытия" - -#: templates/helpdesk/dashboard.html:41 -msgid "Number of open tickets" -msgstr "Число открытых тикетов" - -#: templates/helpdesk/dashboard.html:57 +#: templates/helpdesk/dashboard.html:18 msgid "All Tickets submitted by you" msgstr "Все тикеты, отправленные вами" -#: templates/helpdesk/dashboard.html:58 templates/helpdesk/dashboard.html:78 -#: templates/helpdesk/dashboard.html:100 templates/helpdesk/dashboard.html:124 -#: templates/helpdesk/ticket_list.html:225 -msgid "Pr" -msgstr "Приоритет" - -#: templates/helpdesk/dashboard.html:58 templates/helpdesk/dashboard.html:78 -#: templates/helpdesk/dashboard.html:124 -msgid "Last Update" -msgstr "Последнее обновление" - -#: templates/helpdesk/dashboard.html:77 +#: templates/helpdesk/dashboard.html:22 msgid "Open Tickets assigned to you (you are working on this ticket)" -msgstr "Открыть тикеты, присвоенные Вам (вы работаете с этим тикетом)" +msgstr "Открытые тикеты, назначенные Вам (вы работаете с этими тикетами)" -#: templates/helpdesk/dashboard.html:92 +#: templates/helpdesk/dashboard.html:23 msgid "You have no tickets assigned to you." msgstr "Нет тикетов, назначенных вам." -#: templates/helpdesk/dashboard.html:99 -msgid "(pick up a ticket if you start to work on it)" -msgstr "(забрать тикет, если вы начинаете работать с ним)" - -#: templates/helpdesk/dashboard.html:110 -#: templates/helpdesk/ticket_desc_table.html:38 -msgid "Take" -msgstr "Взять" - -#: templates/helpdesk/dashboard.html:110 -#: templates/helpdesk/email_ignore_list.html:13 -#: templates/helpdesk/email_ignore_list.html:23 -#: templates/helpdesk/ticket_cc_list.html:15 -#: templates/helpdesk/ticket_cc_list.html:23 -#: templates/helpdesk/ticket_list.html:262 -msgid "Delete" -msgstr "Удалить" - -#: templates/helpdesk/dashboard.html:114 -msgid "There are no unassigned tickets." -msgstr "Нет неназначенных тикетов." - -#: templates/helpdesk/dashboard.html:123 +#: templates/helpdesk/dashboard.html:29 msgid "Closed & resolved Tickets you used to work on" msgstr "Закрыт и решены тикеты, связанные с вами" @@ -1301,9 +1390,9 @@ msgstr "Удалить тикет" #: templates/helpdesk/delete_ticket.html:8 #, python-format msgid "" -"Are you sure you want to delete this ticket (%(ticket_title)s)? All" -" traces of the ticket, including followups, attachments, and updates will be" -" irreversibly removed." +"Are you sure you want to delete this ticket (%(ticket_title)s)? All " +"traces of the ticket, including followups, attachments, and updates will be " +"irreversibly removed." msgstr "" #: templates/helpdesk/edit_ticket.html:3 @@ -1343,9 +1432,9 @@ msgstr "" #: templates/helpdesk/email_ignore_add.html:10 msgid "" -"You can either enter a whole e-mail address such as " -"email@domain.com or a portion of an e-mail address with a wildcard," -" such as *@domain.com or user@*." +"You can either enter a whole e-mail address such as email@domain.com or a portion of an e-mail address with a wildcard, such as *@domain." +"com or user@*." msgstr "" #: templates/helpdesk/email_ignore_del.html:3 @@ -1359,140 +1448,221 @@ msgstr "" #: templates/helpdesk/email_ignore_del.html:8 #, python-format msgid "" -"Are you sure you wish to stop removing this email address " -"(%(email_address)s) and allow their e-mails to automatically create" -" tickets in your system? You can re-add this e-mail address at any time." +"Are you sure you wish to stop removing this email address (" +"%(email_address)s) and allow their e-mails to automatically create " +"tickets in your system? You can re-add this e-mail address at any time." msgstr "" #: templates/helpdesk/email_ignore_del.html:10 msgid "Keep Ignoring It" msgstr "Продолжать игнорировать" -#: templates/helpdesk/email_ignore_del.html:12 +#: templates/helpdesk/email_ignore_del.html:13 msgid "Stop Ignoring It" msgstr "Разблокировать, пусть присылает письма" #: templates/helpdesk/email_ignore_list.html:3 -#: templates/helpdesk/email_ignore_list.html:12 +#: templates/helpdesk/email_ignore_list.html:15 msgid "Ignored E-Mail Addresses" msgstr "Игнорируемые адреса электронной почты" #: templates/helpdesk/email_ignore_list.html:5 +#, fuzzy +#| msgid "" +#| "\n" +#| "

Ignored E-Mail Addresses

\n" +#| "\n" +#| "

The following e-mail addresses are currently being ignored by the " +#| "incoming e-mail processor. You can add a new e-mail " +#| "address to the list or delete any of the items below as required.

" msgid "" "\n" "

Ignored E-Mail Addresses

\n" "\n" -"

The following e-mail addresses are currently being ignored by the incoming e-mail processor. You can add a new e-mail address to the list or delete any of the items below as required.

" -msgstr "\n

Игнорируемые адреса электронной почты

\n\n

Следующие адреса электронной почты в настоящее время игнорируются обработчиком входящей почты. Вы можете добавить в список новый адрес или удалить любые перечисленные ниже на свое усмотрение.

" +"

The following e-mail addresses are currently being ignored by the " +"incoming e-mail processor. You can add a new item or delete any of the items " +"below as required.

" +msgstr "" +"\n" +"

Игнорируемые адреса электронной почты

\n" +"\n" +"

Следующие адреса электронной почты в настоящее время игнорируются " +"обработчиком входящей почты. Вы можете добавить в список " +"новый адрес или удалить любые перечисленные ниже на свое усмотрение.

" -#: templates/helpdesk/email_ignore_list.html:13 +#: templates/helpdesk/email_ignore_list.html:19 +msgid "Add an Email" +msgstr "" + +#: templates/helpdesk/email_ignore_list.html:26 msgid "Date Added" msgstr "Дата добавления" -#: templates/helpdesk/email_ignore_list.html:13 +#: templates/helpdesk/email_ignore_list.html:28 msgid "Keep in mailbox?" msgstr "Сохранять в почтовом ящике?" -#: templates/helpdesk/email_ignore_list.html:21 -#: templates/helpdesk/ticket_list.html:260 +#: templates/helpdesk/email_ignore_list.html:29 +#: templates/helpdesk/email_ignore_list.html:40 +#: templates/helpdesk/include/unassigned.html:33 +#: templates/helpdesk/ticket.html:103 templates/helpdesk/ticket.html:116 +#: templates/helpdesk/ticket_cc_list.html:28 +#: templates/helpdesk/ticket_cc_list.html:37 +#: templates/helpdesk/ticket_desc_table.html:17 +#: templates/helpdesk/ticket_list.html:251 +msgid "Delete" +msgstr "Удалить" + +#: templates/helpdesk/email_ignore_list.html:38 +#: templates/helpdesk/ticket_list.html:246 msgid "All" msgstr "Все" -#: templates/helpdesk/email_ignore_list.html:22 +#: templates/helpdesk/email_ignore_list.html:39 msgid "Keep" msgstr "Оставить" -#: templates/helpdesk/email_ignore_list.html:29 +#: templates/helpdesk/email_ignore_list.html:56 msgid "" "Note: If the 'Keep' option is not selected, emails sent " "from that address will be deleted permanently." -msgstr "Замечание: Если флаг \"Оставить\" не установлен, то сообщения, отправленные с этого адреса будут навсегда удалены." +msgstr "" +"Замечание: Если флаг \"Оставить\" не установлен, то " +"сообщения, отправленные с этого адреса будут навсегда удалены." #: templates/helpdesk/followup_edit.html:2 msgid "Edit followup" msgstr "Изменить наблюдение" -#: templates/helpdesk/followup_edit.html:9 +#: templates/helpdesk/followup_edit.html:16 msgid "Edit FollowUp" msgstr "Изменить наблюдение" -#: templates/helpdesk/followup_edit.html:14 +#: templates/helpdesk/followup_edit.html:21 msgid "Reassign ticket:" msgstr "Переназначение тикета:" -#: templates/helpdesk/followup_edit.html:16 +#: templates/helpdesk/followup_edit.html:23 msgid "Title:" msgstr "Заголовок:" -#: templates/helpdesk/followup_edit.html:18 +#: templates/helpdesk/followup_edit.html:25 msgid "Comment:" msgstr "Комментарий" -#: templates/helpdesk/kb_category.html:4 -#: templates/helpdesk/kb_category.html:12 -#, python-format -msgid "Knowledgebase Category: %(kbcat)s" -msgstr "Категория Базы Знаний: %(kbcat)s" +#: templates/helpdesk/include/stats.html:7 +msgid "Helpdesk Summary" +msgstr "Сводка по Helpdesk" -#: templates/helpdesk/kb_category.html:6 +#: templates/helpdesk/include/stats.html:27 +#, fuzzy +#| msgid "View Ticket" +msgid "View Tickets" +msgstr "Просмотреть тикет" + +#: templates/helpdesk/include/stats.html:27 +#, fuzzy +#| msgid "Number of tickets to show per page" +msgid "No tickets in this range" +msgstr "Количество тикетов на страницу" + +#: templates/helpdesk/include/tickets.html:7 +msgid "Your Tickets" +msgstr "Ваши Тикеты" + +#: templates/helpdesk/include/tickets.html:16 +#: templates/helpdesk/include/unassigned.html:16 +#: templates/helpdesk/ticket_list.html:220 +msgid "Pr" +msgstr "Приоритет" + +#: templates/helpdesk/include/tickets.html:20 +#: templates/helpdesk/kb_category.html:30 +msgid "Last Update" +msgstr "Последнее обновление" + +#: templates/helpdesk/include/tickets.html:34 +msgid "You do not have any pending tickets." +msgstr "" + +#: templates/helpdesk/include/unassigned.html:7 +msgid "(pick up a ticket if you start to work on it)" +msgstr "(забрать тикет, если вы начинаете работать с ним)" + +#: templates/helpdesk/include/unassigned.html:32 +#: templates/helpdesk/ticket_desc_table.html:48 +msgid "Take" +msgstr "Взять" + +#: templates/helpdesk/include/unassigned.html:37 +#: templates/helpdesk/report_index.html:54 +msgid "There are no unassigned tickets." +msgstr "Нет неназначенных тикетов." + +#: templates/helpdesk/kb_category.html:4 +#, fuzzy +#| msgid "Knowledge base category" +msgid "Knowledgebase Category" +msgstr "категорию Базы Знаний" + +#: templates/helpdesk/kb_category.html:4 +#, python-format +msgid "%(kbcat)s" +msgstr "" + +#: templates/helpdesk/kb_category.html:8 #, python-format msgid "You are viewing all items in the %(kbcat)s category." msgstr "Вы просматриваете всё содержимое в категории %(kbcat)s." -#: templates/helpdesk/kb_category.html:13 -msgid "Article" -msgstr "Статья" +#: templates/helpdesk/kb_category.html:26 +#, python-format +#| msgid "" +#| "View Answer " +msgid "View Answer " +msgstr "Просмотреть Ответ " -#: templates/helpdesk/kb_index.html:4 templates/helpdesk/navigation.html:21 -#: templates/helpdesk/navigation.html:71 +#: templates/helpdesk/kb_category.html:29 +#, fuzzy +#| msgid "Sorting" +msgid "Rating" +msgstr "Сортировка" + +#: templates/helpdesk/kb_index.html:4 templates/helpdesk/kb_item.html:4 +#: templates/helpdesk/navigation.html:33 templates/helpdesk/navigation.html:101 msgid "Knowledgebase" msgstr "База Знаний" #: templates/helpdesk/kb_index.html:6 +#, fuzzy +#| msgid "" +#| "We have listed a number of knowledgebase articles for your perusal in the " +#| "following categories. Please check to see if any of these articles " +#| "address your problem prior to opening a support ticket." msgid "" -"We have listed a number of knowledgebase articles for your perusal in the " +"We have listed a number of Knowledgebase articles for your perusal in the " "following categories. Please check to see if any of these articles address " "your problem prior to opening a support ticket." -msgstr "Мы перечислили ряд статей в Базе Знаний для вашего ознакомления по следующим категориям. Пожалуйста, проверьте до создания талона, что ваш случай не описан в какой-либо из этих статей." +msgstr "" +"Мы перечислили ряд статей в Базе Знаний для вашего ознакомления по следующим " +"категориям. Пожалуйста, проверьте до создания тикета, что ваш случай не " +"описан в какой-либо из этих статей." -#: templates/helpdesk/kb_index.html:10 -#: templates/helpdesk/public_homepage.html:10 -msgid "Knowledgebase Categories" -msgstr "Категории Базы Знаний" +#: templates/helpdesk/kb_index.html:20 +msgid "View articles" +msgstr "Просмотреть записи" #: templates/helpdesk/kb_item.html:4 #, python-format -msgid "Knowledgebase: %(item)s" -msgstr "База Знаний: %(item)s" +msgid "%(item)s" +msgstr "" -#: templates/helpdesk/kb_item.html:16 -#, python-format -msgid "" -"View other %(category_title)s " -"articles, or continue viewing other knowledgebase " -"articles." -msgstr "Смотреть другие %(category_title)s статьи, или продолжить просмотр остальных статьей Базы Знаний." +#: templates/helpdesk/kb_item.html:17 +msgid "Did you find this article useful?" +msgstr "Находите ли Вы эту запись полезной?" -#: templates/helpdesk/kb_item.html:18 -msgid "Feedback" -msgstr "Обратная Связь" - -#: templates/helpdesk/kb_item.html:20 -msgid "" -"We give our users an opportunity to vote for items that they believe have " -"helped them out, in order for us to better serve future customers. We would " -"appreciate your feedback on this article. Did you find it useful?" -msgstr "Мы предоставляем нашим пользователям возможность голосовать за статьи, которые по их мнению, способствовали им, с тем чтобы мы могли лучше обслуживать клиентов в будущем. Мы будем признательны за ваши отзывы на эту статью. Было ли это полезным?" - -#: templates/helpdesk/kb_item.html:23 -msgid "This article was useful to me" -msgstr "Эта статья была полезна для меня" - -#: templates/helpdesk/kb_item.html:24 -msgid "This article was not useful to me" -msgstr "Эта статья была бесполезна для меня" - -#: templates/helpdesk/kb_item.html:27 +#: templates/helpdesk/kb_item.html:28 msgid "The results of voting by other readers of this article are below:" msgstr "Результаты голосования других прочитавших эту статью указаны ниже:" @@ -1511,46 +1681,76 @@ msgstr "Голоса: %(votes)s" msgid "Overall Rating: %(score)s" msgstr "Общий рейтинг: %(score)s" -#: templates/helpdesk/navigation.html:16 templates/helpdesk/navigation.html:64 +#: templates/helpdesk/kb_item.html:40 +#, python-format +msgid "" +"View other %(category_title)s articles, or continue viewing other knowledgebase articles." +msgstr "" +"Смотреть другие %(category_title)s " +"статьи, или продолжить просмотр остальных статьей Базы " +"Знаний." + +#: templates/helpdesk/navigation.html:7 +msgid "Toggle navigation" +msgstr "Переключить навигацию" + +#: templates/helpdesk/navigation.html:20 templates/helpdesk/navigation.html:94 msgid "Dashboard" msgstr "Панель" -#: templates/helpdesk/navigation.html:18 +#: templates/helpdesk/navigation.html:26 msgid "New Ticket" msgstr "Новый Тикет" -#: templates/helpdesk/navigation.html:19 +#: templates/helpdesk/navigation.html:29 msgid "Stats" msgstr "Статистика" -#: templates/helpdesk/navigation.html:24 +#: templates/helpdesk/navigation.html:38 msgid "Saved Query" -msgstr "" +msgstr "Сохранённый запрос" -#: templates/helpdesk/navigation.html:39 -msgid "Change password" -msgstr "" - -#: templates/helpdesk/navigation.html:50 +#: templates/helpdesk/navigation.html:53 msgid "Search..." msgstr "Поиск..." -#: templates/helpdesk/navigation.html:50 +#: templates/helpdesk/navigation.html:53 msgid "Enter a keyword, or a ticket number to jump straight to that ticket." -msgstr "Введите ключевое слово или номер тикета, чтобы перейти прямо на этот тикет." +msgstr "" +"Введите ключевое слово или номер тикета, чтобы перейти прямо на этот тикет." -#: templates/helpdesk/navigation.html:73 +#: templates/helpdesk/navigation.html:57 +#: templates/helpdesk/ticket_list.html:251 +msgid "Go" +msgstr "" + +#: templates/helpdesk/navigation.html:73 templates/helpdesk/rss_list.html:3 +#: templates/helpdesk/rss_list.html:5 +msgid "RSS Feeds" +msgstr "RSS ленты новостей" + +#: templates/helpdesk/navigation.html:75 +msgid "Change password" +msgstr "Сменить пароль" + +#: templates/helpdesk/navigation.html:79 +#: templates/helpdesk/system_settings.html:6 +msgid "System Settings" +msgstr "Системные настройки" + +#: templates/helpdesk/navigation.html:82 templates/helpdesk/navigation.html:103 msgid "Logout" msgstr "Выход" -#: templates/helpdesk/navigation.html:73 +#: templates/helpdesk/navigation.html:103 msgid "Log In" msgstr "Войти" #: templates/helpdesk/public_change_language.html:2 -#: templates/helpdesk/public_homepage.html:73 +#: templates/helpdesk/public_homepage.html:74 #: templates/helpdesk/public_view_form.html:4 -#: templates/helpdesk/public_view_ticket.html:2 +#: templates/helpdesk/public_view_ticket.html:3 msgid "View a Ticket" msgstr "Просмотреть тикет" @@ -1558,27 +1758,32 @@ msgstr "Просмотреть тикет" msgid "Change the display language" msgstr "Изменение языка отображения" -#: templates/helpdesk/public_homepage.html:6 +#: templates/helpdesk/public_homepage.html:7 msgid "Knowledgebase Articles" msgstr "Категории Статей" -#: templates/helpdesk/public_homepage.html:28 +#: templates/helpdesk/public_homepage.html:10 +msgid "Knowledgebase Categories" +msgstr "Категории Базы Знаний" + +#: templates/helpdesk/public_homepage.html:29 msgid "All fields are required." msgstr "" -#: templates/helpdesk/public_homepage.html:66 +#: templates/helpdesk/public_homepage.html:67 msgid "Please use button at upper right to login first." -msgstr "Пожалуйста, используйте кнопку в правом верхнем углу для входа сначала." +msgstr "" +"Пожалуйста, используйте кнопку в правом верхнем углу для входа сначала." -#: templates/helpdesk/public_homepage.html:82 +#: templates/helpdesk/public_homepage.html:83 #: templates/helpdesk/public_view_form.html:15 msgid "Your E-mail Address" msgstr "Ваш адрес электронной почты" -#: templates/helpdesk/public_homepage.html:86 +#: templates/helpdesk/public_homepage.html:87 #: templates/helpdesk/public_view_form.html:19 msgid "View Ticket" -msgstr "Просмотреть талон" +msgstr "Просмотреть тикет" #: templates/helpdesk/public_spam.html:4 msgid "Unable To Open Ticket" @@ -1606,152 +1811,246 @@ msgstr "" msgid "Error:" msgstr "Ошибка:" -#: templates/helpdesk/public_view_ticket.html:9 +#: templates/helpdesk/public_view_ticket.html:10 #, python-format msgid "Queue: %(queue_name)s" msgstr "Очередь: %(queue_name)s" -#: templates/helpdesk/public_view_ticket.html:13 -#: templates/helpdesk/ticket_desc_table.html:32 +#: templates/helpdesk/public_view_ticket.html:14 +#: templates/helpdesk/ticket_desc_table.html:42 msgid "Submitted On" msgstr "Отправлен в" -#: templates/helpdesk/public_view_ticket.html:35 +#: templates/helpdesk/public_view_ticket.html:36 msgid "Tags" msgstr "Тэги" -#: templates/helpdesk/public_view_ticket.html:48 -#: templates/helpdesk/ticket_desc_table.html:26 -msgid "Accept" -msgstr "Принять" - -#: templates/helpdesk/public_view_ticket.html:48 -#: templates/helpdesk/ticket_desc_table.html:26 +#: templates/helpdesk/public_view_ticket.html:49 +#: templates/helpdesk/ticket_desc_table.html:36 msgid "Accept and Close" msgstr "Принять и закрыть" -#: templates/helpdesk/public_view_ticket.html:57 -#: templates/helpdesk/ticket.html:66 +#: templates/helpdesk/public_view_ticket.html:58 +#: templates/helpdesk/ticket.html:80 msgid "Follow-Ups" msgstr "Наблюдения" -#: templates/helpdesk/public_view_ticket.html:65 -#: templates/helpdesk/ticket.html:100 +#: templates/helpdesk/public_view_ticket.html:66 +#: templates/helpdesk/ticket.html:97 #, python-format msgid "Changed %(field)s from %(old_value)s to %(new_value)s." msgstr "Изменено %(field)s с %(old_value)s на %(new_value)s." +#: templates/helpdesk/registration/logged_out.html:2 +msgid "Logged Out" +msgstr "Вы больше не авторизированы" + +#: templates/helpdesk/registration/logged_out.html:4 +#, fuzzy +#| msgid "" +#| "\n" +#| "

Logged Out

\n" +#| "\n" +#| "

Thanks for being here. Hopefully you've helped resolve a few tickets " +#| "and make the world a better place.

\n" +#| "\n" +msgid "" +"\n" +"\n" +"
\n" +"
\n" +"

Successfully Logged Out

\n" +"

Thanks for being here. Hopefully you've helped resolve a few " +"tickets and make the world a better place.

\n" +"
\n" +"
\n" +"\n" +msgstr "" +"\n" +"

Выход произведён

\n" +"\n" +"

Спасибо что были здесь. Надеемся, вы помогли решить несколько тикетов и " +"сделать мир лучше.

\n" + +#: templates/helpdesk/registration/login.html:2 +msgid "Helpdesk Login" +msgstr "Вход в Helpdesk" + +#: templates/helpdesk/registration/login.html:13 +msgid "Please Sign In" +msgstr "" + +#: templates/helpdesk/registration/login.html:18 +msgid "Your username and password didn't match. Please try again." +msgstr "" +"Введённые имя пользователя и пароль не подошли. Пожалуйста попробуйте ещё " +"раз." + +#: templates/helpdesk/registration/login.html:29 +msgid "Remember Me" +msgstr "Запомнить меня" + +#: templates/helpdesk/registration/login.html:32 +msgid "Login" +msgstr "Вход" + #: templates/helpdesk/report_index.html:3 #: templates/helpdesk/report_index.html:6 -#: templates/helpdesk/report_output.html:3 -#: templates/helpdesk/report_output.html:16 +#: templates/helpdesk/report_output.html:4 +#: templates/helpdesk/report_output.html:29 msgid "Reports & Statistics" msgstr "Отчёты и Статистика" #: templates/helpdesk/report_index.html:9 msgid "You haven't created any tickets yet, so you cannot run any reports." -msgstr "Вы еще не создали ни одного тикета, так что вы не можете просмотреть отчеты." +msgstr "" +"Вы еще не создали ни одного тикета, так что вы не можете просмотреть отчеты." -#: templates/helpdesk/report_index.html:13 +#: templates/helpdesk/report_index.html:16 +msgid "Current Ticket Stats" +msgstr "" + +#: templates/helpdesk/report_index.html:24 +msgid "Average number of days until ticket is closed (all tickets): " +msgstr "Среднее число дней до закрытия тикета (все тикеты)" + +#: templates/helpdesk/report_index.html:28 +msgid "" +"Average number of days until ticket is closed (tickets opened in last 60 " +"days): " +msgstr "Среднее число дней до закрытия тикета (за последние 60 дней)" + +#: templates/helpdesk/report_index.html:29 +msgid "Click" +msgstr "Щелкните" + +#: templates/helpdesk/report_index.html:29 +msgid "for detailed average by month." +msgstr "для детального отчета за месяц." + +#: templates/helpdesk/report_index.html:71 +msgid "Generate Report" +msgstr "Создать отчёт" + +#: templates/helpdesk/report_index.html:76 msgid "Reports By User" msgstr "Отчеты в разрезе Пользователей" -#: templates/helpdesk/report_index.html:15 -#: templates/helpdesk/report_index.html:24 +#: templates/helpdesk/report_index.html:78 +#: templates/helpdesk/report_index.html:86 msgid "by Priority" msgstr "по Приоритету" -#: templates/helpdesk/report_index.html:16 +#: templates/helpdesk/report_index.html:79 msgid "by Queue" msgstr "по Очереди" -#: templates/helpdesk/report_index.html:17 -#: templates/helpdesk/report_index.html:25 +#: templates/helpdesk/report_index.html:80 +#: templates/helpdesk/report_index.html:87 msgid "by Status" msgstr "по Статусу" -#: templates/helpdesk/report_index.html:18 -#: templates/helpdesk/report_index.html:26 +#: templates/helpdesk/report_index.html:81 +#: templates/helpdesk/report_index.html:88 msgid "by Month" msgstr "по Месяцам" -#: templates/helpdesk/report_index.html:22 +#: templates/helpdesk/report_index.html:84 msgid "Reports By Queue" msgstr "Отчеты в разрезе Очередей" -#: templates/helpdesk/report_index.html:27 views/staff.py:1049 +#: templates/helpdesk/report_index.html:89 views/staff.py:1195 msgid "Days until ticket closed by Month" msgstr "" -#: templates/helpdesk/report_output.html:19 +#: templates/helpdesk/report_output.html:35 +msgid "Saved Queries" +msgstr "Сохранённые запросы" + +#: templates/helpdesk/report_output.html:40 msgid "" "You can run this query on filtered data by using one of your saved queries." -msgstr "Этот запрос можно выполнить на отфильтрованных данных с помощью одного из ваших сохраненных запросов." +msgstr "" +"Этот запрос можно выполнить на отфильтрованных данных с помощью одного из " +"ваших сохраненных запросов." -#: templates/helpdesk/report_output.html:21 +#: templates/helpdesk/report_output.html:42 msgid "Select Query:" msgstr "Выберите запрос:" -#: templates/helpdesk/report_output.html:26 +#: templates/helpdesk/report_output.html:47 msgid "Filter Report" msgstr "Отчет фильтра" -#: templates/helpdesk/report_output.html:29 +#: templates/helpdesk/report_output.html:50 msgid "" "Want to filter this report to just show a subset of data? Go to the Ticket " "List, filter your query, and save your query." -msgstr "Хотите, чтобы этот отчет показал только подмножество данных? Перейдите к списку тикетов, отфильтруйте запрос и сохраните запрос." +msgstr "" +"Хотите, чтобы этот отчет показал только подмножество данных? Перейдите к " +"списку тикетов, отфильтруйте запрос и сохраните запрос." -#: templates/helpdesk/rss_list.html:6 +#: templates/helpdesk/rss_list.html:7 msgid "" "The following RSS feeds are available for you to monitor using your " "preferred RSS software. With the exception of the 'Latest Activity' feed, " "all feeds provide information only on Open and Reopened cases. This ensures " "your RSS reader isn't full of information about closed or historical tasks." -msgstr "Следующие RSS-каналы доступны для вас что бы следить за обновлениями, используя предпочтительное RSS программное обеспечение. За исключением канала \"Последняя активность\", все каналы представляют информацию только по открытым и возобновленным талонам. Это позволяет не замусоривать RSS программу информацией о закрытых или устаревших задачах." +msgstr "" +"Следующие RSS-каналы доступны для вас что бы следить за обновлениями, " +"используя предпочтительное RSS программное обеспечение. За исключением " +"канала \"Последняя активность\", все каналы представляют информацию только " +"по открытым и возобновленным тикетам. Это позволяет не замусоривать RSS " +"программу информацией о закрытых или устаревших задачах." -#: templates/helpdesk/rss_list.html:10 +#: templates/helpdesk/rss_list.html:11 msgid "" "A summary of your open tickets - useful for getting alerted to new tickets " "opened for you" -msgstr "Кратко о ваших открытых тикетах - полезно для получения уведомлений о новых тикетах открытых вами" +msgstr "" +"Кратко о ваших открытых тикетах - полезно для получения уведомлений о новых " +"тикетах открытых вами" -#: templates/helpdesk/rss_list.html:12 +#: templates/helpdesk/rss_list.html:13 msgid "Latest Activity" msgstr "Последняя активность" -#: templates/helpdesk/rss_list.html:13 +#: templates/helpdesk/rss_list.html:14 msgid "" "A summary of all helpdesk activity - including comments, emails, " "attachments, and more" -msgstr "Кратко обо всей активности - включая комментарии, электронные письма, вложенные файлы и так далее" +msgstr "" +"Кратко обо всей активности - включая комментарии, электронные письма, " +"вложенные файлы и так далее" -#: templates/helpdesk/rss_list.html:16 +#: templates/helpdesk/rss_list.html:17 msgid "" "All unassigned tickets - useful for being alerted to new tickets opened by " "the public via the web or via e-mail" -msgstr "Все неназначенные тикеты - полезно что бы знать обо всех новых тикетах открытых через браузер или электронную почту" +msgstr "" +"Все неназначенные тикеты - полезно что бы знать обо всех новых тикетах " +"открытых через браузер или электронную почту" -#: templates/helpdesk/rss_list.html:19 +#: templates/helpdesk/rss_list.html:20 msgid "" "These RSS feeds allow you to view a summary of either your own tickets, or " "all tickets, for each of the queues in your helpdesk. For example, if you " "manage the staff who utilise a particular queue, this may be used to view " "new tickets coming into that queue." -msgstr "Эти ленты RSS позволят вам видеть сводку по вашим собственным или всем тикетам, для любой очереди. Например, если вы управляете персоналом, использующим определенную очередь, можно использовать ленту RSS для просмотра новых тикетов этой очереди." +msgstr "" +"Эти ленты RSS позволят вам видеть сводку по вашим собственным или всем " +"тикетам, для любой очереди. Например, если вы управляете персоналом, " +"использующим определенную очередь, можно использовать ленту RSS для " +"просмотра новых тикетов этой очереди." -#: templates/helpdesk/rss_list.html:23 +#: templates/helpdesk/rss_list.html:26 msgid "Per-Queue Feeds" msgstr "Ленты Новостей по Очередям" -#: templates/helpdesk/rss_list.html:24 +#: templates/helpdesk/rss_list.html:35 msgid "All Open Tickets" msgstr "Все открытые Тикеты" -#: templates/helpdesk/rss_list.html:30 -msgid "Open Tickets" -msgstr "Открытые Тикеты" - #: templates/helpdesk/system_settings.html:3 msgid "Change System Settings" msgstr "Изменить системные настройки" @@ -1788,108 +2087,173 @@ msgstr "Настройка шаблонов электронных сообще msgid "Maintain Users" msgstr "Изменение пользователей" -#: templates/helpdesk/ticket.html:2 +#: templates/helpdesk/ticket.html:4 msgid "View Ticket Details" msgstr "Просмотреть Тикет" -#: templates/helpdesk/ticket.html:34 -msgid "Attach another File" -msgstr "Прикрепить другой файл" +#: templates/helpdesk/ticket.html:44 templates/helpdesk/ticket.html:231 +msgid "No files selected." +msgstr "" -#: templates/helpdesk/ticket.html:34 templates/helpdesk/ticket.html.py:200 -msgid "Add Another File" -msgstr "Добавить другой файл" - -#: templates/helpdesk/ticket.html:73 templates/helpdesk/ticket.html.py:86 +#: templates/helpdesk/ticket.html:91 msgid "Private" msgstr "Приватный" -#: templates/helpdesk/ticket.html:119 +#: templates/helpdesk/ticket.html:112 +#: templates/helpdesk/ticket_desc_table.html:16 +msgid "Edit" +msgstr "" + +#: templates/helpdesk/ticket.html:136 msgid "Respond to this ticket" msgstr "Ответить на этот тикет" -#: templates/helpdesk/ticket.html:126 +#: templates/helpdesk/ticket.html:143 msgid "Use a Pre-set Reply" msgstr "Использовать предопределённые ответы" -#: templates/helpdesk/ticket.html:126 templates/helpdesk/ticket.html.py:166 -msgid "(Optional)" -msgstr "(Опционально)" - -#: templates/helpdesk/ticket.html:128 +#: templates/helpdesk/ticket.html:145 msgid "" "Selecting a pre-set reply will over-write your comment below. You can then " "modify the pre-set reply to your liking before saving this update." -msgstr "Выбор предопределенного ответа перезапишет ваш комментарий. После чего (до сохранения этого обновления) можно исправить предопределенный ответ по своему усмотрению." +msgstr "" +"Выбор предопределенного ответа перезапишет ваш комментарий. После чего (до " +"сохранения этого обновления) можно исправить предопределенный ответ по " +"своему усмотрению." -#: templates/helpdesk/ticket.html:131 +#: templates/helpdesk/ticket.html:148 msgid "Comment / Resolution" msgstr "Комментарий / Решение" -#: templates/helpdesk/ticket.html:133 +#: templates/helpdesk/ticket.html:150 msgid "" "You can insert ticket and queue details in your message. For more " "information, see the context help page." -msgstr "Вы можете вставить детали о талоне и очереди в ваше сообщение. Для дополнительной информации смотрите Страница помощи про Контекст." +msgstr "" +"Вы можете вставить детали о тикете и очереди в ваше сообщение. Для " +"дополнительной информации смотрите Страница " +"помощи про Контекст." -#: templates/helpdesk/ticket.html:136 +#: templates/helpdesk/ticket.html:153 msgid "" -"This ticket cannot be resolved or closed until the tickets it depends on are" -" resolved." -msgstr "Этот тикет не может быть разрешен или закрыт, пока не будут закрыты или решены талоны от которых он зависит." +"This ticket cannot be resolved or closed until the tickets it depends on are " +"resolved." +msgstr "" +"Этот тикет не может быть разрешен или закрыт, пока не будут закрыты или " +"решены тикеты от которых он зависит." -#: templates/helpdesk/ticket.html:166 +#: templates/helpdesk/ticket.html:192 msgid "Is this update public?" msgstr "Это публичный тикет?" -#: templates/helpdesk/ticket.html:168 -msgid "" -"If this is public, the submitter will be e-mailed your comment or " -"resolution." -msgstr "Если это публичный, отправитель получит по электронной почте ваш комментарий или решение." +#: templates/helpdesk/ticket.html:194 +msgid "Yes, make this update public." +msgstr "Это публичный тикет?" -#: templates/helpdesk/ticket.html:172 +#: templates/helpdesk/ticket.html:195 +msgid "" +"If this is public, the submitter will be e-mailed your comment or resolution." +msgstr "" +"Если это публичный, отправитель получит по электронной почте ваш комментарий " +"или решение." + +#: templates/helpdesk/ticket.html:199 msgid "Change Further Details »" msgstr "Изменить дополнительную информацию »" -#: templates/helpdesk/ticket.html:181 templates/helpdesk/ticket_list.html:68 -#: templates/helpdesk/ticket_list.html:97 -#: templates/helpdesk/ticket_list.html:225 +#: templates/helpdesk/ticket.html:208 templates/helpdesk/ticket_list.html:61 +#: templates/helpdesk/ticket_list.html:90 +#: templates/helpdesk/ticket_list.html:225 views/staff.py:487 msgid "Owner" msgstr "Владелец" -#: templates/helpdesk/ticket.html:182 +#: templates/helpdesk/ticket.html:209 msgid "Unassign" msgstr "Не назначен" -#: templates/helpdesk/ticket.html:193 +#: templates/helpdesk/ticket.html:220 msgid "Attach File(s) »" msgstr "Прикрепить файл(ы) »" -#: templates/helpdesk/ticket.html:199 +#: templates/helpdesk/ticket.html:225 msgid "Attach a File" msgstr "Прикрепить файл" -#: templates/helpdesk/ticket.html:207 +#: templates/helpdesk/ticket.html:228 +msgid "Add Another File" +msgstr "Добавить другой файл" + +#: templates/helpdesk/ticket.html:240 msgid "Update This Ticket" msgstr "Обновить этот тикет" +#: templates/helpdesk/ticket_attachment_del.html:3 +msgid "Delete Ticket Attachment" +msgstr "Удалить вложение" + +#: templates/helpdesk/ticket_attachment_del.html:5 +#, python-format +msgid "" +"\n" +"

Delete Ticket Attachment

\n" +"\n" +"

Are you sure you wish to delete the attachment %(filename)s from " +"this ticket? The attachment data will be permanently deleted from the " +"database, but the attachment itself will still exist on the server.

\n" +msgstr "" + +#: templates/helpdesk/ticket_attachment_del.html:11 +#: templates/helpdesk/ticket_cc_del.html:12 +#: templates/helpdesk/ticket_dependency_del.html:11 +msgid "Don't Delete" +msgstr "Не удалять" + +#: templates/helpdesk/ticket_attachment_del.html:14 +#: templates/helpdesk/ticket_dependency_del.html:14 +msgid "Yes, I Understand - Delete" +msgstr "Да, Я Понимаю - Удалить" + #: templates/helpdesk/ticket_cc_add.html:3 +#: templates/helpdesk/ticket_cc_add.html:6 msgid "Add Ticket CC" msgstr "Добавить адрес в поле \"Копия\"" -#: templates/helpdesk/ticket_cc_add.html:5 +#: templates/helpdesk/ticket_cc_add.html:12 +#, fuzzy +#| msgid "" +#| "\n" +#| "

Add Ticket CC

\n" +#| "\n" +#| "

To automatically send an email to a user or e-mail address when this " +#| "ticket is updated, select the user or enter an e-mail address below.

" msgid "" +"To automatically send an email to a user or e-mail address when this ticket " +"is updated, select the user or enter an e-mail address below." +msgstr "" "\n" -"

Add Ticket CC

\n" +"

Добавить адрес в поле \"Копия\"

\n" "\n" -"

To automatically send an email to a user or e-mail address when this ticket is updated, select the user or enter an e-mail address below.

" -msgstr "\n

Добавить адрес в поле \"Копия\"

\n\n

Для автоматической отправки электронной почты пользователю или на адрес электронной почты, если тикет обновится, выберите пользователя или введите адрес электронной почты ниже.

" +"

Для автоматической отправки электронной почты пользователю или на адрес " +"электронной почты, если тикет обновится, выберите пользователя или введите " +"адрес электронной почты ниже.

" -#: templates/helpdesk/ticket_cc_add.html:21 +#: templates/helpdesk/ticket_cc_add.html:18 +msgid "Email" +msgstr "" + +#: templates/helpdesk/ticket_cc_add.html:27 +msgid "Add Email" +msgstr "Добавить e-mail" + +#: templates/helpdesk/ticket_cc_add.html:37 +#: templates/helpdesk/ticket_cc_add.html:51 msgid "Save Ticket CC" msgstr "Нет, не удалять" +#: templates/helpdesk/ticket_cc_add.html:41 +msgid "Add User" +msgstr "Добавить пользователя" + #: templates/helpdesk/ticket_cc_del.html:3 msgid "Delete Ticket CC" msgstr "Да - удалить" @@ -1900,18 +2264,20 @@ msgid "" "\n" "

Delete Ticket CC

\n" "\n" -"

Are you sure you wish to delete this email address (%(email_address)s) from the CC list for this ticket? They will stop receiving updates.

\n" -msgstr "\n

Удалить адрес в поле \"Копия\"

\n\n

Вы уверены что хотите удалить этот адрес электронной почты (%(email_address)s) из поля \"Копия\" для этого талона? Они прекратят получать обновления тикета.

\n" +"

Are you sure you wish to delete this email address (" +"%(email_address)s) from the CC list for this ticket? They will stop " +"receiving updates.

\n" +msgstr "" +"\n" +"

Удалить адрес в поле \"Копия\"

\n" +"\n" +"

Вы уверены что хотите удалить этот адрес электронной почты (" +"%(email_address)s) из поля \"Копия\" для этого тикета? Они прекратят " +"получать обновления тикета.

\n" -#: templates/helpdesk/ticket_cc_del.html:11 -#: templates/helpdesk/ticket_dependency_del.html:11 -msgid "Don't Delete" -msgstr "Не удалять" - -#: templates/helpdesk/ticket_cc_del.html:13 -#: templates/helpdesk/ticket_dependency_del.html:13 -msgid "Yes, Delete" -msgstr "Удалить" +#: templates/helpdesk/ticket_cc_del.html:15 +msgid "Yes I Understand - Delete" +msgstr "Да, Я Понимаю - Удалить" #: templates/helpdesk/ticket_cc_list.html:3 msgid "Ticket CC Settings" @@ -1923,24 +2289,45 @@ msgid "" "\n" "

Ticket CC Settings

\n" "\n" -"

The following people will receive an e-mail whenever %(ticket_title)s is updated. Some people can also view or edit the ticket via the public ticket views.

\n" +"

The following people will receive an e-mail whenever " +"%(ticket_title)s is updated. Some people can also view or edit the " +"ticket via the public ticket views.

\n" "\n" -"

You can add a new e-mail address to the list or delete any of the items below as required.

" -msgstr "\n

Настройки поля \"Копия\" тикета

\n\n

Следующие люди будут получать сообщения по электронной почте всякий раз, когда %(ticket_title)s обновится. Некоторые люди могут также просмотреть или изменить тикет с помощью общедоступного интерфейса.

\n\n

Вы можете добавить новый адрес электронной почты к списку или удалить любой из пунктов ниже по мере необходимости.

" +"

You can add a new recipient to the list or delete any of the items below " +"as required.

" +msgstr "" +"\n" +"

Настройки поля \"Копия\" тикета

\n" +"\n" +"

Следующие люди будут получать сообщения по электронной почте всякий раз, " +"когда %(ticket_title)s обновится. Некоторые люди " +"могут также просмотреть или изменить тикет с помощью общедоступного " +"интерфейса.

\n" +"\n" +"

Вы можете добавить новый адрес электронной почты к списку или удалить любой из пунктов ниже по мере необходимости.

" -#: templates/helpdesk/ticket_cc_list.html:14 +#: templates/helpdesk/ticket_cc_list.html:16 msgid "Ticket CC List" msgstr "Список в поле \"Копия\"" -#: templates/helpdesk/ticket_cc_list.html:15 +#: templates/helpdesk/ticket_cc_list.html:20 +msgid "Add an Email or Helpdesk User" +msgstr "" + +#: templates/helpdesk/ticket_cc_list.html:25 +msgid "E-Mail Address or Helpdesk User" +msgstr "Адрес электронной почты или имя пользователя" + +#: templates/helpdesk/ticket_cc_list.html:26 msgid "View?" msgstr "Посмотреть?" -#: templates/helpdesk/ticket_cc_list.html:15 +#: templates/helpdesk/ticket_cc_list.html:27 msgid "Update?" msgstr "Обновить?" -#: templates/helpdesk/ticket_cc_list.html:29 +#: templates/helpdesk/ticket_cc_list.html:53 #, python-format msgid "Return to %(ticket_title)s" msgstr "Вернутся к %(ticket_title)s" @@ -1954,8 +2341,14 @@ msgid "" "\n" "

Add Ticket Dependency

\n" "\n" -"

Adding a dependency will stop you resolving this ticket until the dependent ticket has been resolved or closed.

" -msgstr "\n

Добавить зависимость

\n\n

Добавляя зависимость этому талону, вы оставляете решение проблемы до тех пор, пока не закроют или решат зависимый талон.

" +"

Adding a dependency will stop you resolving this ticket until the " +"dependent ticket has been resolved or closed.

" +msgstr "" +"\n" +"

Добавить зависимость

\n" +"\n" +"

Добавляя зависимость этому тикету, вы оставляете решение проблемы до тех " +"пор, пока не закроют или решат зависимый тикет.

" #: templates/helpdesk/ticket_dependency_add.html:21 msgid "Save Ticket Dependency" @@ -1971,258 +2364,279 @@ msgid "" "

Delete Ticket Dependency

\n" "\n" "

Are you sure you wish to remove the dependency on this ticket?

\n" -msgstr "\n

Удалить зависимость тикета

\n\n

Вы уверены, что хотите удалить зависимость для этого талона?

\n" +msgstr "" +"\n" +"

Удалить зависимость тикета

\n" +"\n" +"

Вы уверены, что хотите удалить зависимость для этого тикета?

\n" -#: templates/helpdesk/ticket_desc_table.html:7 +#: templates/helpdesk/ticket_desc_table.html:8 +#, fuzzy +#| msgid "Helpdesk Summary" +msgid "Ticket Summary" +msgstr "Сводка по Helpdesk" + +#: templates/helpdesk/ticket_desc_table.html:18 msgid "Unhold" msgstr "Снять с удержания" -#: templates/helpdesk/ticket_desc_table.html:7 +#: templates/helpdesk/ticket_desc_table.html:18 msgid "Hold" msgstr "Удерживать" -#: templates/helpdesk/ticket_desc_table.html:9 +#: templates/helpdesk/ticket_desc_table.html:20 #, python-format msgid "Queue: %(queue)s" msgstr "Очередь: %(queue)s" -#: templates/helpdesk/ticket_desc_table.html:37 +#: templates/helpdesk/ticket_desc_table.html:47 msgid "Assigned To" msgstr "Назначен " -#: templates/helpdesk/ticket_desc_table.html:43 +#: templates/helpdesk/ticket_desc_table.html:53 msgid "Ignore" msgstr "Игнорировать" -#: templates/helpdesk/ticket_desc_table.html:52 +#: templates/helpdesk/ticket_desc_table.html:62 msgid "Copies To" msgstr "Копии для" -#: templates/helpdesk/ticket_desc_table.html:53 +#: templates/helpdesk/ticket_desc_table.html:63 +msgid "" +"Click here to add / remove people who should receive an e-mail whenever this " +"ticket is updated." +msgstr "" +"Нажмите здесь, чтобы добавить / удалить людей, которые должны получать " +"сообщения электронной почты каждый раз, когда этот тикет обновляется." + +#: templates/helpdesk/ticket_desc_table.html:63 msgid "Manage" msgstr "Настроить" -#: templates/helpdesk/ticket_desc_table.html:53 +#: templates/helpdesk/ticket_desc_table.html:63 msgid "" -"Click here to add / remove people who should receive an e-mail whenever this" -" ticket is updated." -msgstr "Нажмите здесь, чтобы добавить / удалить людей, которые должны получать сообщения электронной почты каждый раз, когда этот тикет обновляется." +"Click here to subscribe yourself to this ticket, if you want to receive an e-" +"mail whenever this ticket is updated." +msgstr "" -#: templates/helpdesk/ticket_desc_table.html:53 +#: templates/helpdesk/ticket_desc_table.html:63 msgid "Subscribe" msgstr "" -#: templates/helpdesk/ticket_desc_table.html:53 -msgid "" -"Click here to subscribe yourself to this ticket, if you want to receive an " -"e-mail whenever this ticket is updated." -msgstr "" - -#: templates/helpdesk/ticket_desc_table.html:57 +#: templates/helpdesk/ticket_desc_table.html:67 msgid "Dependencies" msgstr "Зависимости" -#: templates/helpdesk/ticket_desc_table.html:59 +#: templates/helpdesk/ticket_desc_table.html:69 msgid "" "This ticket cannot be resolved until the following ticket(s) are resolved" -msgstr "Этот тикет не может быть разрешен или закрыт, пока не будут закрыты или решены следующие тикеты" +msgstr "" +"Этот тикет не может быть разрешен или закрыт, пока не будут закрыты или " +"решены следующие тикеты" -#: templates/helpdesk/ticket_desc_table.html:60 +#: templates/helpdesk/ticket_desc_table.html:70 msgid "Remove Dependency" msgstr "Удалить зависимость" -#: templates/helpdesk/ticket_desc_table.html:63 +#: templates/helpdesk/ticket_desc_table.html:73 msgid "This ticket has no dependencies." msgstr "Этот тикет не имеет зависимостей." -#: templates/helpdesk/ticket_desc_table.html:65 -msgid "Add Dependency" -msgstr "Добавить зависимость" - -#: templates/helpdesk/ticket_desc_table.html:65 +#: templates/helpdesk/ticket_desc_table.html:75 msgid "" "Click on 'Add Dependency', if you want to make this ticket dependent on " "another ticket. A ticket may not be closed until all tickets it depends on " "are closed." -msgstr "Нажмите на 'Добавить зависимость', если вы хотите сделать этот тикет зависимым от другого тикета. Тикет не может быть закрыт, пока не будут закрыты все тикеты, от которых он зависит." +msgstr "" +"Нажмите на 'Добавить зависимость', если вы хотите сделать этот тикет " +"зависимым от другого тикета. Тикет не может быть закрыт, пока не будут " +"закрыты все тикеты, от которых он зависит." -#: templates/helpdesk/ticket_list.html:59 +#: templates/helpdesk/ticket_desc_table.html:75 +msgid "Add Dependency" +msgstr "Добавить зависимость" + +#: templates/helpdesk/ticket_list.html:13 +msgid "No Tickets Match Your Selection" +msgstr "Тикетов, соответствующих вашему запросу, не найдено" + +#: templates/helpdesk/ticket_list.html:45 +#, fuzzy +#| msgid "Question" +msgid "Query Selection" +msgstr "Вопрос" + +#: templates/helpdesk/ticket_list.html:53 msgid "Change Query" msgstr "Изменить запрос" -#: templates/helpdesk/ticket_list.html:67 -#: templates/helpdesk/ticket_list.html:79 +#: templates/helpdesk/ticket_list.html:60 +#: templates/helpdesk/ticket_list.html:72 msgid "Sorting" msgstr "Сортировка" -#: templates/helpdesk/ticket_list.html:71 -#: templates/helpdesk/ticket_list.html:139 +#: templates/helpdesk/ticket_list.html:64 +#: templates/helpdesk/ticket_list.html:132 msgid "Keywords" msgstr "Ключевые слова" -#: templates/helpdesk/ticket_list.html:72 +#: templates/helpdesk/ticket_list.html:65 msgid "Date Range" msgstr "Диапазон дат" -#: templates/helpdesk/ticket_list.html:100 +#: templates/helpdesk/ticket_list.html:93 msgid "Reverse" msgstr "Реверс" -#: templates/helpdesk/ticket_list.html:102 +#: templates/helpdesk/ticket_list.html:95 msgid "Ordering applied to tickets" msgstr "Сортировка применяема к тикетам" -#: templates/helpdesk/ticket_list.html:107 +#: templates/helpdesk/ticket_list.html:100 msgid "Owner(s)" msgstr "Владелец(ы)" -#: templates/helpdesk/ticket_list.html:111 +#: templates/helpdesk/ticket_list.html:104 msgid "(ME)" msgstr "(МЕНЯ)" -#: templates/helpdesk/ticket_list.html:115 +#: templates/helpdesk/ticket_list.html:108 msgid "Ctrl-Click to select multiple options" msgstr "Нажмите Ctrl для выбора нескольких вариантов" -#: templates/helpdesk/ticket_list.html:120 +#: templates/helpdesk/ticket_list.html:113 msgid "Queue(s)" msgstr "Очередь(и)" -#: templates/helpdesk/ticket_list.html:121 -#: templates/helpdesk/ticket_list.html:127 +#: templates/helpdesk/ticket_list.html:114 +#: templates/helpdesk/ticket_list.html:120 msgid "Ctrl-click to select multiple options" msgstr "Нажмите Ctrl для выбора нескольких вариантов" -#: templates/helpdesk/ticket_list.html:126 +#: templates/helpdesk/ticket_list.html:119 msgid "Status(es)" msgstr "Статус(ы)" -#: templates/helpdesk/ticket_list.html:132 +#: templates/helpdesk/ticket_list.html:125 msgid "Date (From)" msgstr "Дата (с)" -#: templates/helpdesk/ticket_list.html:133 +#: templates/helpdesk/ticket_list.html:126 msgid "Date (To)" msgstr "Дата (по)" -#: templates/helpdesk/ticket_list.html:134 +#: templates/helpdesk/ticket_list.html:127 msgid "Use YYYY-MM-DD date format, eg 2011-05-29" msgstr "Использовать формат даты гггг-мм-дд, например 2011-05-29" -#: templates/helpdesk/ticket_list.html:140 +#: templates/helpdesk/ticket_list.html:133 msgid "" -"Keywords are case-insensitive, and will be looked for in the title, body and" -" submitter fields." -msgstr "Ключевые слова не зависят от регистра букв и будут искаться в полях заголовка, тексте и отправителях." +"Keywords are case-insensitive, and will be looked for in the title, body and " +"submitter fields." +msgstr "" +"Ключевые слова не зависят от регистра букв и будут искаться в полях " +"заголовка, тексте и отправителях." -#: templates/helpdesk/ticket_list.html:144 +#: templates/helpdesk/ticket_list.html:137 msgid "Apply Filter" msgstr "Применить фильтр" -#: templates/helpdesk/ticket_list.html:146 +#: templates/helpdesk/ticket_list.html:139 #, python-format -msgid "You are currently viewing saved query \"%(query_name)s\"." +msgid "" +"You are currently viewing saved query \"%(query_name)s\"." msgstr "" -#: templates/helpdesk/ticket_list.html:149 +#: templates/helpdesk/ticket_list.html:142 #, python-format msgid "" "Run a report on this " "query to see stats and charts for the data listed below." -msgstr "Выполнить отчет для этого запроса, чтобы просмотреть статистику и графики для данных, перечисленных ниже." +msgstr "" +"Выполнить отчет для этого " +"запроса, чтобы просмотреть статистику и графики для данных, перечисленных " +"ниже." -#: templates/helpdesk/ticket_list.html:162 -#: templates/helpdesk/ticket_list.html:181 +#: templates/helpdesk/ticket_list.html:151 +#: templates/helpdesk/ticket_list.html:169 msgid "Save Query" msgstr "Сохранить запрос" -#: templates/helpdesk/ticket_list.html:172 +#: templates/helpdesk/ticket_list.html:161 msgid "" "This name appears in the drop-down list of saved queries. If you share your " "query, other users will see this name, so choose something clear and " "descriptive!" -msgstr "Это название появится в выпадающем списке сохраненных запросов. Если вы дадите доступ к своему запросу другим пользователям, они увидят это название, так что выберите что-нибудь четкое, информативное!" +msgstr "" +"Это название появится в выпадающем списке сохраненных запросов. Если вы " +"дадите доступ к своему запросу другим пользователям, они увидят это " +"название, так что выберите что-нибудь четкое, информативное!" -#: templates/helpdesk/ticket_list.html:174 +#: templates/helpdesk/ticket_list.html:163 msgid "Shared?" msgstr "Общие?" -#: templates/helpdesk/ticket_list.html:175 +#: templates/helpdesk/ticket_list.html:164 msgid "Yes, share this query with other users." msgstr "Да, поделится этим запросом с другими пользователями." -#: templates/helpdesk/ticket_list.html:176 +#: templates/helpdesk/ticket_list.html:165 msgid "" "If you share this query, it will be visible by all other logged-in " "users." -msgstr "Если вы поделитесь этим запросом, его смогут видеть все авторизированные пользователи." +msgstr "" +"Если вы поделитесь этим запросом, его смогут видеть все " +"авторизированные пользователи." -#: templates/helpdesk/ticket_list.html:195 +#: templates/helpdesk/ticket_list.html:178 msgid "Use Saved Query" msgstr "Использовать сохранённый запрос" -#: templates/helpdesk/ticket_list.html:202 +#: templates/helpdesk/ticket_list.html:184 msgid "Query" msgstr "Запрос" -#: templates/helpdesk/ticket_list.html:207 +#: templates/helpdesk/ticket_list.html:189 msgid "Run Query" msgstr "Выполнить запрос" -#: templates/helpdesk/ticket_list.html:240 -msgid "No Tickets Match Your Selection" -msgstr "Тикетов, соответствующих вашему запросу, не найдено" +#: templates/helpdesk/ticket_list.html:209 +msgid "Query Results" +msgstr "Результаты запроса" -#: templates/helpdesk/ticket_list.html:247 -msgid "Previous" -msgstr "Предыдущий" - -#: templates/helpdesk/ticket_list.html:251 -#, python-format -msgid "Page %(ticket_num)s of %(num_pages)s." -msgstr "Страница %(ticket_num)s из %(num_pages)s." - -#: templates/helpdesk/ticket_list.html:255 -msgid "Next" -msgstr "Следующая" - -#: templates/helpdesk/ticket_list.html:260 +#: templates/helpdesk/ticket_list.html:245 msgid "Select:" msgstr "Выбрать:" -#: templates/helpdesk/ticket_list.html:260 -msgid "None" -msgstr "Ничего" +#: templates/helpdesk/ticket_list.html:248 +msgid "Invert" +msgstr "Инвертировать" -#: templates/helpdesk/ticket_list.html:260 -msgid "Inverse" -msgstr "Обратная" - -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "With Selected Tickets:" msgstr "С выбранными тикетами:" -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "Take (Assign to me)" msgstr "Принять (Связать со мной)" -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "Close" msgstr "Закрыть" -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "Close (Don't Send E-Mail)" msgstr "Закрыть (не отправлять E-Mail)" -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "Close (Send E-Mail)" msgstr "Закрыть (отправить E-Mail)" -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "Assign To" msgstr "Назначить" -#: templates/helpdesk/ticket_list.html:262 +#: templates/helpdesk/ticket_list.html:251 msgid "Nobody (Unassign)" msgstr "Никому (Несвязанные)" @@ -2236,163 +2650,230 @@ msgid "" "you. These settings do not impact any other user." msgstr "" -#: templates/helpdesk/user_settings.html:14 +#: templates/helpdesk/user_settings.html:13 msgid "Save Options" msgstr "Сохранить настройки" -#: templates/helpdesk/registration/logged_out.html:2 -msgid "Logged Out" -msgstr "Вы больше не авторизированы" - -#: templates/helpdesk/registration/logged_out.html:4 -msgid "" -"\n" -"

Logged Out

\n" -"\n" -"

Thanks for being here. Hopefully you've helped resolve a few tickets and make the world a better place.

\n" -"\n" -msgstr "\n

Выход произведён

\n\n

Спасибо что были здесь. Надеемся, вы помогли решить несколько тикетов и сделать мир лучше.

\n" - -#: templates/helpdesk/registration/login.html:2 -msgid "Helpdesk Login" -msgstr "Вход в Helpdesk" - -#: templates/helpdesk/registration/login.html:14 -msgid "To log in simply enter your username and password below." -msgstr "" - -#: templates/helpdesk/registration/login.html:17 -msgid "Your username and password didn't match. Please try again." -msgstr "Введённые имя пользователя и пароль не подошли. Пожалуйста попробуйте ещё раз." - -#: templates/helpdesk/registration/login.html:20 -msgid "Login" -msgstr "Вход" - -#: views/feeds.py:39 +#: views/feeds.py:37 #, python-format msgid "Helpdesk: Open Tickets in queue %(queue)s for %(username)s" msgstr "Helpdesk: открытые тикеты в очереди %(queue)s для %(username)s" -#: views/feeds.py:44 +#: views/feeds.py:42 #, python-format msgid "Helpdesk: Open Tickets for %(username)s" msgstr "Helpdesk: открытые тикеты для %(username)s" -#: views/feeds.py:50 +#: views/feeds.py:48 #, python-format msgid "Open and Reopened Tickets in queue %(queue)s for %(username)s" msgstr "Открытые и переоткрытые тикеты в очереди %(queue)s для %(username)s" -#: views/feeds.py:55 +#: views/feeds.py:53 #, python-format msgid "Open and Reopened Tickets for %(username)s" msgstr "Открытые и переоткрытые тикеты для %(username)s" -#: views/feeds.py:102 +#: views/feeds.py:100 msgid "Helpdesk: Unassigned Tickets" msgstr "Helpdesk: неназначенные тикеты" -#: views/feeds.py:103 +#: views/feeds.py:101 msgid "Unassigned Open and Reopened tickets" msgstr "Неназначенные открытые и переоткрытые тикеты" -#: views/feeds.py:128 +#: views/feeds.py:125 msgid "Helpdesk: Recent Followups" msgstr "Helpdesk: недавние дополнения" -#: views/feeds.py:129 +#: views/feeds.py:126 msgid "" "Recent FollowUps, such as e-mail replies, comments, attachments and " "resolutions" -msgstr "Недавние дополнения, такие как ответы на электронную почту, комментарии, прикрепленные файлы и решения" +msgstr "" +"Недавние дополнения, такие как ответы на электронную почту, комментарии, " +"прикрепленные файлы и решения" -#: views/feeds.py:144 +#: views/feeds.py:141 #, python-format msgid "Helpdesk: Open Tickets in queue %(queue)s" msgstr "Helpdesk: открытые тикеты в очереди %(queue)s" -#: views/feeds.py:149 +#: views/feeds.py:146 #, python-format msgid "Open and Reopened Tickets in queue %(queue)s" msgstr "Открытые и переоткрытые тикеты в очереди %(queue)s" -#: views/public.py:89 +#: views/public.py:86 msgid "Invalid ticket ID or e-mail address. Please try again." -msgstr "Неверный ID тикета или адрес электронной почты, Пожалуйста попробуйте ещё." +msgstr "" +"Неверный ID тикета или адрес электронной почты, Пожалуйста попробуйте ещё." -#: views/public.py:107 +#: views/public.py:109 msgid "Submitter accepted resolution and closed ticket" msgstr "Отправитель одобрил решение и закрыл тикет" -#: views/staff.py:235 +#: views/staff.py:287 msgid "Accepted resolution and closed ticket" msgstr "Принято решение и тикет закрыт" -#: views/staff.py:369 +#: views/staff.py:433 #, python-format msgid "Assigned to %(username)s" -msgstr "Назначен на %(username)s" +msgstr "Назначен %(username)s" -#: views/staff.py:392 +#: views/staff.py:459 msgid "Updated" msgstr "Обновлено" -#: views/staff.py:577 +#: views/staff.py:659 #, python-format msgid "Assigned to %(username)s in bulk update" msgstr "Назначен на %(username)s при массовом обновлении" -#: views/staff.py:582 +#: views/staff.py:670 msgid "Unassigned in bulk update" msgstr "Нераспределен при массовом обновлении" -#: views/staff.py:587 views/staff.py:592 +#: views/staff.py:679 views/staff.py:689 msgid "Closed in bulk update" msgstr "Закрыт при массовом обновлении" -#: views/staff.py:806 +#: views/staff.py:902 msgid "" "

Note: Your keyword search is case sensitive because of " "your database. This means the search will not be accurate. " "By switching to a different database system you will gain better searching! " -"For more information, read the Django Documentation on string matching in SQLite." -msgstr "

Замечание: ваш поиск по ключевым словам происходит с учетом регистра из-за вашей базы данных. Это означает, что поиск не будет точным. При переключении на другую систему баз данных, вы получите лучший поиск! Для получения дополнительной информации ознакомьтесь с Django документацией про сравнение строк в SQLite." +"For more information, read the Django Documentation on string " +"matching in SQLite." +msgstr "" +"

Замечание: ваш поиск по ключевым словам происходит с " +"учетом регистра из-за вашей базы данных. Это означает, что поиск не " +"будет точным. При переключении на другую систему баз данных, вы " +"получите лучший поиск! Для получения дополнительной информации ознакомьтесь " +"с Django документацией про сравнение строк в SQLite." -#: views/staff.py:910 +#: views/staff.py:1012 msgid "Ticket taken off hold" msgstr "Удержание тикета снято" -#: views/staff.py:913 +#: views/staff.py:1015 msgid "Ticket placed on hold" msgstr "Тикет удерживается" -#: views/staff.py:1007 +#: views/staff.py:1152 msgid "User by Priority" msgstr "Пользователи по Приоритетам" -#: views/staff.py:1013 +#: views/staff.py:1158 msgid "User by Queue" msgstr "Пользователи по Очередям" -#: views/staff.py:1019 +#: views/staff.py:1165 msgid "User by Status" msgstr "Пользователи по Статусам" -#: views/staff.py:1025 +#: views/staff.py:1171 msgid "User by Month" msgstr "Пользователи по Месяцам" -#: views/staff.py:1031 +#: views/staff.py:1177 msgid "Queue by Priority" msgstr "Очереди по Приоритетам" -#: views/staff.py:1037 +#: views/staff.py:1183 msgid "Queue by Status" msgstr "Очереди по Статусам" -#: views/staff.py:1043 +#: views/staff.py:1189 msgid "Queue by Month" msgstr "Очереди по Месяцам" + +#~ msgid "Description of Issue" +#~ msgstr "Описание проблемы" + +#~ msgid "Summary of your query" +#~ msgstr "Краткое описание вашего запроса" + +#~ msgid "Urgency" +#~ msgstr "Срочность" + +#~ msgid "Please select a priority carefully." +#~ msgstr "Пожалуйста, тщательно выберите приоритеты." + +#~ msgid "E-mail me when a ticket is changed via the API?" +#~ msgstr "Уведомить меня когда тикет изменён через API?" + +#~ msgid "If a ticket is altered by the API, do you want to receive an e-mail?" +#~ msgstr "" +#~ "Хотите ли вы получать электронное уведомление если тикет был изменён " +#~ "через API" + +#~ msgid " (Reopened)" +#~ msgstr " (Возобновлено)" + +#~ msgid " (Updated)" +#~ msgstr "(Обновлено)" + +#~ msgid "RSS Icon" +#~ msgstr "Иконка RSS" + +#~ msgid "API" +#~ msgstr "API" + +#~ msgid "Days since opened" +#~ msgstr "Дней с момента открытия" + +#~ msgid "Number of open tickets" +#~ msgstr "Число открытых тикетов" + +#~ msgid "Knowledgebase Category: %(kbcat)s" +#~ msgstr "Категория Базы Знаний: %(kbcat)s" + +#~ msgid "Article" +#~ msgstr "Статья" + +#~ msgid "Knowledgebase: %(item)s" +#~ msgstr "База Знаний: %(item)s" + +#~ msgid "Feedback" +#~ msgstr "Обратная Связь" + +#~ msgid "" +#~ "We give our users an opportunity to vote for items that they believe have " +#~ "helped them out, in order for us to better serve future customers. We " +#~ "would appreciate your feedback on this article. Did you find it useful?" +#~ msgstr "" +#~ "Мы предоставляем нашим пользователям возможность голосовать за статьи, " +#~ "которые по их мнению, способствовали им, с тем чтобы мы могли лучше " +#~ "обслуживать клиентов в будущем. Мы будем признательны за ваши отзывы на " +#~ "эту статью. Было ли это полезным?" + +#~ msgid "This article was useful to me" +#~ msgstr "Эта статья была полезна для меня" + +#~ msgid "This article was not useful to me" +#~ msgstr "Эта статья была бесполезна для меня" + +#~ msgid "Accept" +#~ msgstr "Принять" + +#~ msgid "Open Tickets" +#~ msgstr "Открытые Тикеты" + +#~ msgid "Attach another File" +#~ msgstr "Прикрепить другой файл" + +#~ msgid "Yes, Delete" +#~ msgstr "Удалить" + +#~ msgid "Previous" +#~ msgstr "Предыдущий" + +#~ msgid "Page %(ticket_num)s of %(num_pages)s." +#~ msgstr "Страница %(ticket_num)s из %(num_pages)s." + +#~ msgid "Next" +#~ msgstr "Следующая" From d3c713333d0ed2f7ffd3dffaa6201f9496c0ccc9 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Fri, 17 Mar 2017 10:00:37 -0400 Subject: [PATCH 12/25] Update es_MX translations on behalf of @andresf01, for #496 --- helpdesk/locale/es_MX/LC_MESSAGES/django.mo | Bin 38821 -> 56118 bytes helpdesk/locale/es_MX/LC_MESSAGES/django.po | 207 ++++++++++---------- 2 files changed, 104 insertions(+), 103 deletions(-) diff --git a/helpdesk/locale/es_MX/LC_MESSAGES/django.mo b/helpdesk/locale/es_MX/LC_MESSAGES/django.mo index 8b1d9ed831661f10be5911b9ac4da281784c521f..af863727fc208ee7f65037755950b7bd3f9a63ad 100644 GIT binary patch literal 56118 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 R1t?{rb^N66L|xg<{vX!xIurl^ delta 9538 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, 2011 +# Andrés Martínez, 2017 # Apizano , 2013 # Apizano , 2012 # Erik Rivera , 2011,2013,2016 @@ -14,9 +15,9 @@ msgstr "" "Project-Id-Version: django-helpdesk\n" "Report-Msgid-Bugs-To: http://github.com/RossP/django-helpdesk/issues\n" "POT-Creation-Date: 2014-07-26 14:14+0200\n" -"PO-Revision-Date: 2016-05-11 16:55+0000\n" -"Last-Translator: Erik Rivera \n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/rossp/django-helpdesk/language/es_MX/)\n" +"PO-Revision-Date: 2017-03-15 20:53+0000\n" +"Last-Translator: Andrés Martínez\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/django-helpdesk/django-helpdesk/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,7 +33,7 @@ msgstr "" #: templates/helpdesk/ticket_list.html:225 views/staff.py:1032 #: views/staff.py:1038 views/staff.py:1044 views/staff.py:1050 msgid "Queue" -msgstr "Colas" +msgstr "Cola" #: forms.py:137 msgid "Summary of the problem" @@ -577,11 +578,11 @@ msgstr "cambiado de \"%(old_value)s\" a \"%(new_value)s\"" #: models.py:600 msgid "Ticket change" -msgstr "" +msgstr "Cambio en el Ticket" #: models.py:601 msgid "Ticket changes" -msgstr "" +msgstr "Cambios en el Ticket" #: models.py:632 msgid "File" @@ -605,11 +606,11 @@ msgstr "Tamaño del archivo en bytes" #: models.py:665 msgid "Attachment" -msgstr "" +msgstr "Adjunto" #: models.py:666 msgid "Attachments" -msgstr "" +msgstr "Adjuntos" #: models.py:685 msgid "" @@ -639,11 +640,11 @@ msgstr "Contexto: {{ ticket }} - ticket de objeto (por ejemplo, {{ ticket.title #: models.py:705 msgid "Pre-set reply" -msgstr "" +msgstr "Respuesta por defecto" #: models.py:706 msgid "Pre-set replies" -msgstr "" +msgstr "Respuestas por defecto" #: models.py:727 msgid "" @@ -657,11 +658,11 @@ msgstr "Fecha en la que la escalada no debe suceder" #: models.py:746 msgid "Escalation exclusion" -msgstr "" +msgstr "Exclusión escalada" #: models.py:747 msgid "Escalation exclusions" -msgstr "" +msgstr "Exclusiones escaladas" #: models.py:760 msgid "Template Name" @@ -712,19 +713,19 @@ msgstr "Locale de esta plantilla" #: models.py:806 msgid "e-mail template" -msgstr "" +msgstr "Plantilla de e-mail" #: models.py:807 msgid "e-mail templates" -msgstr "" +msgstr "Plantillas de e-mail" #: models.py:834 msgid "Knowledge base category" -msgstr "" +msgstr "Categoría de la base de conocimiento" #: models.py:835 msgid "Knowledge base categories" -msgstr "" +msgstr "Categorías de la base de conocimiento" #: models.py:849 templates/helpdesk/kb_index.html:11 #: templates/helpdesk/public_homepage.html:11 @@ -769,11 +770,11 @@ msgstr "No calificado" #: models.py:901 msgid "Knowledge base item" -msgstr "" +msgstr "Elemento de la base de conocimiento" #: models.py:902 msgid "Knowledge base items" -msgstr "" +msgstr "Elementos de la base de conocimiento" #: models.py:926 templates/helpdesk/ticket_list.html:170 msgid "Query Name" @@ -801,11 +802,11 @@ msgstr "objeto de consulta en crudo. Tenga cuidado con cambiar esto." #: models.py:950 msgid "Saved search" -msgstr "" +msgstr "Búsqueda guardada" #: models.py:951 msgid "Saved searches" -msgstr "" +msgstr "Búsquedas guardadas" #: models.py:966 msgid "Settings Dictionary" @@ -819,7 +820,7 @@ msgstr "Esta es una representación codificada en base 64 de un diccionario de P #: models.py:993 msgid "User Setting" -msgstr "" +msgstr "Configuración de usuario" #: models.py:994 templates/helpdesk/navigation.html:37 #: templates/helpdesk/user_settings.html:6 @@ -854,11 +855,11 @@ msgstr "¿Desea guardar los correos electrónicos de esta dirección en el buzó #: models.py:1101 msgid "Ignored e-mail address" -msgstr "" +msgstr "Correo electrónico ignorado" #: models.py:1102 msgid "Ignored e-mail addresses" -msgstr "" +msgstr "Correos electrónicos ignorados" #: models.py:1124 msgid "User who wishes to receive updates for this ticket." @@ -1015,19 +1016,19 @@ msgstr "Si está prendido, la forma pública de creación de ticket NO MOSTRARÁ #: models.py:1273 msgid "Custom field" -msgstr "" +msgstr "Campo personalizado" #: models.py:1274 msgid "Custom fields" -msgstr "" +msgstr "Campos personalizados" #: models.py:1297 msgid "Ticket custom field value" -msgstr "" +msgstr "Valor del campo personalizado" #: models.py:1298 msgid "Ticket custom field values" -msgstr "" +msgstr "Valores del campo personalizado" #: models.py:1315 msgid "Depends On Ticket" @@ -1035,11 +1036,11 @@ msgstr "Depende del ticket" #: models.py:1324 msgid "Ticket dependency" -msgstr "" +msgstr "Dependencia de Ticket" #: models.py:1325 msgid "Ticket dependencies" -msgstr "" +msgstr "Dependencia de Tickets" #: management/commands/create_usersettings.py:25 msgid "" @@ -1092,7 +1093,7 @@ msgstr "(Actualizado)" #: templates/helpdesk/attribution.html:2 msgid "" "django-helpdesk." -msgstr "" +msgstr "django-helpdesk." #: templates/helpdesk/base.html:10 msgid "Powered by django-helpdesk" @@ -1143,7 +1144,7 @@ msgstr "Borrar Búsqueda Salvada" #: templates/helpdesk/confirm_delete_saved_query.html:6 msgid "Delete Query" -msgstr "" +msgstr "Borrar consulta" #: templates/helpdesk/confirm_delete_saved_query.html:8 #, python-format @@ -1151,13 +1152,13 @@ msgid "" "Are you sure you want to delete this saved filter " "(%(query_title)s)? To re-create it, you will need to manually re-" "filter your ticket listing." -msgstr "" +msgstr "¿Estás seguro que quieres eliminar este filtro guardado (%(query_title)s)? Para volver a crearlo, tendrá que volver a filtrar la lista de Tickets." #: templates/helpdesk/confirm_delete_saved_query.html:11 msgid "" "You have shared this query, so other users may be using it. If you delete " "it, they will have to manually create their own query." -msgstr "" +msgstr " Ha compartido esta consulta para que los otros usuarios pueden usarla. Si la elimina, los otros usuarios deben crear su propia consulta." #: templates/helpdesk/confirm_delete_saved_query.html:14 #: templates/helpdesk/delete_ticket.html:10 @@ -1182,13 +1183,13 @@ msgstr "Enviar un Ticket" #: templates/helpdesk/create_ticket.html:11 #: templates/helpdesk/edit_ticket.html:11 msgid "Unless otherwise stated, all fields are required." -msgstr "" +msgstr "Se requieren todos los campos, a menos que se indique lo contrario." #: templates/helpdesk/create_ticket.html:11 #: templates/helpdesk/edit_ticket.html:11 #: templates/helpdesk/public_homepage.html:28 msgid "Please provide as descriptive a title and description as possible." -msgstr "" +msgstr "Por favor incluya un título y una descripción tan explícitas como sea posible." #: templates/helpdesk/create_ticket.html:30 #: templates/helpdesk/public_homepage.html:55 @@ -1212,37 +1213,37 @@ msgstr "Resumen - Servicio de Ayuda" #: templates/helpdesk/dashboard.html:36 msgid "Current Ticket Stats" -msgstr "" +msgstr "Estado del Ticket" #: templates/helpdesk/dashboard.html:37 msgid "Average number of days until ticket is closed (all tickets): " -msgstr "" +msgstr "Promedio de días hasta que un Ticket es cerrado (Todos los Tickets):" #: templates/helpdesk/dashboard.html:38 msgid "" "Average number of days until ticket is closed (tickets opened in last 60 " "days): " -msgstr "" +msgstr "Promedio de días hasta que un Ticket es cerrado (Tickets abiertos en los últimos 60 días):" #: templates/helpdesk/dashboard.html:39 msgid "Click" -msgstr "" +msgstr "Clic" #: templates/helpdesk/dashboard.html:39 msgid "for detailed average by month." -msgstr "" +msgstr "para el promedio detallado por mes." #: templates/helpdesk/dashboard.html:40 msgid "Distribution of open tickets, grouped by time period:" -msgstr "" +msgstr "Distribución de Tickets abiertos agrupados por periodos:" #: templates/helpdesk/dashboard.html:41 msgid "Days since opened" -msgstr "" +msgstr "Periodo" #: templates/helpdesk/dashboard.html:41 msgid "Number of open tickets" -msgstr "" +msgstr "Número de Tickets abiertos" #: templates/helpdesk/dashboard.html:57 msgid "All Tickets submitted by you" @@ -1304,7 +1305,7 @@ msgid "" "Are you sure you want to delete this ticket (%(ticket_title)s)? All" " traces of the ticket, including followups, attachments, and updates will be" " irreversibly removed." -msgstr "" +msgstr "¿Está seguro que desea eliminar este Ticket (%(ticket_title)s)? Todos los rastros del Ticket, incluyendo comentarios, archivos adjuntos y actualizaciones serán eliminados de forma irreversible." #: templates/helpdesk/edit_ticket.html:3 msgid "Edit Ticket" @@ -1312,18 +1313,18 @@ msgstr "Editar Ticket" #: templates/helpdesk/edit_ticket.html:9 msgid "Edit a Ticket" -msgstr "" +msgstr "Editar un Ticket" #: templates/helpdesk/edit_ticket.html:13 msgid "Note" -msgstr "" +msgstr "Nota" #: templates/helpdesk/edit_ticket.html:13 msgid "" "Editing a ticket does not send an e-mail to the ticket owner or " "submitter. No new details should be entered, this form should only be used " "to fix incorrect details or clean up the submission." -msgstr "" +msgstr "La edición de un ticket no envía un correo electrónico al propietario del ticket o remitente. Este formato no es para añadir nuevos datos, sólo se debe utilizar para arreglar datos incorrectos o limpiar el Ticket." #: templates/helpdesk/edit_ticket.html:33 msgid "Save Changes" @@ -1339,14 +1340,14 @@ msgstr "Ignorar Dirección de E-mail" msgid "" "To ignore an e-mail address and prevent any emails from that address " "creating tickets automatically, enter the e-mail address below." -msgstr "" +msgstr "Para ignorar un correo electrónico y prevenir que cree Tickets automaticamente escríbalo debajo." #: templates/helpdesk/email_ignore_add.html:10 msgid "" "You can either enter a whole e-mail address such as " "email@domain.com or a portion of an e-mail address with a wildcard," " such as *@domain.com or user@*." -msgstr "" +msgstr "Puede especificar tanto una dirección de correo completa, por ejemplo email@domain.com o solo una parte de la dirección con un wildcard, como por ejemplo *@dominio.com o usuario@*." #: templates/helpdesk/email_ignore_del.html:3 msgid "Delete Ignored E-Mail Address" @@ -1354,7 +1355,7 @@ msgstr "Borrar dirección de E-Mail Ignorada" #: templates/helpdesk/email_ignore_del.html:6 msgid "Un-Ignore E-Mail Address" -msgstr "" +msgstr "No ignorar dirección de correo electrónico" #: templates/helpdesk/email_ignore_del.html:8 #, python-format @@ -1362,7 +1363,7 @@ msgid "" "Are you sure you wish to stop removing this email address " "(%(email_address)s) and allow their e-mails to automatically create" " tickets in your system? You can re-add this e-mail address at any time." -msgstr "" +msgstr "¿Está seguro que desea dejar de evitar esta dirección de correo (%(email_address)s) y permitir que este correo electrónico cree tickets en el sistema? Puede volver a añadir el correo electrónico en cualquier momento." #: templates/helpdesk/email_ignore_del.html:10 msgid "Keep Ignoring It" @@ -1383,7 +1384,7 @@ msgid "" "

Ignored E-Mail Addresses

\n" "\n" "

The following e-mail addresses are currently being ignored by the incoming e-mail processor. You can add a new e-mail address to the list or delete any of the items below as required.

" -msgstr "" +msgstr "\n

Correos electrónicos ignorados

\n\n

Los siguientes correos electrónicos esta siendo ignorados. Usted puede añadir un nuevo correo electrónico a la lista o eliminar cualquiera de los elementos debajo como requiera.

" #: templates/helpdesk/email_ignore_list.html:13 msgid "Date Added" @@ -1406,7 +1407,7 @@ msgstr "Mantener" msgid "" "Note: If the 'Keep' option is not selected, emails sent " "from that address will be deleted permanently." -msgstr "" +msgstr "Nota: Si la opción 'Mantener' no está seleccionada, los e-mail enviados de esa dirección serán borrados de manera permanente." #: templates/helpdesk/followup_edit.html:2 msgid "Edit followup" @@ -1453,7 +1454,7 @@ msgid "" "We have listed a number of knowledgebase articles for your perusal in the " "following categories. Please check to see if any of these articles address " "your problem prior to opening a support ticket." -msgstr "" +msgstr "Hemos listado una serie de artículos de la base de conocimiento para usted en las siguientes categorías. Por favor, revise para ver si alguno de estos artículos se refieren a su problema antes de abrir un Ticket de soporte." #: templates/helpdesk/kb_index.html:10 #: templates/helpdesk/public_homepage.html:10 @@ -1471,7 +1472,7 @@ msgid "" "View other %(category_title)s " "articles, or continue viewing other knowledgebase " "articles." -msgstr "" +msgstr "Ver otros %(category_title)s articulos, o continuar otros artículos de la base de conocimiento." #: templates/helpdesk/kb_item.html:18 msgid "Feedback" @@ -1525,11 +1526,11 @@ msgstr "Estadisticas" #: templates/helpdesk/navigation.html:24 msgid "Saved Query" -msgstr "" +msgstr "Consulta guardada" #: templates/helpdesk/navigation.html:39 msgid "Change password" -msgstr "" +msgstr "Cambiar contraseña" #: templates/helpdesk/navigation.html:50 msgid "Search..." @@ -1564,7 +1565,7 @@ msgstr "Artículos de la Base de Conocimientos" #: templates/helpdesk/public_homepage.html:28 msgid "All fields are required." -msgstr "" +msgstr "Se requieren todos los campos." #: templates/helpdesk/public_homepage.html:66 msgid "Please use button at upper right to login first." @@ -1586,7 +1587,7 @@ msgstr "No es posible abrir el Ticket" #: templates/helpdesk/public_spam.html:5 msgid "Sorry, but there has been an error trying to submit your ticket." -msgstr "" +msgstr "Lo sentimos, hubo un error enviando tu Ticket." #: templates/helpdesk/public_spam.html:6 msgid "" @@ -1594,13 +1595,13 @@ msgid "" "unable to save it. If this is not spam, please press back and re-type your " "message. Be careful to avoid sounding 'spammy', and if you have heaps of " "links please try removing them if possible." -msgstr "" +msgstr "Nuestro sistema ha catalogado su envío como spam, por lo que no podemos guardarlo. Si no es spam, por favor presione atrás y reingrese su mensaje. Intente no ingresar palabras que puedan sonar a spam, y si tiene enlaces en su mensaje trate de eliminarlas si es posible." #: templates/helpdesk/public_spam.html:7 msgid "" "We are sorry for any inconvenience, however this check is required to avoid " "our helpdesk resources being overloaded by spammers." -msgstr "" +msgstr "Lamentamos cualquier inconveniente, sin embargo, la confirmación es requerida para evitar que nuestros recursos sean sobrecargados por spammers." #: templates/helpdesk/public_view_form.html:8 msgid "Error:" @@ -1681,12 +1682,12 @@ msgstr "Reportes por Fila" #: templates/helpdesk/report_index.html:27 views/staff.py:1049 msgid "Days until ticket closed by Month" -msgstr "" +msgstr "Días hasta que el Ticket se cierre por mes" #: templates/helpdesk/report_output.html:19 msgid "" "You can run this query on filtered data by using one of your saved queries." -msgstr "" +msgstr "Usted puede ejecutar esta consulta con filtros usando alguna de sus consultas guardadas." #: templates/helpdesk/report_output.html:21 msgid "Select Query:" @@ -1700,7 +1701,7 @@ msgstr "Filtrar reporte" msgid "" "Want to filter this report to just show a subset of data? Go to the Ticket " "List, filter your query, and save your query." -msgstr "" +msgstr "¿Desea filtrar este reporte para mostrar para mostrar solo un subconjunto de datos? Vaya a Lista de Tickets, realice el filtro y guarde la consulta." #: templates/helpdesk/rss_list.html:6 msgid "" @@ -1708,13 +1709,13 @@ msgid "" "preferred RSS software. With the exception of the 'Latest Activity' feed, " "all feeds provide information only on Open and Reopened cases. This ensures " "your RSS reader isn't full of information about closed or historical tasks." -msgstr "" +msgstr "Las siguientes fuentes de RSS están disponibles para usted para ser utilizadas con su herramienta de RSS preferida. A excepción de la fuente de 'Última actividad', todas las fuentes RSS solo proveen información de casos Abiertos y Reabiertos. Esto le asegura que su lector RSS no se llena con información de tareas cerradas o históricas." #: templates/helpdesk/rss_list.html:10 msgid "" "A summary of your open tickets - useful for getting alerted to new tickets " "opened for you" -msgstr "" +msgstr "Resumen de sus Tickets abiertos - Útil para saber si hay nuevos Tickets abiertos para usted" #: templates/helpdesk/rss_list.html:12 msgid "Latest Activity" @@ -1738,7 +1739,7 @@ msgid "" "all tickets, for each of the queues in your helpdesk. For example, if you " "manage the staff who utilise a particular queue, this may be used to view " "new tickets coming into that queue." -msgstr "" +msgstr "Estas fuentes RSS le permiten ver un resumen ya sea de sus propios tickets o de todos los tickets de las colas de su helpdesk. Por ejemplo, si eres el supervisor del personal que utiliza una cola en particular, estas fuentes RSS pueden ser utilizadas para ver los nuevos tickets que arriban a esa cola." #: templates/helpdesk/rss_list.html:23 msgid "Per-Queue Feeds" @@ -1758,7 +1759,7 @@ msgstr "Cambiar la Configuración del Sistema" #: templates/helpdesk/system_settings.html:8 msgid "The following items can be maintained by you or other superusers:" -msgstr "" +msgstr "Los siguientes elemtenos pueden ser administrados por usted o por otros super usuarios:" #: templates/helpdesk/system_settings.html:11 msgid "E-Mail Ignore list" @@ -1770,19 +1771,19 @@ msgstr "Mantenimiento a colas" #: templates/helpdesk/system_settings.html:13 msgid "Maintain Pre-Set Replies" -msgstr "" +msgstr "Administrar respuestas por defecto" #: templates/helpdesk/system_settings.html:14 msgid "Maintain Knowledgebase Categories" -msgstr "" +msgstr "Administrar las categorías de la base de conocimiento" #: templates/helpdesk/system_settings.html:15 msgid "Maintain Knowledgebase Items" -msgstr "" +msgstr "Administrar los elemento de la base de conocimiento" #: templates/helpdesk/system_settings.html:16 msgid "Maintain E-Mail Templates" -msgstr "" +msgstr "Administrar las plantillas de correo electrónico" #: templates/helpdesk/system_settings.html:17 msgid "Maintain Users" @@ -1820,7 +1821,7 @@ msgstr "(Opcional)" msgid "" "Selecting a pre-set reply will over-write your comment below. You can then " "modify the pre-set reply to your liking before saving this update." -msgstr "" +msgstr "Seleccionando una respuesta por defecto, se sobre escriben sus comentarios a continuación. Puede modificar la respuesta por defecto a su gusto antes de guardar esta actualización." #: templates/helpdesk/ticket.html:131 msgid "Comment / Resolution" @@ -1830,13 +1831,13 @@ msgstr "Comentario / Resolución" msgid "" "You can insert ticket and queue details in your message. For more " "information, see the context help page." -msgstr "" +msgstr "Puede insertar Tickets y detalles de cola en su mensaje. Para obtener más información, consulte la página de ayuda ." #: templates/helpdesk/ticket.html:136 msgid "" "This ticket cannot be resolved or closed until the tickets it depends on are" " resolved." -msgstr "" +msgstr "Este Ticket no puede ser resuelto o cerrado hasta que sus dependencias sean resueltas." #: templates/helpdesk/ticket.html:166 msgid "Is this update public?" @@ -1846,11 +1847,11 @@ msgstr "¿Esta actualización es pública?" msgid "" "If this is public, the submitter will be e-mailed your comment or " "resolution." -msgstr "" +msgstr "Si esto es público, se enviará un correo electrónico al remitente con su comentario o resolución." #: templates/helpdesk/ticket.html:172 msgid "Change Further Details »" -msgstr "" +msgstr "Cambie más detalles »" #: templates/helpdesk/ticket.html:181 templates/helpdesk/ticket_list.html:68 #: templates/helpdesk/ticket_list.html:97 @@ -1860,11 +1861,11 @@ msgstr "Dueño" #: templates/helpdesk/ticket.html:182 msgid "Unassign" -msgstr "" +msgstr "No asignado" #: templates/helpdesk/ticket.html:193 msgid "Attach File(s) »" -msgstr "" +msgstr "Adjuntar archivo(s) »" #: templates/helpdesk/ticket.html:199 msgid "Attach a File" @@ -1876,7 +1877,7 @@ msgstr "Actualizar este Ticket" #: templates/helpdesk/ticket_cc_add.html:3 msgid "Add Ticket CC" -msgstr "" +msgstr "Agregar CC a TIcket" #: templates/helpdesk/ticket_cc_add.html:5 msgid "" @@ -1884,15 +1885,15 @@ msgid "" "

Add Ticket CC

\n" "\n" "

To automatically send an email to a user or e-mail address when this ticket is updated, select the user or enter an e-mail address below.

" -msgstr "" +msgstr "\n

Añadir CC al Ticket

\n\n

Para enviar un e-mail automático a un usuario o dirección de correo cuando este ticket sea actualizado, seleccione el usuario o ingrese una dirección de correo abajo.

" #: templates/helpdesk/ticket_cc_add.html:21 msgid "Save Ticket CC" -msgstr "" +msgstr "Guardar CC de Ticket" #: templates/helpdesk/ticket_cc_del.html:3 msgid "Delete Ticket CC" -msgstr "" +msgstr "Borrar CC de Ticket" #: templates/helpdesk/ticket_cc_del.html:5 #, python-format @@ -1901,7 +1902,7 @@ msgid "" "

Delete Ticket CC

\n" "\n" "

Are you sure you wish to delete this email address (%(email_address)s) from the CC list for this ticket? They will stop receiving updates.

\n" -msgstr "" +msgstr "\n

Borrar CC del Ticket

\n\n

¿Está seguro de que desea eliminar esta dirección de correo (%(email_address)s) de la lista CC para este ticket? Esta dirección dejará de recibir actualizaciones.

\n" #: templates/helpdesk/ticket_cc_del.html:11 #: templates/helpdesk/ticket_dependency_del.html:11 @@ -1915,7 +1916,7 @@ msgstr "Si, Eliminar" #: templates/helpdesk/ticket_cc_list.html:3 msgid "Ticket CC Settings" -msgstr "" +msgstr "Ajustes de CC del Ticket" #: templates/helpdesk/ticket_cc_list.html:5 #, python-format @@ -1926,11 +1927,11 @@ msgid "" "

The following people will receive an e-mail whenever %(ticket_title)s is updated. Some people can also view or edit the ticket via the public ticket views.

\n" "\n" "

You can add a new e-mail address to the list or delete any of the items below as required.

" -msgstr "" +msgstr "\n

Configuración de CC del Ticket

\n\n

Las siguientes personas recibirán un e-mail cada que el ticket %(ticket_title)s se actualice. Algunas personas también pueden ver o editar el ticket a través de las vistas públicas de tickets.

\n\n

Usted puede añadir una nueva dirección de correo electrónico a la lista o borrar uno de los elementos abajo, como lo requiera.

" #: templates/helpdesk/ticket_cc_list.html:14 msgid "Ticket CC List" -msgstr "" +msgstr "Lista de CC del Ticket" #: templates/helpdesk/ticket_cc_list.html:15 msgid "View?" @@ -1955,15 +1956,15 @@ msgid "" "

Add Ticket Dependency

\n" "\n" "

Adding a dependency will stop you resolving this ticket until the dependent ticket has been resolved or closed.

" -msgstr "" +msgstr "\n

Agregar dependencia de Ticket

\n\n

Al añadir una dependencia no se podrá resolver este Ticket hasta que la dependencia haya sido resuelta o esté cerrada.

" #: templates/helpdesk/ticket_dependency_add.html:21 msgid "Save Ticket Dependency" -msgstr "" +msgstr "Guardar dependencia del Ticket" #: templates/helpdesk/ticket_dependency_del.html:3 msgid "Delete Ticket Dependency" -msgstr "" +msgstr "Eliminar dependencia del Ticket" #: templates/helpdesk/ticket_dependency_del.html:5 msgid "" @@ -1971,15 +1972,15 @@ msgid "" "

Delete Ticket Dependency

\n" "\n" "

Are you sure you wish to remove the dependency on this ticket?

\n" -msgstr "" +msgstr "\n

Eliminar dependencia de Ticket

\n\n

¿Está seguro que desea eliminar la dependencia en este Ticket?

\n" #: templates/helpdesk/ticket_desc_table.html:7 msgid "Unhold" -msgstr "" +msgstr "Reanudar" #: templates/helpdesk/ticket_desc_table.html:7 msgid "Hold" -msgstr "" +msgstr "Suspender" #: templates/helpdesk/ticket_desc_table.html:9 #, python-format @@ -2006,17 +2007,17 @@ msgstr "Administrar" msgid "" "Click here to add / remove people who should receive an e-mail whenever this" " ticket is updated." -msgstr "" +msgstr "Haga clic aquí para añadir / remover personas que reciben un e-mail cada vez que este Ticket es actualizado." #: templates/helpdesk/ticket_desc_table.html:53 msgid "Subscribe" -msgstr "" +msgstr "Suscribirse" #: templates/helpdesk/ticket_desc_table.html:53 msgid "" "Click here to subscribe yourself to this ticket, if you want to receive an " "e-mail whenever this ticket is updated." -msgstr "" +msgstr "Haga clic aquí si quiere recibir un correo electrónico cada vez que este Ticket sea actualizado" #: templates/helpdesk/ticket_desc_table.html:57 msgid "Dependencies" @@ -2044,7 +2045,7 @@ msgid "" "Click on 'Add Dependency', if you want to make this ticket dependent on " "another ticket. A ticket may not be closed until all tickets it depends on " "are closed." -msgstr "" +msgstr "Hacer clic en 'Añadir dependencia' hace que este Ticket dependa de otro. Un Ticket no puede ser cerrado hasta que todas sus dependencias estén cerradas." #: templates/helpdesk/ticket_list.html:59 msgid "Change Query" @@ -2113,7 +2114,7 @@ msgstr "Usar el formato de fechas YYYY-MM-DD, por ejemplo: 2011-05-29" msgid "" "Keywords are case-insensitive, and will be looked for in the title, body and" " submitter fields." -msgstr "" +msgstr "Las palabras claves no son sensibles a mayúsculas, y serán buscadas en el título, el cuerpo o los campos del remitente." #: templates/helpdesk/ticket_list.html:144 msgid "Apply Filter" @@ -2122,14 +2123,14 @@ msgstr "Aplicar Filtro" #: templates/helpdesk/ticket_list.html:146 #, python-format msgid "You are currently viewing saved query \"%(query_name)s\"." -msgstr "" +msgstr "Viendo la consulta \"%(query_name)s\"." #: templates/helpdesk/ticket_list.html:149 #, python-format msgid "" "Run a report on this " "query to see stats and charts for the data listed below." -msgstr "" +msgstr "Ejecutar un reporte en esta consultar para ver estadísticas y gráficas de los datos listados abajo." #: templates/helpdesk/ticket_list.html:162 #: templates/helpdesk/ticket_list.html:181 @@ -2141,7 +2142,7 @@ msgid "" "This name appears in the drop-down list of saved queries. If you share your " "query, other users will see this name, so choose something clear and " "descriptive!" -msgstr "" +msgstr "Este nombre aparece en la la lista desplegable de consultas guardadas. Si usted comparte esta consulta, otros usuarios verán este nombre, por tanto escoja uno claro y descriptivo." #: templates/helpdesk/ticket_list.html:174 msgid "Shared?" @@ -2234,7 +2235,7 @@ msgstr "Cambiar ajustes de usuario" msgid "" "Use the following options to change the way your helpdesk system works for " "you. These settings do not impact any other user." -msgstr "" +msgstr "Use las siguientes opciones para cambiar la manera en que el sistema helpdesk trabaja para usted. Estas configuraciones solo lo afectarán a usted." #: templates/helpdesk/user_settings.html:14 msgid "Save Options" @@ -2259,7 +2260,7 @@ msgstr "Ingresar a Helpdesk" #: templates/helpdesk/registration/login.html:14 msgid "To log in simply enter your username and password below." -msgstr "" +msgstr "Para ingresar escriba su nombre y contraseña." #: templates/helpdesk/registration/login.html:17 msgid "Your username and password didn't match. Please try again." From 199b63e17b6130a78d9de94e75401cb575c9b8da Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Sun, 19 Mar 2017 22:50:08 -0400 Subject: [PATCH 13/25] Add more pypi classifiers --- setup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index cbea8d21..9d05c60e 100644 --- a/setup.py +++ b/setup.py @@ -126,16 +126,24 @@ setup( description="Django-powered ticket tracker for your helpdesk", long_description=LONG_DESCRIPTION, classifiers=[ + "Development Status :: 4 - Beta", "Programming Language :: Python", - "Topic :: Software Development :: Libraries :: Python Modules", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", "Framework :: Django", + "Framework :: Django :: 1.8", + "Framework :: Django :: 1.9", + "Framework :: Django :: 1.10", "Environment :: Web Environment", "Operating System :: OS Independent", "Intended Audience :: Customer Service", "License :: OSI Approved :: BSD License", - "Natural Language :: English", - "Topic :: Office/Business", "Topic :: Software Development :: Bug Tracking", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Office/Business", + "Natural Language :: English", ], keywords=['django', 'helpdesk', 'django-helpdesk', 'tickets', 'incidents', 'cases', 'bugs', 'track', 'support'], From 0464db34aeaac2c37e47e18f82c8e9f05c8f159f Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 20 Mar 2017 02:38:44 -0400 Subject: [PATCH 14/25] New demo project with Makefile script for easy demo, testing, and development --- .gitignore | 12 + Makefile | 125 +++++++++++ demo/README.rst | 110 +++++++++ demo/demodesk/config/__init__.py | 0 demo/demodesk/config/settings.py | 208 ++++++++++++++++++ demo/demodesk/config/urls.py | 31 +++ demo/demodesk/config/wsgi.py | 16 ++ demo/demodesk/fixtures/demo.json | 13 ++ demo/demodesk/manage.py | 25 +++ .../helpdesk/attachments/DH-3/3/someinfo.txt | 3 + .../helpdesk/attachments/DH-3/4/helpdesk.png | Bin 0 -> 30229 bytes demo/setup.py | 51 +++++ 12 files changed, 594 insertions(+) create mode 100644 Makefile create mode 100644 demo/README.rst create mode 100644 demo/demodesk/config/__init__.py create mode 100644 demo/demodesk/config/settings.py create mode 100644 demo/demodesk/config/urls.py create mode 100644 demo/demodesk/config/wsgi.py create mode 100644 demo/demodesk/fixtures/demo.json create mode 100755 demo/demodesk/manage.py create mode 100644 demo/demodesk/media/helpdesk/attachments/DH-3/3/someinfo.txt create mode 100644 demo/demodesk/media/helpdesk/attachments/DH-3/4/helpdesk.png create mode 100644 demo/setup.py diff --git a/.gitignore b/.gitignore index 3a412d80..26ae9a31 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,15 @@ docs/doctrees/* .project .pydevproject .directory + +# ignore demo attachments that user might have added +demo/demodesk/media/helpdesk/attachments/* +!demo/demodesk/media/helpdesk/attachments/DH-3 +demo/demodesk/media/helpdesk/attachments/DH-3/* +!demo/demodesk/media/helpdesk/attachments/DH-3/3 +!demo/demodesk/media/helpdesk/attachments/DH-3/4 +demo/demodesk/media/helpdesk/attachments/DH-3/3/* +demo/demodesk/media/helpdesk/attachments/DH-3/4/* +!demo/demodesk/media/helpdesk/attachments/DH-3/3/someinfo.txt +!demo/demodesk/media/helpdesk/attachments/DH-3/4/helpdesk.png + diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..601799cf --- /dev/null +++ b/Makefile @@ -0,0 +1,125 @@ +# Shortcuts for django-helpdesk testing and development using make +# +# For standard installation of django-helpdesk as a library, +# see INSTALL and the documentation in docs/. +# +# For details about how to develop django-helpdesk, +# see CONTRIBUTING.rst. +PIP = pip3 +TOX = tox + + +#: help - Display callable targets. +.PHONY: help +help: + @echo "django-helpdesk make shortcuts" + @echo "Here are available targets:" + @egrep -o "^#: (.+)" [Mm]akefile | sed 's/#: /* /' + + +#: develop - Install minimal development utilities for Python3 +.PHONY: develop +develop: + $(PIP) install -e . + +#: develop - Install minimal development utilities for Python2 +.PHONY: develop2 +develop2: + pip2 install -e . + + +#: clean - Basic cleanup, mostly temporary files. +.PHONY: clean +clean: + find . -name "*.pyc" -delete + find . -name '*.pyo' -delete + find . -name "__pycache__" -delete + + +#: distclean - Remove local builds, such as *.egg-info. +.PHONY: distclean +distclean: clean + rm -rf *.egg + rm -rf *.egg-info + rm -rf demo/*.egg-info + # remove the django-created database + rm -f demo/demodesk/*.sqlite3 + + +#: maintainer-clean - Remove almost everything that can be re-generated. +.PHONY: maintainer-clean +maintainer-clean: distclean + rm -rf build/ + rm -rf dist/ + rm -rf .tox/ + + +#: test - Run test suites. +.PHONY: test +test: + mkdir -p var + $(PIP) install -e .[test] + $(TOX) + + +#: documentation - Build documentation (Sphinx, README, ...) +.PHONY: documentation +documentation: sphinx readme + + +#: sphinx - Build Sphinx documentation (docs). +.PHONY: sphinx +sphinx: + $(TOX) -e sphinx + + +#: readme - Build standalone documentation files (README, CONTRIBUTING...). +.PHONY: readme +readme: + $(TOX) -e readme + + +#: demo - Setup demo project using Python3. +.PHONY: demo +demo: + $(PIP) install -e . + $(PIP) install -e demo + demodesk migrate --noinput + # Create superuser; user will be prompted to manually set a password + # When you get a prompt, enter a password of your choosing. + # We suggest a default of 'Test1234' for the demo project. + demodesk createsuperuser --username admin --email helpdesk@example.com + # Install fixtures + demodesk loaddata emailtemplate.json + demodesk loaddata demo.json + +#: demo - Setup demo project using Python2. +.PHONY: demo2 +demo2: + pip2 install -e . + pip2 install -e demo + demodesk migrate --noinput + # Create superuser; user will be prompted to manually set a password. + # When you get a prompt, enter a password of your choosing. + # We suggest a default of 'Test1234' for the demo project. + demodesk createsuperuser --username admin --email helpdesk@example.com + # Install fixtures (helpdesk templates as well as demo ticket data) + demodesk loaddata emailtemplate.json + demodesk loaddata demo.json + + +#: runserver - Run demo server using Python3 +.PHONY: rundemo +rundemo: demo + demodesk runserver 8080 + +#: runserver - Run demo server using Python2 +.PHONY: rundemo2 +rundemo2: demo2 + demodesk runserver 8080 + + +#: release - Tag and push to PyPI. +.PHONY: release +release: + $(TOX) -e release diff --git a/demo/README.rst b/demo/README.rst new file mode 100644 index 00000000..548bb850 --- /dev/null +++ b/demo/README.rst @@ -0,0 +1,110 @@ +django-helpdesk Demo Project +============================ + +This folder contains a demo Django project that +illustrates a simple django-helpdesk installation +with common settings. + +This project is *NOT* production ready, but can be +used as a template to get started. + +In particular, this should be useful for testing +purposes and for those that want to contribute +to development of django-helpdesk. For more information +on contributing, see the CONTRIBUTING.rst file +in the top level of the django-helpdesk directory. + +Running the demo +---------------- + +By default, the demo is configured for Python 3. + +While not recommended, the simplest way to get +started is to simply install django-helpdesk +to your system python package directory. +Ideally, you'd use a virtualenv instead +(see below for details). + +To use your system directory, from the top-level +django-helpdesk directory, simply run: + + sudo make rundemo + +Once the console gives a prompt that the HTTP +server is listening, open your web browser +and navigate to: + + localhost:8080 + +You should see the django-helpdesk public web portal! + +If you shut down the server, you can't immediately +re-run the demo because the make commands would +encounter problems trying to re-write the database. +Instead, before running the demo, you will need +to first clean the demo: + + sudo make distclean + +You may need to use sudo with other make targets too. + +*NOTE ON USING VIRTUALENV* + +Rather than using the system python, you probably +want to use a virtualenv. + +If so, you might change the pip in the makefile +to point to your virtualenv's pip instead +before running: + + make rundemo + +*NOTE ON USING PYTHON 2* + +By default, the demo uses Python 3, as Python 3 +will be the recommended version of python for +django-helpdesk and even Django itself in the near future. +However, if you wish to use Python 2, you can +instead run the following: + + sudo make rundemo2 + +Then navigate to the site in a browser as above. + +*NOTE ON DJANGO VERISON* + +The demo project was also created with Django 1.10 +in mind. If you are using a different version of Django, +slight tweaks might be necessary to make the demo work. + +*NOTE ON ATTACHMENTS* + +The folder: + + demo/demodesk/media/helpdesk/attachments + +comes pre-populated with a couple of attachments, +to demo how django-helpdesk deals with attachments. +You can look in this folder to see the raw data. +You can also create a different folder for this +and update settings.py, but note that this will +break the demo as some attachments may not be available +unless you migrate the existing data to the +new location. + +The demodesk project +-------------------- + +"demodesk" is the name of our demo Django project. + +You probably will want to look at demo/demodesk/config/settings.py +and read the comments, which walk you through a basic +installation with common configuration options. + +The top-level Makefile also gives a list of commands so you +can see how to get the project running. Of course, +when you plan to deploy this project, it is recommended +to use a "real" HTTP server like apache or nginx, +and so further configuration will be necessary. + +More information can be found in the top-level docs/ folder. diff --git a/demo/demodesk/config/__init__.py b/demo/demodesk/config/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/demo/demodesk/config/settings.py b/demo/demodesk/config/settings.py new file mode 100644 index 00000000..dde89105 --- /dev/null +++ b/demo/demodesk/config/settings.py @@ -0,0 +1,208 @@ +""" +Django settings for django-helpdesk demodesk project. + +Generated by 'django-admin startproject' using Django 1.10.2. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '_crkn1+fnzu5$vns_-d+^ayiq%z4k*s!!ag0!mfy36(y!vrazd' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'django.contrib.sites', + 'django.contrib.humanize', + 'bootstrapform', + 'helpdesk' +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'demodesk.config.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'demodesk.config.wsgi.application' + + +# django-helpdesk configuration settings +# You can override django-helpdesk's defaults by redefining them here. +# To see what settings are available, see the docs/configuration.rst +# file for more information. +# Some common settings are below. + +HELPDESK_DEFAULT_SETTINGS = { + 'use_email_as_submitter': True, + 'email_on_ticket_assign': True, + 'email_on_ticket_change': True, + 'login_view_ticketlist': True, + 'email_on_ticket_apichange': True, + 'preset_replies': True, + 'tickets_per_page': 25 +} + +# Should the public web portal be enabled? +HELPDESK_PUBLIC_ENABLED = True +HELPDESK_VIEW_A_TICKET_PUBLIC = True +HELPDESK_SUBMIT_A_TICKET_PUBLIC = True + +# Should the Knowledgebase be enabled? +HELPDESK_KB_ENABLED = True + +# Instead of showing the public web portal first, +# we can instead redirect users straight to the login page. +HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = False +LOGIN_URL = '/login/' +LOGIN_REDIRECT_URL = '/login/' + + +# Database +# - by default, we use SQLite3 for the demo, but you can also +# configure MySQL or PostgreSQL, see the docs for more: +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Sites +# - this allows hosting of more than one site from a single server, +# in practice you can probably just leave this default if you only +# host a single site, but read more in the docs: +# https://docs.djangoproject.com/en/1.10/ref/contrib/sites/ + +SITE_ID = 1 + + +# Sessions +# https://docs.djangoproject.com/en/1.10/topics/http/sessions + +SESSION_COOKIE_AGE = 86400 # = 1 day + +# For better default security, set these cookie flags, but +# these are likely to cause problems when testing locally +#CSRF_COOKIE_SECURE = True +#SESSION_COOKIE_SECURE = True +#CSRF_COOKIE_HTTPONLY = True +#SESSION_COOKIE_HTTPONLY = True + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + +# Email +# https://docs.djangoproject.com/en/1.10/topics/email/ + +# This demo uses the console backend, which simply prints emails to the console +# rather than actually sending them out. +DEFAULT_FROM_EMAIL = 'helpdesk@example.com' +SERVER_EMAIL = 'helpdesk@example.com' +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + +# If you want to test sending real emails, uncomment and modify the following: +#EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +#EMAIL_HOST = 'smtp.example.com' +#EMAIL_PORT = '25' + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +# By default, django-helpdesk uses en, but other languages are also available. +# The most complete translations are: es-MX, ru +# Contribute to our translations via Transifex if you can! +# See CONTRIBUTING.rst for more info. +LANGUAGE_CODE = 'en-US' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' + +# MEDIA_ROOT is where media uploads are stored. +# We set this to a directory to host file attachments created +# with tickets. +MEDIA_URL = '/media/' +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') + +# Fixtures +# https://docs.djangoproject.com/en/1.10/ref/settings/#std:setting-FIXTURE_DIRS +# - This is only necessary to make the demo project work, not needed for +# your own projects unless you make your own fixtures +FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures')] diff --git a/demo/demodesk/config/urls.py b/demo/demodesk/config/urls.py new file mode 100644 index 00000000..0c37aac6 --- /dev/null +++ b/demo/demodesk/config/urls.py @@ -0,0 +1,31 @@ +"""django-helpdesk demodesk URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin +from django.conf import settings +from django.conf.urls.static import static + + +# The following uses the static() helper function, +# which only works when in development mode (using DEBUG). +# For a real deployment, you'd have to properly configure a media server. +# For more information, see: +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +urlpatterns = [ + url(r'^admin/', admin.site.urls), + url(r'^', include('helpdesk.urls', namespace='helpdesk')), +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/demo/demodesk/config/wsgi.py b/demo/demodesk/config/wsgi.py new file mode 100644 index 00000000..f8e39f59 --- /dev/null +++ b/demo/demodesk/config/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for django-helpdesk demodesk project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demodesk.config.settings") + +application = get_wsgi_application() diff --git a/demo/demodesk/fixtures/demo.json b/demo/demodesk/fixtures/demo.json new file mode 100644 index 00000000..b921f295 --- /dev/null +++ b/demo/demodesk/fixtures/demo.json @@ -0,0 +1,13 @@ +[ + {"model": "helpdesk.queue", "pk": 1, "fields": {"title": "Django Helpdesk", "slug": "DH", "email_address": "django-helpdesk@example.com", "locale": "en-US", "allow_public_submission": true, "allow_email_submission": true, "escalate_days": 5, "new_ticket_cc": "", "updated_ticket_cc": "", "email_box_type": null, "email_box_host": "", "email_box_port": null, "email_box_ssl": false, "email_box_user": "", "email_box_pass": "", "email_box_imap_folder": "", "email_box_local_dir": "", "permission_name": "helpdesk.queue_access_DH", "email_box_interval": 5, "email_box_last_check": null, "socks_proxy_type": null, "socks_proxy_host": null, "socks_proxy_port": null, "logging_type": null, "logging_dir": "", "default_owner": null}}, + {"model": "helpdesk.queue", "pk": 2, "fields": {"title": "Some Product", "slug": "SP", "email_address": "sp-help@example.com", "locale": "en-US", "allow_public_submission": true, "allow_email_submission": true, "escalate_days": null, "new_ticket_cc": "", "updated_ticket_cc": "", "email_box_type": null, "email_box_host": "", "email_box_port": null, "email_box_ssl": false, "email_box_user": "", "email_box_pass": "", "email_box_imap_folder": "", "email_box_local_dir": "", "permission_name": "helpdesk.queue_access_SP", "email_box_interval": 5, "email_box_last_check": null, "socks_proxy_type": null, "socks_proxy_host": null, "socks_proxy_port": null, "logging_type": null, "logging_dir": "", "default_owner": null}}, + {"model": "helpdesk.ticket", "pk": 1, "fields": {"title": "Some django-helpdesk Problem", "queue": 1, "created": "2017-03-20T04:52:18.321Z", "modified": "2017-03-20T04:52:18.561Z", "submitter_email": "helpdesk@example.com", "assigned_to": null, "status": 1, "on_hold": false, "description": "I'm having some problem with django-helpdesk that I need help with.", "resolution": null, "priority": 3, "due_date": "2017-03-04T00:00:00Z", "last_escalation": null}}, + {"model": "helpdesk.followup", "pk": 1, "fields": {"ticket": 1, "date": "2017-03-20T04:52:18.561Z", "title": "Ticket Opened", "comment": "I'm having some problem with django-helpdesk that I need help with.", "public": true, "user": 1, "new_status": null}}, + {"model": "helpdesk.ticket", "pk": 2, "fields": {"title": "Something else", "queue": 2, "created": "2017-03-20T04:54:53.001Z", "modified": "2017-03-20T04:54:53.031Z", "submitter_email": "helpdesk@example.com", "assigned_to": null, "status": 1, "on_hold": false, "description": "Something else with some other product. Not a big deal.", "resolution": null, "priority": 4, "due_date": "2017-03-01T00:00:00Z", "last_escalation": null}}, + {"model": "helpdesk.followup", "pk": 2, "fields": {"ticket": 2, "date": "2017-03-20T04:54:53.031Z", "title": "Ticket Opened", "comment": "Something else with some other product. Not a big deal.", "public": true, "user": 1, "new_status": null}}, + {"model": "helpdesk.ticket", "pk": 3, "fields": {"title": "Something with an attachment", "queue": 1, "created": "2017-03-20T05:14:36.320Z", "modified": "2017-03-20T05:28:28.695Z", "submitter_email": "helpdesk@example.com", "assigned_to": null, "status": 1, "on_hold": false, "description": "WHOA!", "resolution": null, "priority": 1, "due_date": null, "last_escalation": null}}, + {"model": "helpdesk.followup", "pk": 3, "fields": {"ticket": 3, "date": "2017-03-20T05:14:36.345Z", "title": "Ticket Opened", "comment": "WHOA!", "public": true, "user": 1, "new_status": null}}, + {"model": "helpdesk.attachment", "pk": 1, "fields": {"followup": 3, "file": "helpdesk/attachments/DH-3/3/someinfo.txt", "filename": "someinfo.txt", "mime_type": "text/plain", "size": 56}}, + {"model": "helpdesk.followup", "pk": 4, "fields": {"ticket": 3, "date": "2017-03-20T05:28:28.458Z", "title": "Comment", "comment": "An image attachment goes here!", "public": true, "user": 1, "new_status": null}}, + {"model": "helpdesk.attachment", "pk": 2, "fields": {"followup": 4, "file": "helpdesk/attachments/DH-3/4/helpdesk.png", "filename": "helpdesk.png", "mime_type": "image/png", "size": 30229}} +] diff --git a/demo/demodesk/manage.py b/demo/demodesk/manage.py new file mode 100755 index 00000000..3427b7bc --- /dev/null +++ b/demo/demodesk/manage.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python +import os +import sys + +def main(): + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demodesk.config.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) + +if __name__ == "__main__": + main() diff --git a/demo/demodesk/media/helpdesk/attachments/DH-3/3/someinfo.txt b/demo/demodesk/media/helpdesk/attachments/DH-3/3/someinfo.txt new file mode 100644 index 00000000..5259f04e --- /dev/null +++ b/demo/demodesk/media/helpdesk/attachments/DH-3/3/someinfo.txt @@ -0,0 +1,3 @@ +Here's a report about a bug. + +Some stuff would go here. diff --git a/demo/demodesk/media/helpdesk/attachments/DH-3/4/helpdesk.png b/demo/demodesk/media/helpdesk/attachments/DH-3/4/helpdesk.png new file mode 100644 index 0000000000000000000000000000000000000000..584db6142c42ae773a9fb8ae8aeab94d9876d746 GIT binary patch literal 30229 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

FrZ0uRyawD}IrpmHDGJj91xs#~WFdf<{WT4~a__ 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 P{h_i_N|NOgZ$A7l0edsm literal 0 HcmV?d00001 diff --git a/demo/setup.py b/demo/setup.py new file mode 100644 index 00000000..02a18ebb --- /dev/null +++ b/demo/setup.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +"""Python packaging.""" + +from __future__ import unicode_literals + +from setuptools import setup +import os + +here = os.path.abspath(os.path.dirname(__file__)) +project_root = os.path.dirname(here) + + +NAME = 'django-helpdesk-demodesk' +DESCRIPTION = 'A demo Django project using django-helpdesk' +README = open(os.path.join(here, 'README.rst')).read() +VERSION = '0.2.0' +#VERSION = open(os.path.join(project_root, 'VERSION')).read().strip() +AUTHOR = 'django-helpdesk team' +URL = 'https://github.com/django-helpdesk/django-helpdesk' +CLASSIFIERS = ['Development Status :: 4 - Beta', + 'License :: OSI Approved :: BSD License', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Framework :: Django'] +KEYWORDS = [] +PACKAGES = ['demodesk'] +REQUIREMENTS = [ + 'django-helpdesk' + ] +ENTRY_POINTS = { + 'console_scripts': ['demodesk = demodesk.manage:main'] +} + + +if __name__ == '__main__': # Don't run setup() when we import this module. + setup(name=NAME, + version=VERSION, + description=DESCRIPTION, + long_description=README, + classifiers=CLASSIFIERS, + keywords=' '.join(KEYWORDS), + author=AUTHOR, + url=URL, + license='BSD', + packages=PACKAGES, + include_package_data=True, + zip_safe=False, + install_requires=REQUIREMENTS, + entry_points=ENTRY_POINTS) From 64076237ee14124d0223a6b63c450fdbf90c19c2 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 20 Mar 2017 03:17:26 -0400 Subject: [PATCH 15/25] Remove last line of LICENSE to see if GitHub will detect it automatically and display it site; updated README and docs/license.rst to more clearly spell out license and 3rd-party licenses --- CONTRIBUTING => CONTRIBUTING.rst | 0 LICENSE | 5 +- docs/license.rst | 213 ++++++++++++++++++++++++++++++- 3 files changed, 212 insertions(+), 6 deletions(-) rename CONTRIBUTING => CONTRIBUTING.rst (100%) diff --git a/CONTRIBUTING b/CONTRIBUTING.rst similarity index 100% rename from CONTRIBUTING rename to CONTRIBUTING.rst diff --git a/LICENSE b/LICENSE index 5bac8794..d1b97445 100644 --- a/LICENSE +++ b/LICENSE @@ -11,7 +11,7 @@ are permitted provided that the following conditions are met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Ross Poulton, Jutda, nor the names of any + 3. Neither the name of Ross Poulton, Jutda, nor the names of any of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -26,6 +26,3 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -EXCEPTIONS - -This software is distributed with some third-party software which is not distributed under the above license. See LICENSE.3RDPARTY for further details. diff --git a/docs/license.rst b/docs/license.rst index 0de14618..e87f414f 100644 --- a/docs/license.rst +++ b/docs/license.rst @@ -16,7 +16,7 @@ django-helpdesk is released under the terms of the BSD license. You must agree t notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Ross Poulton, Jutda, nor the names of any + 3. Neither the name of Ross Poulton, Jutda, nor the names of any of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -35,7 +35,7 @@ django-helpdesk is released under the terms of the BSD license. You must agree t This software is distributed with some third-party software which is not distributed under the above license. See LICENSE.3RDPARTY for further details. -django-helpdesk includes 3rd party software. The licenses for these +django-helpdesk includes 3rd party software. The licenses for these applications are included below. License for jQuery & jQuery UI @@ -130,3 +130,212 @@ License for jqPlot LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License for StartBootstrap SB Admin v2.0 theme +---------------------------------------------- +:: + + The MIT License (MIT) + + Copyright (c) 2013-2016 Blackrock Digital LLC. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License for Raphael +------------------- +:: + + The MIT License + + Copyright (c) 2008-2010 Dmitry Baranovskiy + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License for Morris.js +--------------------- +:: + + Copyright (c) 2013, Olly Smith + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License for DataTables +---------------------- +:: + + Copyright (C) 2008-2016, SpryMedia Ltd. + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License for Flot +---------------- +:: + + Copyright (c) 2007-2014 IOLA and Ole Laursen + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +License for Metis Menu +---------------------- +:: + + Copyright (C) 2016, Osman Nuri Okumuş + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License for Bootstrap CSS +------------------------- +:: + + Copyright (c) 2011-2016 Twitter, Inc. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License for Font Awesome +------------------------ +:: + + Font License + + Applies to all desktop and webfont files in the following directory: + font-awesome/fonts/. + License: SIL OFL 1.1 + URL: http://scripts.sil.org/OFL + + Code License + + Applies to all CSS and LESS files in the following directories: + font-awesome/css/, font-awesome/less/, and font-awesome/scss/. + License: MIT License + URL: http://opensource.org/licenses/mit-license.html + + Documentation License + + Applies to all Font Awesome project files that are not a part of the Font or + Code licenses. + License: CC BY 3.0 + URL: http://creativecommons.org/licenses/by/3.0/ + + Brand Icons + + All brand icons are trademarks of their respective owners. + The use of these trademarks does not indicate endorsement of the trademark + holder by Font Awesome, nor vice versa. + Brand icons should only be used to represent the company or product to which + they refer. From a69cf25c71fd8c70bac038bc810560dd2aaa1dfa Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 20 Mar 2017 03:19:53 -0400 Subject: [PATCH 16/25] Rework README and CONTRIBUTING to remove redundancy. Some README statements moved to install docs instead. --- .gitignore | 2 + CONTRIBUTING.rst | 21 ++++++---- README.rst | 100 +++++++++++++++++++++++----------------------- docs/install.rst | 47 ++++++++++++++++++++++ docs/settings.rst | 26 +++++------- 5 files changed, 122 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index 26ae9a31..73247db6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *.pyc /dist/ django_helpdesk.egg-info +demo/*.egg-info +demo/demodesk/*.sqlite3 docs/html/* docs/doctrees/* .coverage diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 063c6284..53182db0 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -2,16 +2,23 @@ Contributing ============ django-helpdesk is an open-source project and as such contributions from the -community are welcomed and encouraged. +community are welcomed and encouraged! + +Please read these guidelines to get up to speed quickly. If you have any +questions, please file an issue ticket on GitHub. Our main project +repository is available at: + +https://github.com/django-helpdesk/django-helpdesk Licensing --------- All contributions to django-helpdesk must be under the BSD license documented in -the LICENSE file in the top-level directory of this project. By submitting a -contribution to this project (in any way: via e-mail, via GitHub forks, -attachments, etc), you acknowledge that your contribution is open-source and -licensed under the BSD license. +the LICENSE file in the top-level directory of this project. + +By submitting a contribution to this project (in any way: via e-mail, +via GitHub forks, attachments, etc), you acknowledge that your contribution is +open-source and licensed under the BSD license. If you or your organisation does not accept these license terms then we cannot accept your contribution. Please reconsider! @@ -20,8 +27,8 @@ Translations ------------ Although django-helpdesk has originally been written for the English language, -there are already multiple translations to Spanish, Polish, and German and more -translations are welcomed. +there are already multiple translations to Spanish, Polish, German and Russian. +More translations are welcomed! Translations are handled using the excellent Transifex service which is much easier for most users than manually editing .po files. It also allows diff --git a/README.rst b/README.rst index 32d6027c..9b5b611d 100644 --- a/README.rst +++ b/README.rst @@ -7,65 +7,74 @@ django-helpdesk - A Django powered ticket tracker for small businesses. .. image:: https://codecov.io/gh/django-helpdesk/django-helpdesk/branch/master/graph/badge.svg :target: https://codecov.io/gh/django-helpdesk/django-helpdesk -Copyright 2009- Ross Poulton and contributors. All Rights Reserved. See LICENSE for details. +Copyright 2009- Ross Poulton and contributors. All Rights Reserved. +See LICENSE for details. django-helpdesk was formerly known as Jutda Helpdesk, named after the company which originally created it. As of January 2011 the name has been changed to reflect what it really is: a Django-powered ticket tracker with contributors reaching far beyond Jutda. -Complete documentation is available in the docs/ directory, or online at http://django-helpdesk.readthedocs.org/. +Complete documentation is available in the docs/ directory, +or online at http://django-helpdesk.readthedocs.org/. -You can see a demo installation at http://django-helpdesk-demo.herokuapp.com/ +You can see a demo installation at http://django-helpdesk-demo.herokuapp.com/, +or run a demo locally in just a couple steps! Licensing --------- -See the file 'LICENSE' for licensing terms. Note that django-helpdesk is -distributed with 3rd party products which have their own licenses. See -LICENSE.3RDPARTY for license terms for included packages. +django-helpdesk is licensed under terms of the BSD 3-clause license. +See the file 'LICENSE' for full licensing terms. -Dependencies (pre-flight checklist) ------------------------------------ +Note that django-helpdesk is distributed with 3rd party products which +have their own licenses. See LICENSE.3RDPARTY for license terms for +included packages. -1. Python 2.7 or 3.4+ (3.4+ support is new, please let us know how it goes) -2. Django (1.8+, preferably 1.10) -3. An existing WORKING Django project with database etc. If you - cannot log into the Admin, you won't get this product working. -4. `pip install django-bootstrap-form` and add `bootstrapform` to `settings.INSTALLED_APPS` -5. `pip install django-markdown-deux` and add `markdown_deux` to `settings.INSTALLED_APPS` -6. `pip install email-reply-parser` to get smart email reply handling -7. Add 'django.contrib.sites' to settings.INSTALLED_APPS, ensure there is at least 1 site created. +Demo Quickstart +--------------- + +django-helpdesk includes a basic demo Django project so that you may easily +get started with testing or developing django-helpdesk. The demo project +resides in the demo/ top-level folder. + +It's likely that you can start up a demo project server by running +only the command: + + sudo make rundemo + +then pointing your web browser at localhost:8080. + +For more information and options, please read the demo/README.rst file. **NOTE REGARDING SQLITE AND SEARCHING:** -If you use sqlite as your database, the search function will not work as -effectively as it will with other databases due to its inability to do -case-insensitive searches. It's recommended that you use PostgreSQL or MySQL -if possible. For more information, see this note in the Django documentation: +The demo project uses sqlite as its database. Sqlite does not allow +case-insensitive searches and so the search function may not work as +effectively as it would on other database such as PostgreSQL or MySQL +that does support case-insensitive searches. +For more information, see this note in the Django documentation: http://docs.djangoproject.com/en/dev/ref/databases/#sqlite-string-matching When you try to do a keyword search using sqlite, a message will be displayed to alert you to this shortcoming. There is no way around it, sorry. -**NOTE REGARDING MySQL:** -If you use MySQL, with most default configurations you will receive an error -when creating the database tables as we populate a number of default templates -in languages other than English. +Installation +------------ -You must create the database the holds the django-helpdesk tables using the -UTF-8 collation; see the MySQL manual for more information: -http://dev.mysql.com/doc/refman/5.1/en/charset-database.html +django-helpdesk requires either Python 2.7 or 3.4+, as well as Django 1.8+. +The recommended combination is Python 3.4+ with Django 1.10. -If you do NOT do this step, and you only want to use English-language templates, -you can continue however you will receive a warning when running the 'migrate' -commands. +You can quickly install the latest stable version of django-helpdesk app via pip: -Fresh Django Installations --------------------------- + pip install django-helpdesk -If you're on a brand new Django installation, make sure you do a ``migrate`` -**before** adding ``helpdesk`` to your ``INSTALLED_APPS``. This will avoid -errors with trying to create User settings. +You may also check out the master branch on GitHub, and install manually: + + python setup.py install + +Either way, you will need to add django-helpdesk to an existing Django project. + +For further installation information see docs/install.html and docs/configuration.html Upgrading from previous versions -------------------------------- @@ -80,25 +89,16 @@ migrations, get an up to date version of the code base (eg by using Lastly, restart your web server software (eg Apache) or FastCGI instance, to ensure the latest changes are in use. -If you are using django-helpdesk pre-migrations (ie pre-2011) then you're -on your own, sorry. +Unfortunately we are unable to assist if you are upgrading from a +version of django-helpdesk prior to migrations (ie pre-2011). You can continue to the 'Initial Configuration' area, if needed. -Installation ------------- - -``pip install django-helpdesk`` - -For further installation information see docs/install.html and docs/configuration.html - Contributing ------------ -If you want to help translate django-helpdesk into languages other than English, we encourage you to make use of our Transifex project. +We're happy to include any type of contribution! This can be back-end +python/django code development, front-end web development +(HTML/Javascript, especially jQuery), or even language translations. -https://www.transifex.com/django-helpdesk/django-helpdesk/ - -Feel free to request access to contribute your translations. - -Pull requests for all other changes are welcome. We're currently trying to add test cases wherever possible, so please continue to include tests with pull requests. +For more information on contributing, please see the CONTRIBUTING.rst file. diff --git a/docs/install.rst b/docs/install.rst index 205e6110..adba171d 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -29,6 +29,10 @@ Download, extract, and drop ``helpdesk`` into your ``PYTHONPATH`` Adding To Your Django Project ----------------------------- +If you're on a brand new Django installation, make sure you do a ``migrate`` +**before** adding ``helpdesk`` to your ``INSTALLED_APPS``. This will avoid +errors with trying to create User settings. + 1. Edit your ``settings.py`` file and add ``helpdesk`` to the ``INSTALLED_APPS`` setting. You also need ``django.contrib.admin`` in ``INSTALLED_APPS`` if you haven't already added it. eg:: INSTALLED_APPS = ( @@ -115,3 +119,46 @@ Adding To Your Django Project Also, be aware that if a disk error occurs and the local file is not deleted, the mail may be processed multiple times and generate duplicate tickets until the file is removed. It is recommended to monitor log files for ERRORS when a file is unable to be deleted. +Upgrading from previous versions +-------------------------------- + +If you are upgrading from a previous version of django-helpdesk that used +migrations, get an up to date version of the code base (eg by using +`git pull` or `pip install --upgrade django-helpdesk`) then migrate the database:: + + python manage.py migrate helpdesk --db-dry-run # DB untouched + python manage.py migrate helpdesk + +Lastly, restart your web server software (eg Apache) or FastCGI instance, to +ensure the latest changes are in use. + +Unfortunately we are unable to assist if you are upgrading from a +version of django-helpdesk prior to migrations (ie pre-2011). + +You can continue to the 'Initial Configuration' area, if needed. + +Notes on database backends +-------------------------- + +**NOTE REGARDING SQLITE AND SEARCHING:** +If you use sqlite as your database, the search function will not work as +effectively as it will with other databases due to its inability to do +case-insensitive searches. It's recommended that you use PostgreSQL or MySQL +if possible. For more information, see this note in the Django documentation: +http://docs.djangoproject.com/en/dev/ref/databases/#sqlite-string-matching + +When you try to do a keyword search using sqlite, a message will be displayed +to alert you to this shortcoming. There is no way around it, sorry. + +**NOTE REGARDING MySQL:** +If you use MySQL, with most default configurations you will receive an error +when creating the database tables as we populate a number of default templates +in languages other than English. + +You must create the database the holds the django-helpdesk tables using the +UTF-8 collation; see the MySQL manual for more information: +http://dev.mysql.com/doc/refman/5.1/en/charset-database.html + +If you do NOT do this step, and you only want to use English-language templates, +you can continue however you will receive a warning when running the 'migrate' +commands. diff --git a/docs/settings.rst b/docs/settings.rst index c60e3936..ae3fb2df 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -1,15 +1,7 @@ Settings ======== -First, django-helpdesk needs ``django.core.context_processors.request`` activated, so you must add it to the ``settings.py``. For Django 1.7, add:: - - from django.conf import global_settings - TEMPLATE_CONTEXT_PROCESSORS = ( - global_settings.TEMPLATE_CONTEXT_PROCESSORS + - ('django.core.context_processors.request',) - ) - -For Django 1.8 and onwards, the settings are located in the ``TEMPLATES``, and the ``request`` module has moved. Add the following instead:: +First, django-helpdesk needs ``django.core.context_processors.request`` activated, so you must add it to the ``settings.py``. Add the following:: TEMPLATES = [ { @@ -75,11 +67,11 @@ These changes are visible throughout django-helpdesk **Default:** ``HELPDESK_SHOW_CHANGE_PASSWORD = False`` - **HELPDESK_FOLLOWUP_MOD** Allow user to override default layout for 'followups' (work in progress) - + **Default:** ``HELPDESK_FOLLOWUP_MOD = False`` - **HELPDESK_AUTO_SUBSCRIBE_ON_TICKET_RESPONSE** Auto-subscribe user to ticket as a 'CC' if (s)he responds to a ticket? - + **Default:** ``HELPDESK_AUTO_SUBSCRIBE_ON_TICKET_RESPONSE = False`` - **HELPDESK_EMAIL_SUBJECT_TEMPLATE** Subject template for templated emails. ``%(subject)s`` represents the subject wording from the email template (e.g. "(Closed)"). @@ -97,24 +89,24 @@ Options shown on public pages These options only change display of items on public-facing pages, not staff pages. - **HELPDESK_VIEW_A_TICKET_PUBLIC** Show 'View a Ticket' section on public page? - + **Default:** ``HELPDESK_VIEW_A_TICKET_PUBLIC = True`` - **HELPDESK_SUBMIT_A_TICKET_PUBLIC** Show 'submit a ticket' section & form on public page? - + **Default:** ``HELPDESK_SUBMIT_A_TICKET_PUBLIC = True`` Options that change ticket updates ---------------------------------- -- **HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE** Allow non-staff users to interact with tickets? This will also change how 'staff_member_required' +- **HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE** Allow non-staff users to interact with tickets? This will also change how 'staff_member_required' in staff.py will be defined. - + **Default:** ``HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE = False`` - **HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP** Show edit buttons in ticket follow ups? - + **Default:** ``HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP = True`` - **HELPDESK_SHOW_DELETE_BUTTON_SUPERUSER_FOLLOW_UP** Show delete buttons in ticket follow ups if user is 'superuser'? @@ -167,7 +159,7 @@ Discontinued Settings The following settings were defined in previous versions and are no longer supported. -- **HELPDESK_CUSTOM_WELCOME** +- **HELPDESK_CUSTOM_WELCOME** - **HELDPESK_KB_ENABLED_STAFF** Now always True From 5629276050f3f2548560aa2bef0237b7db83f416 Mon Sep 17 00:00:00 2001 From: "Yuego [Home]" Date: Sun, 26 Mar 2017 10:24:32 +0400 Subject: [PATCH 17/25] Migration added --- .../migrations/0016_alter_model_options.py | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 helpdesk/migrations/0016_alter_model_options.py diff --git a/helpdesk/migrations/0016_alter_model_options.py b/helpdesk/migrations/0016_alter_model_options.py new file mode 100644 index 00000000..a265317a --- /dev/null +++ b/helpdesk/migrations/0016_alter_model_options.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2017-03-08 17:51 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('helpdesk', '0015_expand_permission_name_size'), + ] + + operations = [ + migrations.AlterModelOptions( + name='attachment', + options={'ordering': ('filename',), 'verbose_name': 'Attachment', 'verbose_name_plural': 'Attachments'}, + ), + migrations.AlterModelOptions( + name='emailtemplate', + options={'ordering': ('template_name', 'locale'), 'verbose_name': 'e-mail template', 'verbose_name_plural': 'e-mail templates'}, + ), + migrations.AlterModelOptions( + name='followup', + options={'ordering': ('date',), 'verbose_name': 'Follow-up', 'verbose_name_plural': 'Follow-ups'}, + ), + migrations.AlterModelOptions( + name='kbcategory', + options={'ordering': ('title',), 'verbose_name': 'Knowledge base category', 'verbose_name_plural': 'Knowledge base categories'}, + ), + migrations.AlterModelOptions( + name='kbitem', + options={'ordering': ('title',), 'verbose_name': 'Knowledge base item', 'verbose_name_plural': 'Knowledge base items'}, + ), + migrations.AlterModelOptions( + name='presetreply', + options={'ordering': ('name',), 'verbose_name': 'Pre-set reply', 'verbose_name_plural': 'Pre-set replies'}, + ), + migrations.AlterUniqueTogether( + name='ticketcustomfieldvalue', + unique_together=set([('ticket', 'field')]), + ), + ] From 247de7ddd3da8820256aaa0f735b5ef6fcd06088 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Sun, 2 Apr 2017 15:05:43 -0400 Subject: [PATCH 18/25] Add KnowledgeBase example data to the demo --- demo/demodesk/fixtures/demo.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/demo/demodesk/fixtures/demo.json b/demo/demodesk/fixtures/demo.json index b921f295..ee491702 100644 --- a/demo/demodesk/fixtures/demo.json +++ b/demo/demodesk/fixtures/demo.json @@ -9,5 +9,10 @@ {"model": "helpdesk.followup", "pk": 3, "fields": {"ticket": 3, "date": "2017-03-20T05:14:36.345Z", "title": "Ticket Opened", "comment": "WHOA!", "public": true, "user": 1, "new_status": null}}, {"model": "helpdesk.attachment", "pk": 1, "fields": {"followup": 3, "file": "helpdesk/attachments/DH-3/3/someinfo.txt", "filename": "someinfo.txt", "mime_type": "text/plain", "size": 56}}, {"model": "helpdesk.followup", "pk": 4, "fields": {"ticket": 3, "date": "2017-03-20T05:28:28.458Z", "title": "Comment", "comment": "An image attachment goes here!", "public": true, "user": 1, "new_status": null}}, - {"model": "helpdesk.attachment", "pk": 2, "fields": {"followup": 4, "file": "helpdesk/attachments/DH-3/4/helpdesk.png", "filename": "helpdesk.png", "mime_type": "image/png", "size": 30229}} + {"model": "helpdesk.attachment", "pk": 2, "fields": {"followup": 4, "file": "helpdesk/attachments/DH-3/4/helpdesk.png", "filename": "helpdesk.png", "mime_type": "image/png", "size": 30229}}, + {"model": "helpdesk.kbcategory", "pk": 1, "fields": {"title": "KB Cat 1", "slug": "kbcat1", "description": "Some category of KB info"}}, + {"model": "helpdesk.kbcategory", "pk": 2, "fields": {"title": "KB Cat 2", "slug": "kbcat2", "description": "Here is another category. Enjoy!"}}, + {"model": "helpdesk.kbitem", "pk": 1, "fields": {"category": 1, "title": "Django-Helpdesk", "question": "What is Django-Helpdesk?", "answer": "An open source helpdesk written in python using the awesome django framework.", "votes": 0, "recommendations": 0, "last_updated": "2017-04-02T19:02:17.213Z"}}, + {"model": "helpdesk.kbitem", "pk": 2, "fields": {"category": 1, "title": "Contributing to django-helpdesk", "question": "How do I contribute?", "answer": "Read the CONTRIBUTING.md file in the top directory of the django-helpdesk source.", "votes": 0, "recommendations": 0, "last_updated": "2017-04-02T19:02:48.374Z"}}, + {"model": "helpdesk.kbitem", "pk": 3, "fields": {"category": 2, "title": "Something Else", "question": "What else?", "answer": "Not sure.", "votes": 0, "recommendations": 0, "last_updated": "2017-04-02T19:02:59.741Z"}} ] From b5fa4896432d5ee69ca77097daed1ced8ac390ae Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 3 Apr 2017 01:52:35 -0400 Subject: [PATCH 19/25] Demo requires markdown_deux for KnowledgeBase to work properly --- demo/demodesk/config/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/demo/demodesk/config/settings.py b/demo/demodesk/config/settings.py index dde89105..24b9eccc 100644 --- a/demo/demodesk/config/settings.py +++ b/demo/demodesk/config/settings.py @@ -39,6 +39,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django.contrib.sites', 'django.contrib.humanize', + 'markdown_deux', 'bootstrapform', 'helpdesk' ] From 74a7afadb94f3c0b809607fc4b7bd4542dafc97a Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 3 Apr 2017 01:53:25 -0400 Subject: [PATCH 20/25] Update get_email test to use unicode characters; seem to have found an encoding errory in get_email, provided a fix that satisfies test --- helpdesk/management/commands/get_email.py | 26 +++++++------- helpdesk/tests/test_get_email.py | 41 ++++++++--------------- 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 68e74ecb..99090f30 100644 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -159,7 +159,7 @@ def process_queue(q, logger): msgNum = msg.split(" ")[0] logger.info("Processing message %s" % msgNum) - full_message = encoding.force_text("\n".join(server.retr(msgNum)[1]), errors='ignore') + full_message = encoding.force_text("\n".join(server.retr(msgNum)[1]), errors='replace') ticket = ticket_from_message(message=full_message, queue=q, logger=logger) if ticket: @@ -199,7 +199,7 @@ def process_queue(q, logger): for num in msgnums: logger.info("Processing message %s" % num) status, data = server.fetch(num, '(RFC822)') - full_message = encoding.force_text(data[0][1], errors='ignore') + full_message = encoding.force_text(data[0][1], errors='replace') ticket = ticket_from_message(message=full_message, queue=q, logger=logger) if ticket: server.store(num, '+FLAGS', '\\Deleted') @@ -220,7 +220,7 @@ def process_queue(q, logger): for i, m in enumerate(mail, 1): logger.info("Processing message %d" % i) with open(m, 'r') as f: - full_message = encoding.force_text(f.read(), errors='ignore') + full_message = encoding.force_text(f.read(), errors='replace') ticket = ticket_from_message(message=full_message, queue=q, logger=logger) if ticket: logger.info("Successfully processed message %d, ticket/comment created." % i) @@ -238,18 +238,18 @@ def decodeUnknown(charset, string): if six.PY2: if not charset: try: - return string.decode('utf-8', 'ignore') + return string.decode('utf-8', 'replace') except: - return string.decode('iso8859-1', 'ignore') + return string.decode('iso8859-1', 'replace') return unicode(string, charset) elif six.PY3: if type(string) is not str: if not charset: try: - return str(string, encoding='utf-8', errors='ignore') + return str(string, encoding='utf-8', errors='replace') except: - return str(string, encoding='iso8859-1', errors='ignore') - return str(string, encoding=charset, errors='ignore') + return str(string, encoding='iso8859-1', errors='replace') + return str(string, encoding=charset, errors='replace') return string @@ -258,7 +258,7 @@ def decode_mail_headers(string): if six.PY2: return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded]) elif six.PY3: - return u' '.join([str(msg, encoding=charset, errors='ignore') if charset else str(msg) for msg, charset in decoded]) + return u' '.join([str(msg, encoding=charset, errors='replace') if charset else str(msg) for msg, charset in decoded]) def ticket_from_message(message, queue, logger): @@ -305,9 +305,11 @@ def ticket_from_message(message, queue, logger): if part.get_content_maintype() == 'text' and name is None: if part.get_content_subtype() == 'plain': - body = encoding.force_text(EmailReplyParser.parse_reply( - decodeUnknown(part.get_content_charset(), encoding.force_text(part.get_payload(decode=True))) - )) + body = EmailReplyParser.parse_reply( + decodeUnknown(part.get_content_charset(), part.get_payload(decode=True)) + ) + # workaround to get unicode text out rather than escaped text + body = body.encode('ascii').decode('unicode_escape') logger.debug("Discovered plain text MIME part") else: files.append( diff --git a/helpdesk/tests/test_get_email.py b/helpdesk/tests/test_get_email.py index 87eddffd..072f7538 100644 --- a/helpdesk/tests/test_get_email.py +++ b/helpdesk/tests/test_get_email.py @@ -74,15 +74,17 @@ class GetEmailParametricTemplate(object): rmtree(self.temp_logdir) - def test_read_email(self): - """Tests reading emails from a queue and creating tickets. + def test_read_plain_email(self): + """Tests reading plain text emails from a queue and creating tickets. For each email source supported, we mock the backend to provide authentically formatted responses containing our test data.""" - test_email = "To: update.public@example.com\nFrom: comment@example.com\nSubject: Some Comment\n\nThis is the helpdesk comment via email." - test_mail_len = len(test_email) - test_unicode_email = "To: update.public@example.com\nFrom: comment@example.com\nSubject: Some Unicode Comment\n\nThis is the helpdesk comment via email with unicode chars \u2013 inserted for testing purposes." - test_unicode_email_len = len(test_unicode_email) + # example email text from Django docs: https://docs.djangoproject.com/en/1.10/ref/unicode/ + test_email_from = "Arnbjörg Ráðormsdóttir " + test_email_subject = "My visit to Sør-Trøndelag" + test_email_body = "Unicode helpdesk comment with an s-hat (ŝ) via email." + test_email = "To: helpdesk@example.com\nFrom: " + test_email_from + "\nSubject: " + test_email_subject + "\n\n" + test_email_body + test_mail_len = len(test_email) if self.socks: from socks import ProxyConnectionError @@ -104,25 +106,13 @@ class GetEmailParametricTemplate(object): mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename1') mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename2') - with mock.patch('helpdesk.management.commands.get_email.listdir') as mocked_listdir, \ - mock.patch('helpdesk.management.commands.get_email.isfile') as mocked_isfile, \ - mock.patch('builtins.open' if six.PY3 else '__builtin__.open', mock.mock_open(read_data=test_unicode_email)): - mocked_isfile.return_value = True - mocked_listdir.return_value = ['filename3'] - - call_command('get_email') - - mocked_listdir.assert_called_with('/var/lib/mail/helpdesk/') - mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename3') - elif self.method == 'pop3': # mock poplib.POP3's list and retr methods to provide responses as per RFC 1939 pop3_emails = { '1': ("+OK", test_email.split('\n')), '2': ("+OK", test_email.split('\n')), - '3': ("+OK", test_unicode_email.split('\n')), } - pop3_mail_list = ("+OK 3 messages", ("1 %d" % test_mail_len, "2 %d" % test_mail_len, "3 %d" % test_unicode_email_len)) + pop3_mail_list = ("+OK 2 messages", ("1 %d" % test_mail_len, "2 %d" % test_mail_len)) mocked_poplib_server = mock.Mock() mocked_poplib_server.list = mock.Mock(return_value=pop3_mail_list) mocked_poplib_server.retr = mock.Mock(side_effect=lambda x: pop3_emails[x]) @@ -135,9 +125,8 @@ class GetEmailParametricTemplate(object): imap_emails = { "1": ("OK", (("1", test_email),)), "2": ("OK", (("2", test_email),)), - "3": ("OK", (("3", test_unicode_email),)), } - imap_mail_list = ("OK", ("1 2 3",)) + imap_mail_list = ("OK", ("1 2",)) mocked_imaplib_server = mock.Mock() mocked_imaplib_server.search = mock.Mock(return_value=imap_mail_list) @@ -149,15 +138,13 @@ class GetEmailParametricTemplate(object): ticket1 = get_object_or_404(Ticket, pk=1) self.assertEqual(ticket1.ticket_for_url, "QQ-%s" % ticket1.id) - self.assertEqual(ticket1.description, "This is the helpdesk comment via email.") + self.assertEqual(ticket1.title, test_email_subject) + self.assertEqual(ticket1.description, test_email_body) ticket2 = get_object_or_404(Ticket, pk=2) self.assertEqual(ticket2.ticket_for_url, "QQ-%s" % ticket2.id) - self.assertEqual(ticket2.description, "This is the helpdesk comment via email.") - - ticket3 = get_object_or_404(Ticket, pk=3) - self.assertEqual(ticket3.ticket_for_url, "QQ-%s" % ticket3.id) - self.assertEqual(ticket3.description, "This is the helpdesk comment via email with unicode chars \u2013 inserted for testing purposes.") + self.assertEqual(ticket2.title, test_email_subject) + self.assertEqual(ticket2.description, test_email_body) # build matrix of test cases From f43ef69ec19ee653753c3a1100c3f4e35d17ddae Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 3 Apr 2017 02:19:29 -0400 Subject: [PATCH 21/25] Add a MIME multipart email test for get_email --- helpdesk/tests/test_get_email.py | 123 ++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 1 deletion(-) diff --git a/helpdesk/tests/test_get_email.py b/helpdesk/tests/test_get_email.py index 072f7538..a2a8dd56 100644 --- a/helpdesk/tests/test_get_email.py +++ b/helpdesk/tests/test_get_email.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from helpdesk.models import Queue, Ticket +from helpdesk.models import Queue, Ticket, FollowUp, Attachment from django.test import TestCase from django.core.management import call_command from django.utils import six @@ -147,6 +147,127 @@ class GetEmailParametricTemplate(object): self.assertEqual(ticket2.description, test_email_body) + def test_read_html_multipart_email(self): + """Tests reading multipart MIME (HTML body and plain text alternative) + emails from a queue and creating tickets. + For each email source supported, we mock the backend to provide + authentically formatted responses containing our test data.""" + + # example email text from Python docs: https://docs.python.org/3/library/email-examples.html + from email.mime.multipart import MIMEMultipart + from email.mime.text import MIMEText + + me = "my@example.com" + you = "your@example.com" + subject = "Link" + + # Create message container - the correct MIME type is multipart/alternative. + msg = MIMEMultipart('alternative') + msg['Subject'] = subject + msg['From'] = me + msg['To'] = you + + # Create the body of the message (a plain-text and an HTML version). + text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttps://www.python.org" + html = """\ + + + +

Hi!
+ How are you?
+ Here is the link you wanted. +

+ + + """ + + # Record the MIME types of both parts - text/plain and text/html. + part1 = MIMEText(text, 'plain') + part2 = MIMEText(html, 'html') + + # Attach parts into message container. + # According to RFC 2046, the last part of a multipart message, in this case + # the HTML message, is best and preferred. + msg.attach(part1) + msg.attach(part2) + + test_mail_len = len(msg) + + if self.socks: + from socks import ProxyConnectionError + with self.assertRaisesRegexp(ProxyConnectionError, '%s:%s' % (unrouted_socks_server, unused_port)): + call_command('get_email') + + else: + # Test local email reading + if self.method == 'local': + with mock.patch('helpdesk.management.commands.get_email.listdir') as mocked_listdir, \ + mock.patch('helpdesk.management.commands.get_email.isfile') as mocked_isfile, \ + mock.patch('builtins.open' if six.PY3 else '__builtin__.open', mock.mock_open(read_data=msg.as_string())): + mocked_isfile.return_value = True + mocked_listdir.return_value = ['filename1', 'filename2'] + + call_command('get_email') + + mocked_listdir.assert_called_with('/var/lib/mail/helpdesk/') + mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename1') + mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename2') + + elif self.method == 'pop3': + # mock poplib.POP3's list and retr methods to provide responses as per RFC 1939 + pop3_emails = { + '1': ("+OK", msg.as_string().split('\n')), + '2': ("+OK", msg.as_string().split('\n')), + } + pop3_mail_list = ("+OK 2 messages", ("1 %d" % test_mail_len, "2 %d" % test_mail_len)) + mocked_poplib_server = mock.Mock() + mocked_poplib_server.list = mock.Mock(return_value=pop3_mail_list) + mocked_poplib_server.retr = mock.Mock(side_effect=lambda x: pop3_emails[x]) + with mock.patch('helpdesk.management.commands.get_email.poplib', autospec=True) as mocked_poplib: + mocked_poplib.POP3 = mock.Mock(return_value=mocked_poplib_server) + call_command('get_email') + + elif self.method == 'imap': + # mock imaplib.IMAP4's search and fetch methods with responses from RFC 3501 + imap_emails = { + "1": ("OK", (("1", msg.as_string()),)), + "2": ("OK", (("2", msg.as_string()),)), + } + imap_mail_list = ("OK", ("1 2",)) + mocked_imaplib_server = mock.Mock() + mocked_imaplib_server.search = mock.Mock(return_value=imap_mail_list) + + # we ignore the second arg as the data item/mime-part is constant (RFC822) + mocked_imaplib_server.fetch = mock.Mock(side_effect=lambda x, _: imap_emails[x]) + with mock.patch('helpdesk.management.commands.get_email.imaplib', autospec=True) as mocked_imaplib: + mocked_imaplib.IMAP4 = mock.Mock(return_value=mocked_imaplib_server) + call_command('get_email') + + ticket1 = get_object_or_404(Ticket, pk=1) + self.assertEqual(ticket1.ticket_for_url, "QQ-%s" % ticket1.id) + self.assertEqual(ticket1.title, subject) + # plain text should become description + self.assertEqual(ticket1.description, text) + # HTML MIME part should be attached to follow up + followup1 = get_object_or_404(FollowUp, pk=1) + self.assertEqual(followup1.ticket.id, 1) + attach1 = get_object_or_404(Attachment, pk=1) + self.assertEqual(attach1.followup.id, 1) + self.assertEqual(attach1.filename, 'email_html_body.html') + + ticket2 = get_object_or_404(Ticket, pk=2) + self.assertEqual(ticket2.ticket_for_url, "QQ-%s" % ticket2.id) + self.assertEqual(ticket2.title, subject) + # plain text should become description + self.assertEqual(ticket2.description, text) + # HTML MIME part should be attached to follow up + followup2 = get_object_or_404(FollowUp, pk=2) + self.assertEqual(followup2.ticket.id, 2) + attach2 = get_object_or_404(Attachment, pk=2) + self.assertEqual(attach2.followup.id, 2) + self.assertEqual(attach2.filename, 'email_html_body.html') + + # build matrix of test cases case_methods = [c[0] for c in Queue._meta.get_field('email_box_type').choices] case_socks = [False] + [c[0] for c in Queue._meta.get_field('socks_proxy_type').choices] From 0fb9094d0118490d4ed01be822289700012b56f3 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 3 Apr 2017 02:29:28 -0400 Subject: [PATCH 22/25] Remove line for PEP8 --- helpdesk/tests/test_get_email.py | 1 - 1 file changed, 1 deletion(-) diff --git a/helpdesk/tests/test_get_email.py b/helpdesk/tests/test_get_email.py index a2a8dd56..bcaf1001 100644 --- a/helpdesk/tests/test_get_email.py +++ b/helpdesk/tests/test_get_email.py @@ -146,7 +146,6 @@ class GetEmailParametricTemplate(object): self.assertEqual(ticket2.title, test_email_subject) self.assertEqual(ticket2.description, test_email_body) - def test_read_html_multipart_email(self): """Tests reading multipart MIME (HTML body and plain text alternative) emails from a queue and creating tickets. From 5ec985af9be8a44f66767ac03b6b944d738e773f Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 3 Apr 2017 02:34:54 -0400 Subject: [PATCH 23/25] Add explicit encoding hint to top of file to allow Python 2 to read file with Unicode characters, in accordance with PEP-263 --- helpdesk/tests/test_get_email.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpdesk/tests/test_get_email.py b/helpdesk/tests/test_get_email.py index bcaf1001..6ff275a3 100644 --- a/helpdesk/tests/test_get_email.py +++ b/helpdesk/tests/test_get_email.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from __future__ import unicode_literals from helpdesk.models import Queue, Ticket, FollowUp, Attachment From 9531b9649aab09fb4a55ad5c9b0ed052984af050 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 3 Apr 2017 02:52:49 -0400 Subject: [PATCH 24/25] Fix errors in Python 2, used six to workaround encoding weirdness, all tests pass on both Py2/3 --- helpdesk/management/commands/get_email.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 99090f30..7613d0e2 100644 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -254,7 +254,7 @@ def decodeUnknown(charset, string): def decode_mail_headers(string): - decoded = email.header.decode_header(string) + decoded = email.header.decode_header(string) if six.PY3 else email.header.decode_header(string.encode('utf-8')) if six.PY2: return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded]) elif six.PY3: @@ -263,7 +263,7 @@ def decode_mail_headers(string): def ticket_from_message(message, queue, logger): # 'message' must be an RFC822 formatted message. - message = email.message_from_string(message) + message = email.message_from_string(message) if six.PY3 else email.message_from_string(message.encode('utf-8')) subject = message.get('subject', _('Created from e-mail')) subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject)) for affix in STRIPPED_SUBJECT_STRINGS: @@ -309,7 +309,7 @@ def ticket_from_message(message, queue, logger): decodeUnknown(part.get_content_charset(), part.get_payload(decode=True)) ) # workaround to get unicode text out rather than escaped text - body = body.encode('ascii').decode('unicode_escape') + body = body.encode('ascii').decode('unicode_escape') if six.PY3 else body.encode('utf-8') logger.debug("Discovered plain text MIME part") else: files.append( From b87a30c1c83e9f6bf86716e608b25afbf05c4175 Mon Sep 17 00:00:00 2001 From: Jonathan Barratt Date: Thu, 6 Apr 2017 07:59:17 +0700 Subject: [PATCH 25/25] Update comments for consistency with their targets --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 601799cf..7b43e2b6 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,12 @@ help: @egrep -o "^#: (.+)" [Mm]akefile | sed 's/#: /* /' -#: develop - Install minimal development utilities for Python3 +#: develop - Install minimal development utilities for Python3. .PHONY: develop develop: $(PIP) install -e . -#: develop - Install minimal development utilities for Python2 +#: develop2 - Install minimal development utilities for Python2. .PHONY: develop2 develop2: pip2 install -e . @@ -62,7 +62,7 @@ test: $(TOX) -#: documentation - Build documentation (Sphinx, README, ...) +#: documentation - Build documentation (Sphinx, README, ...). .PHONY: documentation documentation: sphinx readme @@ -93,7 +93,7 @@ demo: demodesk loaddata emailtemplate.json demodesk loaddata demo.json -#: demo - Setup demo project using Python2. +#: demo2 - Setup demo project using Python2. .PHONY: demo2 demo2: pip2 install -e . @@ -108,12 +108,12 @@ demo2: demodesk loaddata demo.json -#: runserver - Run demo server using Python3 +#: rundemo - Run demo server using Python3. .PHONY: rundemo rundemo: demo demodesk runserver 8080 -#: runserver - Run demo server using Python2 +#: rundemo2 - Run demo server using Python2. .PHONY: rundemo2 rundemo2: demo2 demodesk runserver 8080